diff --git a/internal/database/sessions/models.go b/internal/database/sessions/models.go index f92e1a629..4eeb7e235 100644 --- a/internal/database/sessions/models.go +++ b/internal/database/sessions/models.go @@ -16,27 +16,12 @@ var ( ErrUserNotFound = echo.NewHTTPError(http.StatusNotFound, "User not found") ) -// Define the credential structure matching our frontend data -type Credential struct { - ID string `json:"id"` - RawID string `json:"rawId"` - Type string `json:"type"` - AuthenticatorAttachment string `json:"authenticatorAttachment"` - Transports []string `json:"transports"` - ClientExtensionResults map[string]interface{} `json:"clientExtensionResults"` - Response struct { - AttestationObject string `json:"attestationObject"` - ClientDataJSON string `json:"clientDataJSON"` - } `json:"response"` -} - type User struct { gorm.Model - Address string `json:"address"` - Handle string `json:"handle"` - Name string `json:"name"` - CID string `json:"cid"` - Credentials []*Credential `json:"credentials"` + Address string `json:"address"` + Handle string `json:"handle"` + Name string `json:"name"` + CID string `json:"cid"` } type Session struct { diff --git a/internal/database/sessions/sqlite.go b/internal/database/sessions/sqlite.go index 3a54def51..8bb73d528 100644 --- a/internal/database/sessions/sqlite.go +++ b/internal/database/sessions/sqlite.go @@ -20,7 +20,6 @@ func NewGormDB(env config.Env) (*gorm.DB, error) { // Migrate the schema db.AutoMigrate(&Session{}) db.AutoMigrate(&User{}) - return db, nil } diff --git a/internal/gateway/handlers/index/views.templ b/internal/gateway/handlers/index/views.templ index 633808858..3f9fde21b 100644 --- a/internal/gateway/handlers/index/views.templ +++ b/internal/gateway/handlers/index/views.templ @@ -10,21 +10,21 @@ templ InitialView() { @layout.Container() { @text.Header("Sonr.ID", "The decentralized identity layer for the web.")
- + Get Started
-
- +
+ - + - - + +
} diff --git a/internal/gateway/handlers/index/views_templ.go b/internal/gateway/handlers/index/views_templ.go index 0357b32b0..c8d1c5e9e 100644 --- a/internal/gateway/handlers/index/views_templ.go +++ b/internal/gateway/handlers/index/views_templ.go @@ -62,7 +62,7 @@ func InitialView() templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
Get Started
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
Get Started
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/internal/gateway/handlers/register/data.go b/internal/gateway/handlers/register/data.go index 475dbf9d8..6317f6d54 100644 --- a/internal/gateway/handlers/register/data.go +++ b/internal/gateway/handlers/register/data.go @@ -6,9 +6,23 @@ import ( "net/http" "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/internal/database/sessions" ) +// Define the credential structure matching our frontend data +type Credential struct { + Handle string `json:"handle"` + ID string `json:"id"` + RawID string `json:"rawId"` + Type string `json:"type"` + AuthenticatorAttachment string `json:"authenticatorAttachment"` + Transports string `json:"transports"` + ClientExtensionResults map[string]string `json:"clientExtensionResults"` + Response struct { + AttestationObject string `json:"attestationObject"` + ClientDataJSON string `json:"clientDataJSON"` + } `json:"response"` +} + type CreateProfileData struct { TurnstileSiteKey string FirstNumber int @@ -35,8 +49,8 @@ func (d CreateProfileData) IsHumanLabel() string { return fmt.Sprintf("What is %d + %d?", d.FirstNumber, d.LastNumber) } -func extractCredentialDescriptor(jsonString string) (*sessions.Credential, error) { - cred := &sessions.Credential{} +func extractCredentialDescriptor(jsonString string) (*Credential, error) { + cred := &Credential{} // Unmarshal the credential JSON if err := json.Unmarshal([]byte(jsonString), cred); err != nil { return nil, echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("invalid credential format: %v", err)) diff --git a/internal/gateway/handlers/register/forms.templ b/internal/gateway/handlers/register/forms.templ index 0e821497f..db6ce900d 100644 --- a/internal/gateway/handlers/register/forms.templ +++ b/internal/gateway/handlers/register/forms.templ @@ -4,7 +4,7 @@ import "github.com/onsonr/sonr/pkg/common/styles/layout" templ formCreateProfile(action string, method string, data CreateProfileData) {
- +
@@ -63,7 +63,7 @@ templ formCreateProfile(action string, method string, data CreateProfileData) { templ formRegisterPasskey(action, method string, data RegisterPasskeyData) { - +
@sonrProfile(data.Address, data.Name, data.Handle, data.CreationBlock) @@ -123,4 +123,3 @@ templ formRegisterPasskey(action, method string, data RegisterPasskeyData) { } - diff --git a/internal/gateway/handlers/register/forms_templ.go b/internal/gateway/handlers/register/forms_templ.go index b8f691111..c0695896e 100644 --- a/internal/gateway/handlers/register/forms_templ.go +++ b/internal/gateway/handlers/register/forms_templ.go @@ -53,7 +53,7 @@ func formCreateProfile(action string, method string, data CreateProfileData) tem if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -133,7 +133,7 @@ func formRegisterPasskey(action, method string, data RegisterPasskeyData) templ. if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" id=\"passkey-form\">
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" id=\"passkey-form\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err }