")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- templ_7745c5c3_Err = templ_7745c5c3_Var7.Render(ctx, templ_7745c5c3_Buffer)
+ templ_7745c5c3_Err = templ_7745c5c3_Var5.Render(ctx, templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -207,9 +185,9 @@ func CancelButton() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var8 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var8 == nil {
- templ_7745c5c3_Var8 = templ.NopComponent
+ templ_7745c5c3_Var6 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var6 == nil {
+ templ_7745c5c3_Var6 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
Cancel")
@@ -236,21 +214,21 @@ func SubmitButton(text string) templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var9 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var9 == nil {
- templ_7745c5c3_Var9 = templ.NopComponent
+ templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var7 == nil {
+ templ_7745c5c3_Var7 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- var templ_7745c5c3_Var10 string
- templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(text)
+ var templ_7745c5c3_Var8 string
+ templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(text)
if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/nebula/form/base.templ`, Line: 55, Col: 8}
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
diff --git a/internal/nebula/input/input_handle.templ b/internal/nebula/input/input_handle.templ
index 586a0dfc2..78bafc3be 100644
--- a/internal/nebula/input/input_handle.templ
+++ b/internal/nebula/input/input_handle.templ
@@ -13,8 +13,8 @@ func (s HandleState) string() string {
}
templ Handle() {
-
-
+
+
@@ -23,20 +23,20 @@ templ Handle() {
}
-templ HandleError() {
-
+templ HandleError(value string) {
+
-
+
}
-templ HandleValid() {
-
+templ HandleSuccess(value string) {
+
diff --git a/internal/nebula/input/input_handle_templ.go b/internal/nebula/input/input_handle_templ.go
index fb3496700..87c3bab24 100644
--- a/internal/nebula/input/input_handle_templ.go
+++ b/internal/nebula/input/input_handle_templ.go
@@ -41,7 +41,7 @@ func Handle() templ.Component {
templ_7745c5c3_Var1 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -49,7 +49,7 @@ func Handle() templ.Component {
})
}
-func HandleError() templ.Component {
+func HandleError(value string) templ.Component {
return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -70,7 +70,20 @@ func HandleError() templ.Component {
templ_7745c5c3_Var2 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -78,7 +91,7 @@ func HandleError() templ.Component {
})
}
-func HandleValid() templ.Component {
+func HandleSuccess(value string) templ.Component {
return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -94,12 +107,25 @@ func HandleValid() templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var3 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var3 == nil {
- templ_7745c5c3_Var3 = templ.NopComponent
+ templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var4 == nil {
+ templ_7745c5c3_Var4 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
diff --git a/internal/nebula/input/input_ishuman.templ b/internal/nebula/input/input_ishuman.templ
new file mode 100644
index 000000000..2b0ef1437
--- /dev/null
+++ b/internal/nebula/input/input_ishuman.templ
@@ -0,0 +1,25 @@
+package input
+
+import "fmt"
+
+templ HumanSlider(firstNumber int, lastNumber int) {
+
+
+
+}
+
+templ HumanSliderError(firstNumber int, lastNumber int) {
+
+
+
+ Invalid Human Sum
+
+}
+
+templ HumanSliderSuccess() {
+
+}
+
+func humanLabel(firstNumber int, lastNumber int) string {
+ return fmt.Sprintf("What is %d + %d?", firstNumber, lastNumber)
+}
diff --git a/internal/nebula/input/input_ishuman_templ.go b/internal/nebula/input/input_ishuman_templ.go
new file mode 100644
index 000000000..b7f71d3b9
--- /dev/null
+++ b/internal/nebula/input/input_ishuman_templ.go
@@ -0,0 +1,130 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.793
+package input
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import "fmt"
+
+func HumanSlider(firstNumber int, lastNumber int) templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+func HumanSliderError(firstNumber int, lastNumber int) templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var3 == nil {
+ templ_7745c5c3_Var3 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" Invalid Human Sum
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+func HumanSliderSuccess() templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var5 == nil {
+ templ_7745c5c3_Var5 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+func humanLabel(firstNumber int, lastNumber int) string {
+ return fmt.Sprintf("What is %d + %d?", firstNumber, lastNumber)
+}
+
+var _ = templruntime.GeneratedTemplate
diff --git a/internal/nebula/input/input_name.templ b/internal/nebula/input/input_name.templ
index 19eaae4f9..10caae91c 100644
--- a/internal/nebula/input/input_name.templ
+++ b/internal/nebula/input/input_name.templ
@@ -14,7 +14,7 @@ func (s NameState) string() string {
templ Name() {
-
+
diff --git a/internal/nebula/input/input_name_templ.go b/internal/nebula/input/input_name_templ.go
index c036e18ba..cc2845d6d 100644
--- a/internal/nebula/input/input_name_templ.go
+++ b/internal/nebula/input/input_name_templ.go
@@ -41,7 +41,7 @@ func Name() templ.Component {
templ_7745c5c3_Var1 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
diff --git a/internal/nebula/input/input_passkey.templ b/internal/nebula/input/input_passkey.templ
index c9510c4e8..e2236289e 100644
--- a/internal/nebula/input/input_passkey.templ
+++ b/internal/nebula/input/input_passkey.templ
@@ -39,6 +39,9 @@ script navigatorCredentialsCreate(userId string, userHandle string, challenge st
payment: {
isPayment: true,
},
+ largeBlob: {
+ supported: "preferred",
+ },
},
};
diff --git a/internal/nebula/input/input_passkey_templ.go b/internal/nebula/input/input_passkey_templ.go
index 7a2988adf..239116850 100644
--- a/internal/nebula/input/input_passkey_templ.go
+++ b/internal/nebula/input/input_passkey_templ.go
@@ -52,8 +52,8 @@ func Passkey(addr string, userHandle string, challenge string) templ.Component {
func navigatorCredentialsCreate(userId string, userHandle string, challenge string) templ.ComponentScript {
return templ.ComponentScript{
- Name: `__templ_navigatorCredentialsCreate_7340`,
- Function: `function __templ_navigatorCredentialsCreate_7340(userId, userHandle, challenge){const publicKey = {
+ Name: `__templ_navigatorCredentialsCreate_63c0`,
+ Function: `function __templ_navigatorCredentialsCreate_63c0(userId, userHandle, challenge){const publicKey = {
challenge: Uint8Array.from(challenge, (c) => c.charCodeAt(0)),
rp: {
name: "Sonr.ID",
@@ -84,6 +84,9 @@ func navigatorCredentialsCreate(userId string, userHandle string, challenge stri
payment: {
isPayment: true,
},
+ largeBlob: {
+ supported: "preferred",
+ },
},
};
@@ -137,8 +140,8 @@ navigator.credentials
alert(` + "`" + `Failed to create passkey: ${err.message || 'Unknown error'}` + "`" + `);
});
}`,
- Call: templ.SafeScript(`__templ_navigatorCredentialsCreate_7340`, userId, userHandle, challenge),
- CallInline: templ.SafeScriptInline(`__templ_navigatorCredentialsCreate_7340`, userId, userHandle, challenge),
+ Call: templ.SafeScript(`__templ_navigatorCredentialsCreate_63c0`, userId, userHandle, challenge),
+ CallInline: templ.SafeScriptInline(`__templ_navigatorCredentialsCreate_63c0`, userId, userHandle, challenge),
}
}
diff --git a/internal/nebula/input/slider_isHuman.templ b/internal/nebula/input/slider_isHuman.templ
deleted file mode 100644
index 2d3d8baa7..000000000
--- a/internal/nebula/input/slider_isHuman.templ
+++ /dev/null
@@ -1,11 +0,0 @@
-package input
-
-import "fmt"
-
-templ HumanSlider(firstNumber int, lastNumber int) {
-
-}
-
-func formatHumanSliderLabel(firstNumber int, lastNumber int) string {
- return fmt.Sprintf("What is %d + %d?", firstNumber, lastNumber)
-}
diff --git a/internal/nebula/input/slider_isHuman_templ.go b/internal/nebula/input/slider_isHuman_templ.go
deleted file mode 100644
index 505ec86fa..000000000
--- a/internal/nebula/input/slider_isHuman_templ.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.793
-package input
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
-import "fmt"
-
-func HumanSlider(firstNumber int, lastNumber int) templ.Component {
- return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
- templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
- if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
- return templ_7745c5c3_CtxErr
- }
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
- if !templ_7745c5c3_IsBuffer {
- defer func() {
- templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err == nil {
- templ_7745c5c3_Err = templ_7745c5c3_BufErr
- }
- }()
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var1 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var1 == nil {
- templ_7745c5c3_Var1 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- return templ_7745c5c3_Err
- })
-}
-
-func formatHumanSliderLabel(firstNumber int, lastNumber int) string {
- return fmt.Sprintf("What is %d + %d?", firstNumber, lastNumber)
-}
-
-var _ = templruntime.GeneratedTemplate
diff --git a/internal/nebula/layout/head.templ b/internal/nebula/layout/head.templ
index d42780a80..d2643c111 100644
--- a/internal/nebula/layout/head.templ
+++ b/internal/nebula/layout/head.templ
@@ -103,6 +103,8 @@ templ Htmx() {
+
+
}
}
diff --git a/internal/nebula/layout/head_templ.go b/internal/nebula/layout/head_templ.go
index fe6d98888..d14958299 100644
--- a/internal/nebula/layout/head_templ.go
+++ b/internal/nebula/layout/head_templ.go
@@ -431,6 +431,32 @@ func Htmx() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"> ")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
@@ -462,21 +488,21 @@ func Nebula(version string) templ.Component {
}()
}
ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var21 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var21 == nil {
- templ_7745c5c3_Var21 = templ.NopComponent
+ templ_7745c5c3_Var23 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var23 == nil {
+ templ_7745c5c3_Var23 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(":" that is used
- // to extract token from the request.
- // Optional. Default value "header:Authorization".
- // Possible values:
- // - "header:"
- // - "query:"
- // - "param:"
- // - "cookie:"
- TokenLookup string
-
- // AuthScheme to be used in the Authorization header.
- // Optional. Default value "Bearer".
- AuthScheme string
-}
-
-// DefaultControllerConfig is the default UCAN middleware config
-var DefaultControllerConfig = ControllerConfig{
- Skipper: nil,
- TokenLookup: "header:Authorization",
- AuthScheme: "Bearer",
-}
-
-type Option func(c *ControllerConfig)
-
-func WithSkipper(skipper func(c echo.Context) bool) Option {
- return func(c *ControllerConfig) {
- c.Skipper = skipper
- }
-}
-
-func WithAuthScheme(scheme string) Option {
- return func(c *ControllerConfig) {
- c.AuthScheme = scheme
- }
-}
-
-// WithTokenLookup sets the token lookup strategy
-func WithTokenLookup(lookup string) Option {
- return func(c *ControllerConfig) {
- c.TokenLookup = lookup
- }
-}
diff --git a/pkg/didauth/controller/middleware.go b/pkg/didauth/controller/middleware.go
deleted file mode 100644
index 3c88539a1..000000000
--- a/pkg/didauth/controller/middleware.go
+++ /dev/null
@@ -1,122 +0,0 @@
-//go:build js && wasm
-// +build js,wasm
-
-package controller
-
-import (
- "fmt"
- "strings"
-
- "github.com/labstack/echo/v4"
- "github.com/onsonr/sonr/crypto/mpc/spec"
-)
-
-// Middleware returns middleware to validate Middleware tokens
-func Middleware(source spec.KeyshareSource, opts ...Option) echo.MiddlewareFunc {
- c := DefaultControllerConfig
- for _, opt := range opts {
- opt(&c)
- }
- c.KeySource = source
- return initWithConfig(c)
-}
-
-// initWithConfig returns UCAN middleware with custom config
-func initWithConfig(config ControllerConfig) echo.MiddlewareFunc {
- // Defaults
- if config.Skipper == nil {
- config.Skipper = DefaultControllerConfig.Skipper
- }
- if config.TokenLookup == "" {
- config.TokenLookup = DefaultControllerConfig.TokenLookup
- }
- if config.AuthScheme == "" {
- config.AuthScheme = DefaultControllerConfig.AuthScheme
- }
-
- // Initialize
- parts := strings.Split(config.TokenLookup, ":")
- extractor := tokenFromHeader(parts[1], config.AuthScheme)
- switch parts[0] {
- case "query":
- extractor = tokenFromQuery(parts[1])
- case "param":
- extractor = tokenFromParam(parts[1])
- case "cookie":
- extractor = tokenFromCookie(parts[1])
- }
-
- return func(next echo.HandlerFunc) echo.HandlerFunc {
- return func(c echo.Context) error {
- if config.Skipper != nil && config.Skipper(c) {
- return next(c)
- }
-
- auth, err := extractor(c)
- if err != nil {
- return echo.NewHTTPError(401, err.Error())
- }
-
- parser := config.KeySource.UCANParser()
- token, err := parser.ParseAndVerify(c.Request().Context(), auth)
- if err != nil {
- return echo.NewHTTPError(401, "invalid UCAN token")
- }
-
- // Store token in context
- c.Set("ucan", token)
- return next(c)
- }
- }
-}
-
-// tokenFromHeader extracts token from header
-func tokenFromHeader(header string, authScheme string) func(echo.Context) (string, error) {
- return func(c echo.Context) (string, error) {
- auth := c.Request().Header.Get(header)
- if auth == "" {
- return "", fmt.Errorf("missing auth token")
- }
- if authScheme == "" {
- return auth, nil
- }
- l := len(authScheme)
- if len(auth) > l+1 && auth[:l] == authScheme {
- return auth[l+1:], nil
- }
- return "", fmt.Errorf("invalid auth scheme")
- }
-}
-
-// tokenFromQuery extracts token from query string
-func tokenFromQuery(param string) func(echo.Context) (string, error) {
- return func(c echo.Context) (string, error) {
- token := c.QueryParam(param)
- if token == "" {
- return "", fmt.Errorf("missing auth token")
- }
- return token, nil
- }
-}
-
-// tokenFromParam extracts token from url param
-func tokenFromParam(param string) func(echo.Context) (string, error) {
- return func(c echo.Context) (string, error) {
- token := c.Param(param)
- if token == "" {
- return "", fmt.Errorf("missing auth token")
- }
- return token, nil
- }
-}
-
-// tokenFromCookie extracts token from cookie
-func tokenFromCookie(name string) func(echo.Context) (string, error) {
- return func(c echo.Context) (string, error) {
- cookie, err := c.Cookie(name)
- if err != nil {
- return "", fmt.Errorf("missing auth token")
- }
- return cookie.Value, nil
- }
-}
diff --git a/pkg/didauth/exports.go b/pkg/didauth/exports.go
deleted file mode 100644
index 4789df4ca..000000000
--- a/pkg/didauth/exports.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package didauth provides middleware and utilities for DID-based authentication
-package didauth
diff --git a/pkg/didauth/producer/context.go b/pkg/didauth/producer/context.go
deleted file mode 100644
index ba7311c1d..000000000
--- a/pkg/didauth/producer/context.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package producer
-
-import (
- "github.com/labstack/echo/v4"
- "github.com/onsonr/sonr/crypto/ucan"
- "github.com/onsonr/sonr/pkg/ipfsapi"
-)
-
-type ProducerContext struct {
- echo.Context
- // TokenParser is the attentuations assigned to the producer service
- TokenParser *ucan.TokenParser
-
- // TokenStore is the token store used to store and retrieve tokens
- TokenStore ipfsapi.IPFSTokenStore
-
- // IPFSClient is the IPFS client used to resolve the UCAN
- IPFSClient ipfsapi.Client
-}
diff --git a/pkg/didauth/producer/middleware.go b/pkg/didauth/producer/middleware.go
deleted file mode 100644
index 82f59eb92..000000000
--- a/pkg/didauth/producer/middleware.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package producer
-
-import (
- "github.com/onsonr/sonr/crypto/mpc"
- "github.com/onsonr/sonr/crypto/ucan"
- "github.com/onsonr/sonr/pkg/ipfsapi"
-
- "github.com/labstack/echo/v4"
-)
-
-// Middleware returns middleware to spawn controllers and validate UCAN tokens
-func Middleware(ipc ipfsapi.Client, perms ucan.Permissions) echo.MiddlewareFunc {
- // Setup token store and parser
- store := ipfsapi.NewUCANStore(ipc)
- parser := ucan.NewTokenParser(perms.GetConstructor(), store, store)
-
- // Return middleware
- return func(next echo.HandlerFunc) echo.HandlerFunc {
- return func(c echo.Context) error {
- ctx := ProducerContext{
- Context: c,
- IPFSClient: ipc,
- TokenParser: parser,
- TokenStore: store,
- }
- return next(ctx)
- }
- }
-}
-
-func NewKeyset(c echo.Context) (mpc.Enclave, error) {
- ks, err := mpc.GenEnclave()
- if err != nil {
- return nil, err
- }
- return ks, nil
-}
diff --git a/pkg/didauth/resolver/conn.go b/pkg/didauth/resolver/conn.go
deleted file mode 100644
index 067bc3d90..000000000
--- a/pkg/didauth/resolver/conn.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package resolver
-
-import (
- "net/http"
-
- "github.com/labstack/echo/v4"
- config "github.com/onsonr/sonr/pkg/config/hway"
- "google.golang.org/grpc"
-)
-
-type ClientsContext struct {
- echo.Context
- addr string
-}
-
-func GetClientConn(c echo.Context) (*grpc.ClientConn, error) {
- cc, ok := c.(*ClientsContext)
- if !ok {
- return nil, echo.NewHTTPError(http.StatusInternalServerError, "ClientsContext not found")
- }
- grpcConn, err := grpc.NewClient(cc.addr, grpc.WithInsecure())
- if err != nil {
- return nil, echo.NewHTTPError(http.StatusInternalServerError, "Failed to dial gRPC")
- }
- return grpcConn, nil
-}
-
-func Middleware(env config.Hway) echo.MiddlewareFunc {
- return func(next echo.HandlerFunc) echo.HandlerFunc {
- return func(c echo.Context) error {
- cc := &ClientsContext{Context: c, addr: env.GetSonrGrpcUrl()}
- return next(cc)
- }
- }
-}
diff --git a/pkg/didauth/resolver/grpc.go b/pkg/didauth/resolver/grpc.go
deleted file mode 100644
index ab743f42c..000000000
--- a/pkg/didauth/resolver/grpc.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package resolver
-
-import (
- bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
- "github.com/labstack/echo/v4"
- didv1 "github.com/onsonr/sonr/api/did/v1"
- dwnv1 "github.com/onsonr/sonr/api/dwn/v1"
- svcv1 "github.com/onsonr/sonr/api/svc/v1"
-)
-
-func BankQueryClient(c echo.Context) (bankv1beta1.QueryClient, error) {
- conn, err := GetClientConn(c)
- if err != nil {
- return nil, err
- }
- return bankv1beta1.NewQueryClient(conn), nil
-}
-
-func DIDQueryClient(c echo.Context) (didv1.QueryClient, error) {
- conn, err := GetClientConn(c)
- if err != nil {
- return nil, err
- }
- return didv1.NewQueryClient(conn), nil
-}
-
-func DWNQueryClient(c echo.Context) (dwnv1.QueryClient, error) {
- conn, err := GetClientConn(c)
- if err != nil {
- return nil, err
- }
- return dwnv1.NewQueryClient(conn), nil
-}
-
-func SVCQueryClient(c echo.Context) (svcv1.QueryClient, error) {
- conn, err := GetClientConn(c)
- if err != nil {
- return nil, err
- }
- return svcv1.NewQueryClient(conn), nil
-}
diff --git a/pkg/gateway/gateway.go b/pkg/gateway/gateway.go
new file mode 100644
index 000000000..368ecbd40
--- /dev/null
+++ b/pkg/gateway/gateway.go
@@ -0,0 +1,45 @@
+// Package gateway provides the default routes for the Sonr hway.
+package gateway
+
+import (
+ "github.com/labstack/echo-contrib/echoprometheus"
+ "github.com/labstack/echo/v4"
+ echomiddleware "github.com/labstack/echo/v4/middleware"
+ config "github.com/onsonr/sonr/internal/config/hway"
+ "github.com/onsonr/sonr/internal/database"
+ "github.com/onsonr/sonr/pkg/common"
+ "github.com/onsonr/sonr/pkg/gateway/middleware"
+ "github.com/onsonr/sonr/pkg/gateway/routes"
+)
+
+type Gateway = *echo.Echo
+
+// New returns a new Gateway instance
+func New(env config.Hway, ipc common.IPFS) (Gateway, error) {
+ db, err := database.NewDB(env)
+ if err != nil {
+ return nil, err
+ }
+ e := echo.New()
+ // Override default behaviors
+ e.IPExtractor = echo.ExtractIPDirect()
+ e.HTTPErrorHandler = redirectOnError("http://localhost:3000")
+
+ // Built-in middleware
+ e.Use(echoprometheus.NewMiddleware("hway"))
+ e.Use(echomiddleware.Logger())
+ e.Use(echomiddleware.Recover())
+ e.Use(middleware.UseGateway(env, ipc, db))
+ routes.Register(e)
+ return e, nil
+}
+
+func redirectOnError(target string) echo.HTTPErrorHandler {
+ return func(err error, c echo.Context) {
+ if he, ok := err.(*echo.HTTPError); ok {
+ // Log the error if needed
+ c.Logger().Errorf("Error: %v", he.Message)
+ middleware.RenderError(c, he)
+ }
+ }
+}
diff --git a/pkg/gateway/handlers/check_handler.go b/pkg/gateway/handlers/check_handler.go
new file mode 100644
index 000000000..7f08efc7c
--- /dev/null
+++ b/pkg/gateway/handlers/check_handler.go
@@ -0,0 +1,33 @@
+package handlers
+
+import (
+ "github.com/labstack/echo/v4"
+
+ "github.com/onsonr/sonr/pkg/gateway/middleware"
+ "github.com/onsonr/sonr/internal/nebula/input"
+)
+
+// ValidateProfileHandle finds the chosen handle and verifies it is unique
+func ValidateProfileHandle(c echo.Context) error {
+ handle := c.FormValue("handle")
+ //
+ // if ok {
+ // return middleware.Render(c, input.HandleError(handle))
+ // }
+ //
+ return middleware.Render(c, input.HandleSuccess(handle))
+}
+
+// ValidateProfileHandle finds the chosen handle and verifies it is unique
+func ValidateIsHumanSum(c echo.Context) error {
+ // data := context.GetCreateProfileData(c)
+ // value := c.FormValue("is_human")
+ // intValue, err := strconv.Atoi(value)
+ // if err != nil {
+ // return middleware.Render(c, input.HumanSliderError(data.FirstNumber, data.LastNumber))
+ // }
+ // if intValue != data.Sum() {
+ // return middleware.Render(c, input.HumanSliderError(data.FirstNumber, data.LastNumber))
+ // }
+ return middleware.Render(c, input.HumanSliderSuccess())
+}
diff --git a/pkg/gateway/handlers/initial_handler.go b/pkg/gateway/handlers/initial_handler.go
new file mode 100644
index 000000000..7087d670e
--- /dev/null
+++ b/pkg/gateway/handlers/initial_handler.go
@@ -0,0 +1,16 @@
+package handlers
+
+import (
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/pkg/gateway/middleware"
+)
+
+func RenderIndex(c echo.Context) error {
+ // Initialize the session
+ err := middleware.NewSession(c)
+ if err != nil {
+ return middleware.RenderError(c, err)
+ }
+ // Render the initial view
+ return middleware.RenderInitial(c)
+}
diff --git a/pkg/gateway/handlers/register_handler.go b/pkg/gateway/handlers/register_handler.go
new file mode 100644
index 000000000..ecf785efc
--- /dev/null
+++ b/pkg/gateway/handlers/register_handler.go
@@ -0,0 +1,25 @@
+package handlers
+
+import (
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/pkg/gateway/middleware"
+ "github.com/onsonr/sonr/pkg/gateway/types"
+ "github.com/onsonr/sonr/pkg/gateway/views"
+)
+
+func RenderProfileCreate(c echo.Context) error {
+ // numF, numL := middleware.GetHumanVerificationNumbers(c)
+ params := types.CreateProfileParams{
+ FirstNumber: int(middleware.CurrentBlock(c)),
+ LastNumber: int(middleware.CurrentBlock(c)),
+ }
+ return middleware.Render(c, views.RegisterProfileView(params))
+}
+
+func RenderPasskeyCreate(c echo.Context) error {
+ return middleware.Render(c, views.RegisterPasskeyView(types.CreatePasskeyParams{}))
+}
+
+func RenderVaultLoading(c echo.Context) error {
+ return middleware.Render(c, views.LoadingView())
+}
diff --git a/pkg/gateway/handlers/vault_handler.go b/pkg/gateway/handlers/vault_handler.go
new file mode 100644
index 000000000..6a213f8a8
--- /dev/null
+++ b/pkg/gateway/handlers/vault_handler.go
@@ -0,0 +1,29 @@
+package handlers
+
+import (
+ "encoding/json"
+
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/pkg/gateway/types"
+ "github.com/onsonr/sonr/pkg/gateway/middleware"
+)
+
+// SubmitProfileHandle submits a profile handle
+func SubmitProfileHandle(c echo.Context) error {
+ return nil
+}
+
+// SubmitPublicKeyCredential submits a public key credential
+func SubmitPublicKeyCredential(c echo.Context) error {
+ credentialJSON := c.FormValue("credential")
+ cred := &types.CredentialDescriptor{}
+ // Unmarshal the credential JSON
+ if err := json.Unmarshal([]byte(credentialJSON), cred); err != nil {
+ return middleware.RenderError(c, err)
+ }
+ err := middleware.SubmitCredential(c, cred)
+ if err != nil {
+ return middleware.RenderError(c, err)
+ }
+ return nil
+}
diff --git a/pkg/gateway/middleware/credentials.go b/pkg/gateway/middleware/credentials.go
new file mode 100644
index 000000000..a0fe355f2
--- /dev/null
+++ b/pkg/gateway/middleware/credentials.go
@@ -0,0 +1,44 @@
+package middleware
+
+import (
+ "net/http"
+
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/internal/database/repository"
+ "github.com/onsonr/sonr/pkg/gateway/types"
+)
+
+func ListCredentials(c echo.Context, handle string) ([]*types.CredentialDescriptor, error) {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, echo.NewHTTPError(http.StatusInternalServerError, "Credentials Context not found")
+ }
+ creds, err := cc.dbq.GetCredentialsByHandle(bgCtx(), handle)
+ if err != nil {
+ return nil, err
+ }
+ return types.CredentialArrayToDescriptors(creds), nil
+}
+
+func SubmitCredential(c echo.Context, cred *types.CredentialDescriptor) error {
+ origin := GetOrigin(c)
+ handle := GetHandle(c)
+ md := cred.ToModel(handle, origin)
+
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return echo.NewHTTPError(http.StatusInternalServerError, "Credentials Context not found")
+ }
+
+ _, err := cc.dbq.InsertCredential(bgCtx(), repository.InsertCredentialParams{
+ Handle: handle,
+ CredentialID: md.CredentialID,
+ Origin: origin,
+ Type: md.Type,
+ Transports: md.Transports,
+ })
+ if err != nil {
+ return err
+ }
+ return nil
+}
diff --git a/pkg/gateway/middleware/middleware.go b/pkg/gateway/middleware/middleware.go
new file mode 100644
index 000000000..9e5b9acb5
--- /dev/null
+++ b/pkg/gateway/middleware/middleware.go
@@ -0,0 +1,40 @@
+package middleware
+
+import (
+ "database/sql"
+
+ "github.com/labstack/echo/v4"
+ "github.com/medama-io/go-useragent"
+ "github.com/onsonr/sonr/crypto/mpc"
+ "github.com/onsonr/sonr/internal/config/hway"
+ "github.com/onsonr/sonr/internal/database/repository"
+ "github.com/onsonr/sonr/pkg/common"
+)
+
+type GatewayContext struct {
+ echo.Context
+ agent useragent.UserAgent
+ id string
+ dbq *repository.Queries
+ ipfsClient common.IPFS
+ tokenStore common.IPFSTokenStore
+ stagedEnclaves map[string]mpc.Enclave
+ grpcAddr string
+}
+
+func UseGateway(env hway.Hway, ipc common.IPFS, db *sql.DB) echo.MiddlewareFunc {
+ return func(next echo.HandlerFunc) echo.HandlerFunc {
+ return func(c echo.Context) error {
+ ua := useragent.NewParser()
+ ctx := &GatewayContext{
+ agent: ua.Parse(c.Request().UserAgent()),
+ Context: c,
+ dbq: repository.New(db),
+ ipfsClient: ipc,
+ grpcAddr: env.GetSonrGrpcUrl(),
+ tokenStore: common.NewUCANStore(ipc),
+ }
+ return next(ctx)
+ }
+ }
+}
diff --git a/pkg/gateway/middleware/profiles.go b/pkg/gateway/middleware/profiles.go
new file mode 100644
index 000000000..43e0d8a1d
--- /dev/null
+++ b/pkg/gateway/middleware/profiles.go
@@ -0,0 +1,100 @@
+package middleware
+
+import (
+ "net/http"
+
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/internal/context"
+ "github.com/onsonr/sonr/internal/database/repository"
+)
+
+func CheckHandleUnique(c echo.Context, handle string) bool {
+ ctx, ok := c.(*GatewayContext)
+ if !ok {
+ return false
+ }
+ ok, err := ctx.dbq.CheckHandleExists(bgCtx(), handle)
+ if err != nil {
+ return false
+ }
+ if ok {
+ return false
+ }
+ context.WriteCookie(c, context.UserHandle, handle)
+ return true
+}
+
+func CreateProfile(c echo.Context) (*repository.Profile, error) {
+ ctx, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, echo.NewHTTPError(http.StatusInternalServerError, "Profile Context not found")
+ }
+ address := c.FormValue("address")
+ handle := c.FormValue("handle")
+ origin := c.FormValue("origin")
+ name := c.FormValue("name")
+ profile, err := ctx.dbq.InsertProfile(bgCtx(), repository.InsertProfileParams{
+ Address: address,
+ Handle: handle,
+ Origin: origin,
+ Name: name,
+ })
+ if err != nil {
+ return nil, err
+ }
+ // Update session with profile id
+ sid := GetSessionID(c)
+ _, err = ctx.dbq.UpdateSessionWithProfileID(bgCtx(), repository.UpdateSessionWithProfileIDParams{
+ ProfileID: profile.ID,
+ ID: sid,
+ })
+ if err != nil {
+ return nil, err
+ }
+ return &profile, nil
+}
+
+func UpdateProfile(c echo.Context) (*repository.Profile, error) {
+ ctx, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, echo.NewHTTPError(http.StatusInternalServerError, "Profile Context not found")
+ }
+ address := c.FormValue("address")
+ handle := c.FormValue("handle")
+ name := c.FormValue("name")
+ profile, err := ctx.dbq.UpdateProfile(bgCtx(), repository.UpdateProfileParams{
+ Address: address,
+ Handle: handle,
+ Name: name,
+ })
+ if err != nil {
+ return nil, err
+ }
+ return &profile, nil
+}
+
+func ReadProfile(c echo.Context) (*repository.Profile, error) {
+ ctx, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, echo.NewHTTPError(http.StatusInternalServerError, "Profile Context not found")
+ }
+ handle := c.Param("handle")
+ profile, err := ctx.dbq.GetProfileByHandle(bgCtx(), handle)
+ if err != nil {
+ return nil, err
+ }
+ return &profile, nil
+}
+
+func DeleteProfile(c echo.Context) error {
+ ctx, ok := c.(*GatewayContext)
+ if !ok {
+ return echo.NewHTTPError(http.StatusInternalServerError, "Profile Context not found")
+ }
+ address := c.Param("address")
+ err := ctx.dbq.SoftDeleteProfile(bgCtx(), address)
+ if err != nil {
+ return err
+ }
+ return nil
+}
diff --git a/pkg/gateway/middleware/renderer.go b/pkg/gateway/middleware/renderer.go
new file mode 100644
index 000000000..c0759c614
--- /dev/null
+++ b/pkg/gateway/middleware/renderer.go
@@ -0,0 +1,42 @@
+package middleware
+
+import (
+ "bytes"
+
+ "github.com/a-h/templ"
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/pkg/gateway/views"
+)
+
+func Render(c echo.Context, cmp templ.Component) error {
+ // Create a buffer to store the rendered HTML
+ buf := &bytes.Buffer{}
+ // Render the component to the buffer
+ err := cmp.Render(c.Request().Context(), buf)
+ if err != nil {
+ return err
+ }
+
+ // Set the content type
+ c.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTML)
+
+ // Write the buffered content to the response
+ _, err = c.Response().Write(buf.Bytes())
+ if err != nil {
+ return err
+ }
+ c.Response().WriteHeader(200)
+ return nil
+}
+
+func RenderError(c echo.Context, err error) error {
+ return Render(c, views.ErrorView(err.Error()))
+}
+
+func RenderInitial(c echo.Context) error {
+ return Render(c, views.InitialView())
+}
+
+func RenderLoading(c echo.Context) error {
+ return Render(c, views.LoadingView())
+}
diff --git a/pkg/gateway/middleware/resolver.go b/pkg/gateway/middleware/resolver.go
new file mode 100644
index 000000000..83b5a931a
--- /dev/null
+++ b/pkg/gateway/middleware/resolver.go
@@ -0,0 +1,113 @@
+package middleware
+
+import (
+ "errors"
+
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/pkg/common"
+)
+
+// CurrentBlock returns the current block
+func CurrentBlock(c echo.Context) uint64 {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return 0
+ }
+ qc, err := common.NewNodeClient(cc.grpcAddr)
+ if err != nil {
+ return 0
+ }
+ resp, err := qc.Status(bgCtx(), &common.StatusRequest{})
+ if err != nil {
+ return 0
+ }
+ return resp.GetHeight()
+}
+
+// GetBankParams returns the bank params
+func GetBankParams(c echo.Context) (*common.BankParamsResponse, error) {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, errors.New("gateway context not found")
+ }
+ cl, err := common.NewBankClient(cc.grpcAddr)
+ if err != nil {
+ return nil, err
+ }
+ resp, err := cl.Params(bgCtx(), &common.BankParamsRequest{})
+ if err != nil {
+ return nil, err
+ }
+ return resp, nil
+}
+
+// GetDIDParams returns the DID params
+func GetDIDParams(c echo.Context) (*common.DIDParamsResponse, error) {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, errors.New("gateway context not found")
+ }
+ cl, err := common.NewDIDClient(cc.grpcAddr)
+ if err != nil {
+ return nil, err
+ }
+ resp, err := cl.Params(bgCtx(), &common.DIDParamsRequest{})
+ if err != nil {
+ return nil, err
+ }
+ return resp, nil
+}
+
+// GetDWNParams returns the DWN params
+func GetDWNParams(c echo.Context) (*common.DWNParamsResponse, error) {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, errors.New("gateway context not found")
+ }
+
+ cl, err := common.NewDWNClient(cc.grpcAddr)
+ if err != nil {
+ return nil, err
+ }
+ resp, err := cl.Params(bgCtx(), &common.DWNParamsRequest{})
+ if err != nil {
+ return nil, err
+ }
+ return resp, nil
+}
+
+// GetNodeStatus returns the node status
+func GetNodeStatus(c echo.Context) (*common.StatusResponse, error) {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, errors.New("gateway context not found")
+ }
+
+ cl, err := common.NewNodeClient(cc.grpcAddr)
+ if err != nil {
+ return nil, err
+ }
+ resp, err := cl.Status(bgCtx(), &common.StatusRequest{})
+ if err != nil {
+ return nil, err
+ }
+ return resp, nil
+}
+
+// GetSVCParams returns the SVC params
+func GetSVCParams(c echo.Context) (*common.SVCParamsResponse, error) {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return nil, errors.New("gateway context not found")
+ }
+
+ cl, err := common.NewSVCClient(cc.grpcAddr)
+ if err != nil {
+ return nil, err
+ }
+ resp, err := cl.Params(bgCtx(), &common.SVCParamsRequest{})
+ if err != nil {
+ return nil, err
+ }
+ return resp, nil
+}
diff --git a/pkg/gateway/middleware/sessions.go b/pkg/gateway/middleware/sessions.go
new file mode 100644
index 000000000..5ff3af37e
--- /dev/null
+++ b/pkg/gateway/middleware/sessions.go
@@ -0,0 +1,109 @@
+package middleware
+
+import (
+ gocontext "context"
+
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/internal/context"
+ "github.com/onsonr/sonr/internal/database"
+)
+
+func NewSession(c echo.Context) error {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return nil
+ }
+ baseSessionCreateParams := database.BaseSessionCreateParams(cc)
+ cc.id = baseSessionCreateParams.ID
+ if _, err := cc.dbq.CreateSession(bgCtx(), baseSessionCreateParams); err != nil {
+ return err
+ }
+ // Set Cookie
+ if err := context.WriteCookie(c, context.SessionID, cc.id); err != nil {
+ return err
+ }
+ return nil
+}
+
+// ForbiddenDevice returns true if the device is unavailable
+func ForbiddenDevice(c echo.Context) bool {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return true
+ }
+ return cc.agent.IsBot() || cc.agent.IsTV()
+}
+
+func GetOrigin(c echo.Context) string {
+ return c.Request().Host
+}
+
+func GetSessionID(c echo.Context) string {
+ // Check from context
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return ""
+ }
+ // check from cookie
+ if cc.id == "" {
+ if ok := context.CookieExists(c, context.SessionID); !ok {
+ return ""
+ }
+ cc.id = context.ReadCookieUnsafe(c, context.SessionID)
+ }
+ return cc.id
+}
+
+func GetSessionChallenge(c echo.Context) string {
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return ""
+ }
+ s, err := cc.dbq.GetChallengeBySessionID(bgCtx(), cc.id)
+ if err != nil {
+ return ""
+ }
+ return s
+}
+
+func GetHandle(c echo.Context) string {
+ // First check for the cookie
+ handle := context.ReadCookieUnsafe(c, context.UserHandle)
+ if handle != "" {
+ return handle
+ }
+
+ // Then check the session
+ cc, ok := c.(*GatewayContext)
+ if !ok {
+ return ""
+ }
+ s, err := cc.dbq.GetSessionByID(bgCtx(), cc.id)
+ if err != nil {
+ return ""
+ }
+ profile, err := cc.dbq.GetProfileByID(bgCtx(), s.ProfileID)
+ if err != nil {
+ return ""
+ }
+ return profile.Handle
+}
+
+//
+// func GetHumanVerificationNumbers(c echo.Context) (int64, int64) {
+// cc, ok := c.(*GatewayContext)
+// if !ok {
+// return 0, 0
+// }
+// s, err := cc.dbq.GetHumanVerificationNumbers(bgCtx(), cc.id)
+// if err != nil {
+// return 0, 0
+// }
+// return s.IsHumanFirst, s.IsHumanLast
+// }
+
+// utility function to get a context
+func bgCtx() gocontext.Context {
+ ctx := gocontext.Background()
+ return ctx
+}
diff --git a/pkg/gateway/middleware/vaults.go b/pkg/gateway/middleware/vaults.go
new file mode 100644
index 000000000..2dfa675f0
--- /dev/null
+++ b/pkg/gateway/middleware/vaults.go
@@ -0,0 +1,57 @@
+package middleware
+
+import (
+ "fmt"
+
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/crypto/mpc"
+ "github.com/onsonr/sonr/internal/context"
+ "github.com/onsonr/sonr/pkg/gateway/types"
+ "lukechampine.com/blake3"
+)
+
+func Spawn(c echo.Context) (types.CreatePasskeyParams, error) {
+ cc := c.(*GatewayContext)
+ block := fmt.Sprintf("%d", CurrentBlock(c))
+ handle := GetHandle(c)
+ origin := GetOrigin(c)
+ challenge := GetSessionChallenge(c)
+ sid := GetSessionID(c)
+ nonce, err := calcNonce(sid)
+ if err != nil {
+ return types.DefaultCreatePasskeyParams(), err
+ }
+ encl, err := mpc.GenEnclave(nonce)
+ if err != nil {
+ return types.DefaultCreatePasskeyParams(), err
+ }
+ cc.stagedEnclaves[sid] = encl
+ context.WriteCookie(c, context.SonrAddress, encl.Address())
+ return types.CreatePasskeyParams{
+ Address: encl.Address(),
+ Handle: handle,
+ Name: origin,
+ Challenge: challenge,
+ CreationBlock: block,
+ }, nil
+}
+
+func Claim() (types.CreatePasskeyParams, error) {
+ return types.CreatePasskeyParams{}, nil
+}
+
+// Uses blake3 to hash the sessionID to generate a nonce of length 12 bytes
+func calcNonce(sessionID string) ([]byte, error) {
+ hash := blake3.New(32, nil)
+ _, err := hash.Write([]byte(sessionID))
+ if err != nil {
+ return nil, err
+ }
+ // Read the hash into a byte slice
+ nonce := make([]byte, 12)
+ _, err = hash.Write(nonce)
+ if err != nil {
+ return nil, err
+ }
+ return nonce, nil
+}
diff --git a/pkg/gateway/routes/routes.go b/pkg/gateway/routes/routes.go
new file mode 100644
index 000000000..2cbf7092e
--- /dev/null
+++ b/pkg/gateway/routes/routes.go
@@ -0,0 +1,21 @@
+package routes
+
+import (
+ "github.com/labstack/echo/v4"
+ "github.com/onsonr/sonr/pkg/gateway/handlers"
+)
+
+func Register(e *echo.Echo) error {
+ // Register View Handlers
+ e.GET("/", handlers.RenderIndex)
+ e.GET("/register", handlers.RenderProfileCreate)
+ e.POST("/register/passkey", handlers.RenderPasskeyCreate)
+ e.POST("/register/finish", handlers.RenderVaultLoading)
+
+ // Register Validation Handlers
+ e.POST("/register/profile/handle", handlers.ValidateProfileHandle)
+ e.POST("/register/profile/is_human", handlers.ValidateIsHumanSum)
+ e.POST("/submit/profile/handle", handlers.SubmitProfileHandle)
+ e.POST("/submit/credential", handlers.SubmitPublicKeyCredential)
+ return nil
+}
diff --git a/pkg/config/embed/fs.go b/pkg/gateway/types/embed/codec.go
similarity index 68%
rename from pkg/config/embed/fs.go
rename to pkg/gateway/types/embed/codec.go
index 03256003f..16b2612d1 100644
--- a/pkg/config/embed/fs.go
+++ b/pkg/gateway/types/embed/codec.go
@@ -4,7 +4,8 @@ import (
"encoding/json"
"github.com/ipfs/boxo/files"
- config "github.com/onsonr/sonr/pkg/config/motr"
+ config "github.com/onsonr/sonr/internal/config/motr"
+ "github.com/onsonr/sonr/internal/models"
)
const SchemaVersion = 1
@@ -18,7 +19,7 @@ const (
// spawnVaultDirectory creates a new directory with the default files
func NewVaultFS(cfg *config.Config) (files.Directory, error) {
- manifestBz, err := newWebManifestBytes()
+ manifestBz, err := models.NewWebManifest()
if err != nil {
return nil, err
}
@@ -47,3 +48,17 @@ func NewVaultConfig(addr string, ucanCID string) *config.Config {
VaultSchema: DefaultSchema(),
}
}
+
+// DefaultSchema returns the default schema
+func DefaultSchema() *config.Schema {
+ return &config.Schema{
+ Version: SchemaVersion,
+ Account: getSchema(&models.Account{}),
+ Asset: getSchema(&models.Asset{}),
+ Chain: getSchema(&models.Chain{}),
+ Credential: getSchema(&models.Credential{}),
+ Grant: getSchema(&models.Grant{}),
+ Keyshare: getSchema(&models.Keyshare{}),
+ Profile: getSchema(&models.Profile{}),
+ }
+}
diff --git a/pkg/config/embed/index.html b/pkg/gateway/types/embed/index.html
similarity index 100%
rename from pkg/config/embed/index.html
rename to pkg/gateway/types/embed/index.html
diff --git a/pkg/config/embed/main.js b/pkg/gateway/types/embed/main.js
similarity index 100%
rename from pkg/config/embed/main.js
rename to pkg/gateway/types/embed/main.js
diff --git a/pkg/config/embed/sw.js b/pkg/gateway/types/embed/sw.js
similarity index 100%
rename from pkg/config/embed/sw.js
rename to pkg/gateway/types/embed/sw.js
diff --git a/pkg/config/embed/schema.go b/pkg/gateway/types/embed/utils.go
similarity index 54%
rename from pkg/config/embed/schema.go
rename to pkg/gateway/types/embed/utils.go
index 2697018fe..fac01a126 100644
--- a/pkg/config/embed/schema.go
+++ b/pkg/gateway/types/embed/utils.go
@@ -1,26 +1,19 @@
package embed
import (
+ _ "embed"
"reflect"
"strings"
-
- "github.com/onsonr/sonr/pkg/common/models"
- config "github.com/onsonr/sonr/pkg/config/motr"
)
-// DefaultSchema returns the default schema
-func DefaultSchema() *config.Schema {
- return &config.Schema{
- Version: SchemaVersion,
- Account: getSchema(&models.Account{}),
- Asset: getSchema(&models.Asset{}),
- Chain: getSchema(&models.Chain{}),
- Credential: getSchema(&models.Credential{}),
- Grant: getSchema(&models.Grant{}),
- Keyshare: getSchema(&models.Keyshare{}),
- Profile: getSchema(&models.Profile{}),
- }
-}
+//go:embed index.html
+var IndexHTML []byte
+
+//go:embed main.js
+var MainJS []byte
+
+//go:embed sw.js
+var WorkerJS []byte
func getSchema(structType interface{}) string {
t := reflect.TypeOf(structType)
diff --git a/pkg/gateway/types/forms.go b/pkg/gateway/types/forms.go
new file mode 100644
index 000000000..63a3c0363
--- /dev/null
+++ b/pkg/gateway/types/forms.go
@@ -0,0 +1,50 @@
+package types
+
+// ╭───────────────────────────────────────────────────────────╮
+// │ Create Passkey (/register/passkey) │
+// ╰───────────────────────────────────────────────────────────╯
+
+// DefaultCreatePasskeyParams returns a default CreatePasskeyParams
+func DefaultCreatePasskeyParams() CreatePasskeyParams {
+ return CreatePasskeyParams{
+ Address: "",
+ Handle: "",
+ Name: "",
+ Challenge: "",
+ CreationBlock: "",
+ }
+}
+
+// CreatePasskeyParams represents the parameters for creating a passkey
+type CreatePasskeyParams struct {
+ Address string
+ Handle string
+ Name string
+ Challenge string
+ CreationBlock string
+}
+
+// ╭───────────────────────────────────────────────────────────╮
+// │ Create Profile (/register/profile) │
+// ╰───────────────────────────────────────────────────────────╯
+
+// DefaultCreateProfileParams returns a default CreateProfileParams
+func DefaultCreateProfileParams() CreateProfileParams {
+ return CreateProfileParams{
+ TurnstileSiteKey: "",
+ FirstNumber: 0,
+ LastNumber: 0,
+ }
+}
+
+// CreateProfileParams represents the parameters for creating a profile
+type CreateProfileParams struct {
+ TurnstileSiteKey string
+ FirstNumber int
+ LastNumber int
+}
+
+// Sum returns the sum of the first and last number
+func (d CreateProfileParams) Sum() int {
+ return d.FirstNumber + d.LastNumber
+}
diff --git a/pkg/gateway/types/webauth.go b/pkg/gateway/types/webauth.go
new file mode 100644
index 000000000..17e084dea
--- /dev/null
+++ b/pkg/gateway/types/webauth.go
@@ -0,0 +1,43 @@
+package types
+
+import "github.com/onsonr/sonr/internal/database/repository"
+
+// Define the credential structure matching our frontend data
+type CredentialDescriptor struct {
+ 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"`
+}
+
+func (c *CredentialDescriptor) ToModel(handle, origin string) *repository.Credential {
+ return &repository.Credential{
+ Handle: handle,
+ Origin: origin,
+ CredentialID: c.ID,
+ Type: c.Type,
+ Transports: c.Transports,
+ AuthenticatorAttachment: c.AuthenticatorAttachment,
+ }
+}
+
+func CredentialArrayToDescriptors(credentials []repository.Credential) []*CredentialDescriptor {
+ var descriptors []*CredentialDescriptor
+ for _, cred := range credentials {
+ cd := &CredentialDescriptor{
+ ID: cred.CredentialID,
+ RawID: cred.CredentialID,
+ Type: cred.Type,
+ AuthenticatorAttachment: cred.AuthenticatorAttachment,
+ Transports: cred.Transports,
+ }
+ descriptors = append(descriptors, cd)
+ }
+ return descriptors
+}
diff --git a/pkg/gateway/views/error.templ b/pkg/gateway/views/error.templ
new file mode 100644
index 000000000..f04cc2a6c
--- /dev/null
+++ b/pkg/gateway/views/error.templ
@@ -0,0 +1,19 @@
+package views
+
+import (
+ "github.com/onsonr/sonr/internal/nebula/hero"
+ "github.com/onsonr/sonr/internal/nebula/layout"
+)
+
+templ ErrorView(err string) {
+ @layout.View("Error | Sonr.ID") {
+ @layout.Container() {
+ @hero.TitleDesc("Uh oh!", "Something went wrong.")
+
+ }
+ }
+}
diff --git a/pkg/gateway/views/error_templ.go b/pkg/gateway/views/error_templ.go
new file mode 100644
index 000000000..5ccc817d4
--- /dev/null
+++ b/pkg/gateway/views/error_templ.go
@@ -0,0 +1,98 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.793
+package views
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+ "github.com/onsonr/sonr/internal/nebula/hero"
+ "github.com/onsonr/sonr/internal/nebula/layout"
+)
+
+func ErrorView(err string) templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var3 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Err = hero.TitleDesc("Uh oh!", "Something went wrong.").Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ var templ_7745c5c3_Var4 string
+ templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(err)
+ if templ_7745c5c3_Err != nil {
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/gateway/views/error.templ`, Line: 14, Col: 10}
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
+
+
+
+ }
+ @input.Handle()
+ @input.Name()
+ @input.HumanSlider(data.FirstNumber, data.LastNumber)
+ @form.Footer() {
+ @form.CancelButton()
+ @form.SubmitButton("Next")
+ }
+ }
+ }
+ }
+ }
+}
+
+templ RegisterPasskeyView(data types.CreatePasskeyParams) {
+ @layout.View("Register | Sonr.ID") {
+ @layout.Container() {
+ @hero.TitleDesc("Link a PassKey", "This will be used to login to your vault.")
+ @form.Root("/register/finish", "passkey-form") {
+
+ @form.Body() {
+ @form.Header() {
+ @card.SonrProfile(data.Address, data.Name, data.Handle, data.CreationBlock)
+ }
+ @input.CoinSelect()
+ @form.Footer() {
+ @input.Passkey(data.Address, data.Handle, data.Challenge)
+ @form.CancelButton()
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/pkg/gateway/views/register_templ.go b/pkg/gateway/views/register_templ.go
new file mode 100644
index 000000000..6e63dc5d0
--- /dev/null
+++ b/pkg/gateway/views/register_templ.go
@@ -0,0 +1,378 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.793
+package views
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+ "github.com/onsonr/sonr/internal/nebula/card"
+ "github.com/onsonr/sonr/internal/nebula/form"
+ "github.com/onsonr/sonr/internal/nebula/hero"
+ "github.com/onsonr/sonr/internal/nebula/input"
+ "github.com/onsonr/sonr/internal/nebula/layout"
+ "github.com/onsonr/sonr/pkg/gateway/types"
+)
+
+func RegisterProfileView(data types.CreateProfileParams) templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var3 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Err = hero.TitleDesc("Basic Info", "Tell us a little about yourself.").Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Var4 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var5 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var6 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Header().Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = input.Handle().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = input.Name().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = input.HumanSlider(data.FirstNumber, data.LastNumber).Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Var7 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Err = form.CancelButton().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = form.SubmitButton("Next").Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Footer().Render(templ.WithChildren(ctx, templ_7745c5c3_Var7), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Body().Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Root("/register/passkey", "create-profile").Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = layout.Container().Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = layout.View("New Profile | Sonr.ID").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+func RegisterPasskeyView(data types.CreatePasskeyParams) templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var8 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var8 == nil {
+ templ_7745c5c3_Var8 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ templ_7745c5c3_Var9 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var10 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Err = hero.TitleDesc("Link a PassKey", "This will be used to login to your vault.").Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Var11 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Var12 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var13 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Err = card.SonrProfile(data.Address, data.Name, data.Handle, data.CreationBlock).Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Header().Render(templ.WithChildren(ctx, templ_7745c5c3_Var13), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = input.CoinSelect().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Var14 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Err = input.Passkey(data.Address, data.Handle, data.Challenge).Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = form.CancelButton().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Footer().Render(templ.WithChildren(ctx, templ_7745c5c3_Var14), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Body().Render(templ.WithChildren(ctx, templ_7745c5c3_Var12), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = form.Root("/register/finish", "passkey-form").Render(templ.WithChildren(ctx, templ_7745c5c3_Var11), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = layout.Container().Render(templ.WithChildren(ctx, templ_7745c5c3_Var10), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = layout.View("Register | Sonr.ID").Render(templ.WithChildren(ctx, templ_7745c5c3_Var9), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+var _ = templruntime.GeneratedTemplate
diff --git a/pkg/ipfsapi/iface.go b/pkg/ipfsapi/iface.go
deleted file mode 100644
index 63f4c0ef1..000000000
--- a/pkg/ipfsapi/iface.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package ipfsapi
-
-import "github.com/ipfs/boxo/files"
-
-type Client interface {
- Add(data []byte) (string, error)
- AddFile(file File) (string, error)
- AddFolder(folder Folder) (string, error)
- Get(cid string) ([]byte, error)
- IsPublished(ipns string) (bool, error)
- Exists(cid string) (bool, error)
- Pin(cid string) error
- Unpin(cid string) error
- Publish(cid string, name string) (string, error)
- Ls(cid string) ([]string, error)
-}
-
-type File interface {
- files.File
- Name() string
-}
-
-func convertFilesToMap(vs []File) map[string]files.Node {
- m := make(map[string]files.Node)
- for _, f := range vs {
- m[f.Name()] = f
- }
- return m
-}
diff --git a/internal/vault/handlers/authz.go b/pkg/vault/handlers/authz.go
similarity index 100%
rename from internal/vault/handlers/authz.go
rename to pkg/vault/handlers/authz.go
diff --git a/internal/vault/handlers/auth.go b/pkg/vault/handlers/controller.go
similarity index 100%
rename from internal/vault/handlers/auth.go
rename to pkg/vault/handlers/controller.go
diff --git a/internal/vault/handlers/feeds.go b/pkg/vault/handlers/current.go
similarity index 75%
rename from internal/vault/handlers/feeds.go
rename to pkg/vault/handlers/current.go
index 7f4621b14..609bbb780 100644
--- a/internal/vault/handlers/feeds.go
+++ b/pkg/vault/handlers/current.go
@@ -6,6 +6,6 @@ import (
"github.com/labstack/echo/v4"
)
-func RenderFeeds(c echo.Context) error {
+func RenderIndex(c echo.Context) error {
return c.Render(http.StatusOK, "index.templ", nil)
}
diff --git a/internal/vault/handlers/wallet.go b/pkg/vault/handlers/payment.go
similarity index 100%
rename from internal/vault/handlers/wallet.go
rename to pkg/vault/handlers/payment.go
diff --git a/internal/vault/handlers/profile.go b/pkg/vault/handlers/profile.go
similarity index 100%
rename from internal/vault/handlers/profile.go
rename to pkg/vault/handlers/profile.go
diff --git a/internal/vault/handlers/search.go b/pkg/vault/handlers/redirect.go
similarity index 100%
rename from internal/vault/handlers/search.go
rename to pkg/vault/handlers/redirect.go
diff --git a/pkg/vault/handlers/search.go b/pkg/vault/handlers/search.go
new file mode 100644
index 000000000..5ac8282f4
--- /dev/null
+++ b/pkg/vault/handlers/search.go
@@ -0,0 +1 @@
+package handlers
diff --git a/internal/vault/routes.go b/pkg/vault/routes/routes.go
similarity index 71%
rename from internal/vault/routes.go
rename to pkg/vault/routes/routes.go
index 30467938e..b5f14f341 100644
--- a/internal/vault/routes.go
+++ b/pkg/vault/routes/routes.go
@@ -7,11 +7,9 @@ package vault
import (
"github.com/labstack/echo/v4"
- "github.com/onsonr/sonr/internal/vault/context"
- "github.com/onsonr/sonr/pkg/config/motr"
+ "github.com/onsonr/sonr/internal/config/motr"
)
// RegisterRoutes registers the Decentralized Web Node API routes.
func RegisterRoutes(e *echo.Echo, config *motr.Config) {
- e.Use(context.Middleware(config))
}
diff --git a/pkg/vault/vault.go b/pkg/vault/vault.go
new file mode 100644
index 000000000..f7e34c8a3
--- /dev/null
+++ b/pkg/vault/vault.go
@@ -0,0 +1 @@
+package vault
diff --git a/pkg/vault/views/initial.templ b/pkg/vault/views/initial.templ
new file mode 100644
index 000000000..729477f3d
--- /dev/null
+++ b/pkg/vault/views/initial.templ
@@ -0,0 +1,16 @@
+package views
+
+import (
+ "github.com/onsonr/sonr/internal/nebula/hero"
+ "github.com/onsonr/sonr/internal/nebula/layout"
+)
+
+templ InitialView() {
+ @layout.View("Sonr.ID") {
+ @layout.Container() {
+ @hero.TitleDesc("Sonr.ID", "The decentralized identity layer for the web.")
+ @hero.StartButton()
+ @hero.SocialButtonsRow()
+ }
+ }
+}
diff --git a/pkg/vault/views/initial_templ.go b/pkg/vault/views/initial_templ.go
new file mode 100644
index 000000000..654167ee4
--- /dev/null
+++ b/pkg/vault/views/initial_templ.go
@@ -0,0 +1,97 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.793
+package views
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+ "github.com/onsonr/sonr/internal/nebula/hero"
+ "github.com/onsonr/sonr/internal/nebula/layout"
+)
+
+func InitialView() templ.Component {
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+ if templ_7745c5c3_Var1 == nil {
+ templ_7745c5c3_Var1 = templ.NopComponent
+ }
+ ctx = templ.ClearChildren(ctx)
+ templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Var3 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+ if !templ_7745c5c3_IsBuffer {
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
+ }
+ ctx = templ.InitializeContext(ctx)
+ templ_7745c5c3_Err = hero.TitleDesc("Sonr.ID", "The decentralized identity layer for the web.").Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = hero.StartButton().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = hero.SocialButtonsRow().Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = layout.Container().Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+ templ_7745c5c3_Err = layout.View("Sonr.ID").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ return templ_7745c5c3_Err
+ })
+}
+
+var _ = templruntime.GeneratedTemplate
diff --git a/pkl/sonr.net/Hway.pkl b/pkl/sonr.net/Hway.pkl
index a0a70b4a0..707c8eca7 100644
--- a/pkl/sonr.net/Hway.pkl
+++ b/pkl/sonr.net/Hway.pkl
@@ -1,4 +1,4 @@
-@go.Package { name = "github.com/onsonr/sonr/pkg/config/hway" }
+@go.Package { name = "github.com/onsonr/sonr/internal/config/hway" }
open module sonr.net.Hway
diff --git a/pkl/sonr.net/Motr.pkl b/pkl/sonr.net/Motr.pkl
index 2239e3e62..53b52ffee 100644
--- a/pkl/sonr.net/Motr.pkl
+++ b/pkl/sonr.net/Motr.pkl
@@ -1,4 +1,4 @@
-@go.Package { name = "github.com/onsonr/sonr/pkg/config/motr" }
+@go.Package { name = "github.com/onsonr/sonr/internal/config/motr" }
module sonr.net.Motr
diff --git a/pkl/sonr.orm/Models.pkl b/pkl/sonr.orm/Models.pkl
index 29ec55b74..1ffd4324a 100644
--- a/pkl/sonr.orm/Models.pkl
+++ b/pkl/sonr.orm/Models.pkl
@@ -1,4 +1,4 @@
-@go.Package { name = "github.com/onsonr/sonr/pkg/common/models" }
+@go.Package { name = "github.com/onsonr/sonr/internal/models" }
module sonr.orm.Models
diff --git a/pkl/sonr.orm/UCAN.pkl b/pkl/sonr.orm/UCAN.pkl
index 2458af38c..4c895e36e 100644
--- a/pkl/sonr.orm/UCAN.pkl
+++ b/pkl/sonr.orm/UCAN.pkl
@@ -4,30 +4,37 @@ module sonr.orm.UCAN
import "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0.5.0#/go.pkl"
-
// Capability hierarchy for smart account operations
// ----------------------------------------------
-// OWNER
-// └─ OPERATOR
-// └─ AUTHENTICATE
-// └─ AUTHORIZE
-// └─ DELEGATE
-// ├─ EXECUTE
-// └─ INVOKE
-// ├─ PROPOSE
-// └─ SIGN
-// └─ VOTE
-// └─ SET_POLICY
-// └─ SET_THRESHOLD
-// └─ RECOVER
-// └─ SOCIAL
-// └─ VAULT
+// VAULT
+// └─ CRUD/ASSET
+// └─ CRUD/AUTHZGRANT
+// └─ CRUD/PROFILE
+// └─ CRUD/RECORD
+// └─ USE/RECOVERY
+// └─ USE/SYNC
+// └─ USE/SIGNER
+// ACCOUNT
+// └─ EXEC/BROADCAST
+// └─ EXEC/QUERY
+// └─ EXEC/SIMULATE
+// └─ EXEC/VOTE
+// └─ EXEC/DELEGATE
+// └─ EXEC/INVOKE
+// └─ EXEC/SEND
+// INTERCHAIN
+// └─ TRANSFER/SWAP
+// └─ TRANSFER/SEND
+// └─ TRANSFER/ATOMIC
+// └─ TRANSFER/BATCH
+// └─ TRANSFER/P2P
+// └─ TRANSFER/SEND
-typealias Capability = "CAP_OWNER"|"CAP_OPERATOR"|"CAP_OBSERVER"|"CAP_AUTHENTICATE"|"CAP_AUTHORIZE"|"CAP_DELEGATE"|"CAP_INVOKE"|"CAP_EXECUTE"|"CAP_PROPOSE"|"CAP_SIGN"|"CAP_SET_POLICY"|"CAP_SET_THRESHOLD"|"CAP_RECOVER"|"CAP_SOCIAL"|"CAP_VOTE" | "CAP_RESOLVER" | "CAP_PRODUCER"
-
-typealias ResourceType = "RES_ACCOUNT"|"RES_TRANSACTION"|"RES_POLICY"|"RES_RECOVERY"|"RES_VAULT" | "RES_IPFS" | "RES_IPNS" | "RES_KEYSHARE"
-
-typealias PolicyType = "POLICY_THRESHOLD"|"POLICY_TIMELOCK"|"POLICY_WHITELIST" | "POLICY_KEYGEN"
-
+typealias CapVault = "crud/asset" | "crud/authzgrant" | "crud/profile" | "crud/record" | "use/recovery" | "use/sync" | "use/signer"
+typealias CapAccount = "exec/broadcast" | "exec/query" | "exec/simulate" | "exec/vote" | "exec/delegate" | "exec/invoke" | "exec/send"
+typealias CapInterchain = "transfer/swap" | "transfer/send" | "transfer/atomic" | "transfer/batch" | "transfer/p2p" | "transfer/send"
+typealias ResVault = "ks/enclave" | "loc/cid" | "loc/entity" | "loc/ipns" | "addr/sonr" | "chain/code"
+typealias ResAccount = "acc/sequence" | "acc/number" | "chain/id" | "asset/code" | "authz/grant"
+typealias ResInterchain = "channnel/port" | "chain/id" | "chain/name" | "acc/host" | "acc/controller"
diff --git a/scripts/test_node.sh b/scripts/test_node.sh
index 64f8e6cfc..5c8aa31d8 100644
--- a/scripts/test_node.sh
+++ b/scripts/test_node.sh
@@ -154,4 +154,4 @@ sed -i 's/address = ":8080"/address = "0.0.0.0:'$ROSETTA'"/g' $HOME_DIR/config/a
sed -i 's/timeout_commit = "5s"/timeout_commit = "'$BLOCK_TIME'"/g' $HOME_DIR/config/config.toml
# Start the node with 0 gas fees
-BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC"
+BINARY start --pruning=nothing --minimum-gas-prices=0$DENOM --rpc.laddr="tcp://0.0.0.0:$RPC" --grpc.address="0.0.0.0:$GRPC" --grpc-web.enable=true
diff --git a/x/dwn/types/params.go b/x/dwn/types/params.go
index a8fb759fd..9ad1d4278 100644
--- a/x/dwn/types/params.go
+++ b/x/dwn/types/params.go
@@ -3,11 +3,11 @@ package types
import (
"encoding/json"
- "github.com/onsonr/sonr/pkg/common/models"
- "github.com/onsonr/sonr/pkg/common/models/keyalgorithm"
- "github.com/onsonr/sonr/pkg/common/models/keycurve"
- "github.com/onsonr/sonr/pkg/common/models/keyencoding"
- "github.com/onsonr/sonr/pkg/common/models/keyrole"
+ "github.com/onsonr/sonr/internal/models"
+ "github.com/onsonr/sonr/internal/models/keyalgorithm"
+ "github.com/onsonr/sonr/internal/models/keycurve"
+ "github.com/onsonr/sonr/internal/models/keyencoding"
+ "github.com/onsonr/sonr/internal/models/keyrole"
)
// DefaultParams returns default module parameters.