Fix passkey authentication

Also prep for better router layout

server/middlewares.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/rs/zerolog/hlog"
 	"github.com/rs/zerolog/log"
+	"gitlab.com/mstarongitlab/goutils/other"
 )
 
 type HandlerBuilder func(http.Handler) http.Handler
@@ -51,3 +52,36 @@ func LoggingMiddleware(handler http.Handler) http.Handler {
 		hlog.RequestIDHandler("req_id", "Request-Id"),
 	)
 }
+
+func passkeyIdToAccountIdTransformerMiddleware(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		s := StorageFromRequest(w, r)
+		if s == nil {
+			return
+		}
+		log := hlog.FromRequest(r)
+		passkeyId, ok := r.Context().Value(ContextKeyPasskeyUsername).(string)
+		if !ok {
+			other.HttpErr(
+				w,
+				HttpErrIdMissingContextValue,
+				"Actor name missing",
+				http.StatusInternalServerError,
+			)
+			return
+		}
+		log.Debug().Bytes("passkey-bytes", []byte(passkeyId)).Msg("Id from passkey auth")
+		acc, err := s.FindAccountByPasskeyId([]byte(passkeyId))
+		if err != nil {
+			other.HttpErr(
+				w,
+				HttpErrIdDbFailure,
+				"Failed to get account from storage",
+				http.StatusInternalServerError,
+			)
+			return
+		}
+		r = r.WithContext(context.WithValue(r.Context(), ContextKeyActorId, acc.ID))
+		handler.ServeHTTP(w, r)
+	})
+}