Merge branch 'main' into pocketbase_v0.23

ForkbombEu · Jan 7, 2025 · 36dd000 · 36dd000
2 parents 9476972 + 701a407
commit 36dd000
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/didimo/didimo.go b/cmd/didimo/didimo.go
@@ -15,10 +15,12 @@ import (
 	"github.com/forkbombeu/didimo/pocketbase/webauthn"
 	"github.com/forkbombeu/didimo/pocketbase/zencode"
 
+	"github.com/labstack/echo/v5"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/models"
 	"github.com/pocketbase/pocketbase/plugins/jsvm"
 	"github.com/pocketbase/pocketbase/plugins/migratecmd"
 )

diff --git a/pocketbase/webauthn/webauthn.go b/pocketbase/webauthn/webauthn.go
@@ -267,7 +267,8 @@ func Register(app *pocketbase.PocketBase) error {
 			}
 			return e.JSON(http.StatusOK, make(map[string]interface{}))
 		})
-		se.Router.GET("/api/webauthn/login/begin/:email", func(e *core.RequestEvent) error {
+
+    se.Router.GET("/api/webauthn/login/begin/:email", func(e *core.RequestEvent) error {
 			w, err := NewWebAuthnFromEnv(app)
 			if err != nil {
 				return err
@@ -296,7 +297,8 @@ func Register(app *pocketbase.PocketBase) error {
 
 			return e.JSON(http.StatusOK, options)
 		})
-		se.Router.POST("/api/webauthn/login/finish/:email", func(e *core.RequestEvent) error {
+
+    se.Router.POST("/api/webauthn/login/finish/:email", func(e *core.RequestEvent) error {
 			w, err := NewWebAuthnFromEnv(app)
 			if err != nil {
 				return err