fix: correct profile ID type to string in database and models

This commit is contained in:
Darp Alakun
2025-01-05 01:48:14 -05:00
parent 951dc860d3
commit 1f24ec6784
7 changed files with 15 additions and 14 deletions

View File

@@ -8,7 +8,7 @@ import (
config "github.com/onsonr/hway/config"
hwayorm "github.com/onsonr/hway/internal/models"
"github.com/onsonr/hway/pkg/common"
"github.com/onsonr/hway/pkg/context"
// "github.com/onsonr/hway/pkg/context"
)
type Gateway = *echo.Echo

View File

@@ -81,7 +81,7 @@ type Session struct {
Challenge string `json:"challenge"`
IsHumanFirst bool `json:"is_human_first"`
IsHumanLast bool `json:"is_human_last"`
ProfileID int64 `json:"profile_id"`
ProfileID string `json:"profile_id"`
}
type Vault struct {

View File

@@ -56,7 +56,7 @@ type CreateSessionParams struct {
Challenge string `json:"challenge"`
IsHumanFirst bool `json:"is_human_first"`
IsHumanLast bool `json:"is_human_last"`
ProfileID int64 `json:"profile_id"`
ProfileID string `json:"profile_id"`
}
func (q *Queries) CreateSession(ctx context.Context, arg CreateSessionParams) (Session, error) {
@@ -551,7 +551,7 @@ RETURNING id, created_at, updated_at, deleted_at, browser_name, browser_version,
`
type UpdateSessionWithProfileIDParams struct {
ProfileID int64 `json:"profile_id"`
ProfileID string `json:"profile_id"`
ID string `json:"id"`
}

View File

@@ -77,7 +77,7 @@ CREATE TABLE sessions (
challenge TEXT NOT NULL,
is_human_first BOOLEAN NOT NULL DEFAULT FALSE CHECK(is_human_first IN (0,1)),
is_human_last BOOLEAN NOT NULL DEFAULT FALSE CHECK(is_human_last IN (0,1)),
profile_id INTEGER NOT NULL
profile_id TEXT NOT NULL
);
-- Vaults store encrypted data

View File

@@ -8,6 +8,7 @@ import (
"github.com/golang-jwt/jwt"
"github.com/ipfs/go-cid"
"github.com/onsonr/crypto/keys"
"github.com/onsonr/crypto/ucan"
)

View File

@@ -37,13 +37,13 @@ func UseGateway(env hway.Hway, ipc common.IPFS, db *hwayorm.Queries) echo.Middle
return func(c echo.Context) error {
ua := useragent.NewParser()
ctx := &GatewayContext{
Context: c,
Querier: db,
ipfsClient: ipc,
agent: ua.Parse(c.Request().UserAgent()),
grpcAddr: env.GetSonrGrpcUrl(),
tokenStore: common.NewUCANStore(ipc),
turnstileSiteKey: env.GetTurnstileSiteKey(),
Context: c,
Querier: db,
ipfsClient: ipc,
agent: ua.Parse(c.Request().UserAgent()),
grpcAddr: env.GetSonrGrpcUrl(),
tokenStore: common.NewUCANStore(ipc),
// turnstileSiteKey: env.GetTurnstileSiteKey(),
}
return next(ctx)
}

View File

@@ -23,7 +23,7 @@ func UpdateProfile(c echo.Context) (*hwayorm.Profile, error) {
if err != nil {
return nil, err
}
return profile, nil
return &profile, nil
}
func ReadProfile(c echo.Context) (*hwayorm.Profile, error) {
@@ -36,7 +36,7 @@ func ReadProfile(c echo.Context) (*hwayorm.Profile, error) {
if err != nil {
return nil, err
}
return profile, nil
return &profile, nil
}
func DeleteProfile(c echo.Context) error {