@baseplate-dev/plugin-auth 0.6.18 → 0.6.19

package/dist/local-auth/core/generators/auth-module/templates/module/services/user-session.service.js

@@ -1,14 +1,16 @@
 // @ts-nocheck
-import { signObject, unsignObject } from '$cookieSigner';
 import { getUserSessionCookieName } from '$sessionCookie';
 import { USER_SESSION_DURATION_SEC, USER_SESSION_MAX_LIFETIME_SEC, USER_SESSION_RENEWAL_THRESHOLD_SEC, } from '$userSessionConstants';
 import { verifyRequestOrigin } from '$verifyRequestOrigin';
+import { createSigner } from '%appSecretImports';
+import { getWebOrigins } from '%appUrlsImports';
 import { InvalidSessionError } from '%authContextImports';
 import { DEFAULT_USER_ROLES } from '%authRolesImports';
-import { getConfig, isDevelopment } from '%configServiceImports';
+import { isDevelopment } from '%configServiceImports';
 import { ForbiddenError } from '%errorHandlerServiceImports';
 import { prisma } from '%prismaImports';
 import { randomBytes } from 'node:crypto';
+const sessionCookieSigner = createSigner('auth:session:v1');
 function getCookieOptions() {
     return {
         httpOnly: true,
@@ -85,7 +87,7 @@ export class CookieUserSessionService {
             ...user.roles.map((role) => role.role),
         ];
         const cookieName = getUserSessionCookieName(context.reqInfo.headers);
-        const cookieValue = signObject({ token }, getConfig().AUTH_SECRET);
+        const cookieValue = sessionCookieSigner.sign({ token });
         context.cookieStore.set(cookieName, cookieValue, getCookieOptions());
         return { userId, expiresAt, roles };
     }
@@ -122,17 +124,14 @@ export class CookieUserSessionService {
         if ((req.method !== 'GET' ||
             req.headers.upgrade?.toLowerCase() === 'websocket') &&
             req.method !== 'HEAD' &&
-            !verifyRequestOrigin(req, [req.host, ...getConfig().ALLOWED_ORIGINS])) {
+            !verifyRequestOrigin(req, [req.host, ...getWebOrigins()])) {
             throw new ForbiddenError('Invalid Origin header');
         }
         try {
-            // Unsign the session cookie
-            const sessionCookieResult = unsignObject(sessionCookieValue, getConfig().AUTH_SECRET);
+            const sessionCookieResult = sessionCookieSigner.verify(sessionCookieValue);
             if (!sessionCookieResult)
                 throw new InvalidSessionError();
             const { token } = sessionCookieResult;
-            if (typeof token !== 'string')
-                throw new InvalidSessionError();
             // Fetch and validate user session
             const userSession = await TPL_PRISMA_USER_SESSION.findUnique({
                 where: { token },
@@ -152,7 +151,7 @@ export class CookieUserSessionService {
                         expiresAt: sessionExpiryResult.newExpiry,
                     },
                 });
-                const newSignedCookie = signObject({ token }, getConfig().AUTH_SECRET);
+                const newSignedCookie = sessionCookieSigner.sign({ token });
                 reply.setCookie(cookieName, newSignedCookie, getCookieOptions());
             }
             const { user } = userSession;

package/dist/local-auth/core/generators/auth-module/templates/module/services/user-session.service.ts

@@ -10,7 +10,6 @@ import type {
 import type { CookieSerializeOptions } from '@fastify/cookie';
 import type { FastifyReply, FastifyRequest } from 'fastify';
 
-import { signObject, unsignObject } from '$cookieSigner';
 import { getUserSessionCookieName } from '$sessionCookie';
 import {
   USER_SESSION_DURATION_SEC,
@@ -18,9 +17,11 @@ import {
   USER_SESSION_RENEWAL_THRESHOLD_SEC,
 } from '$userSessionConstants';
 import { verifyRequestOrigin } from '$verifyRequestOrigin';
+import { createSigner } from '%appSecretImports';
+import { getWebOrigins } from '%appUrlsImports';
 import { InvalidSessionError } from '%authContextImports';
 import { DEFAULT_USER_ROLES } from '%authRolesImports';
-import { getConfig, isDevelopment } from '%configServiceImports';
+import { isDevelopment } from '%configServiceImports';
 import { ForbiddenError } from '%errorHandlerServiceImports';
 import { prisma } from '%prismaImports';
 import { randomBytes } from 'node:crypto';
@@ -30,6 +31,8 @@ interface SessionCookieValue {
   token: string;
 }
 
+const sessionCookieSigner = createSigner<SessionCookieValue>('auth:session:v1');
+
 function getCookieOptions(): CookieSerializeOptions {
   return {
     httpOnly: true,
@@ -131,7 +134,7 @@ export class CookieUserSessionService implements UserSessionService {
     ];
 
     const cookieName = getUserSessionCookieName(context.reqInfo.headers);
-    const cookieValue = signObject({ token }, getConfig().AUTH_SECRET);
+    const cookieValue = sessionCookieSigner.sign({ token });
 
     context.cookieStore.set(cookieName, cookieValue, getCookieOptions());
 
@@ -182,20 +185,16 @@ export class CookieUserSessionService implements UserSessionService {
       (req.method !== 'GET' ||
         req.headers.upgrade?.toLowerCase() === 'websocket') &&
       req.method !== 'HEAD' &&
-      !verifyRequestOrigin(req, [req.host, ...getConfig().ALLOWED_ORIGINS])
+      !verifyRequestOrigin(req, [req.host, ...getWebOrigins()])
     ) {
       throw new ForbiddenError('Invalid Origin header');
     }
     try {
-      // Unsign the session cookie
-      const sessionCookieResult = unsignObject(
-        sessionCookieValue,
-        getConfig().AUTH_SECRET,
-      ) as SessionCookieValue | undefined;
+      const sessionCookieResult =
+        sessionCookieSigner.verify(sessionCookieValue);
       if (!sessionCookieResult) throw new InvalidSessionError();
 
       const { token } = sessionCookieResult;
-      if (typeof token !== 'string') throw new InvalidSessionError();
 
       // Fetch and validate user session
       const userSession = await TPL_PRISMA_USER_SESSION.findUnique({
@@ -220,7 +219,7 @@ export class CookieUserSessionService implements UserSessionService {
             expiresAt: sessionExpiryResult.newExpiry,
           },
         });
-        const newSignedCookie = signObject({ token }, getConfig().AUTH_SECRET);
+        const newSignedCookie = sessionCookieSigner.sign({ token });
         reply.setCookie(cookieName, newSignedCookie, getCookieOptions());
       }
 

package/dist/local-auth/core/generators/auth-routes/auth-routes.generator.d.ts

@@ -33,6 +33,7 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
                 isTypeOnly: true;
             };
             Alert: {};
+            AlertAction: {};
             AlertDescription: {};
             AlertTitle: {};
             Autocomplete: {};
@@ -62,6 +63,7 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             buttonVariants: {};
             Calendar: {};
             Card: {};
+            CardAction: {};
             CardContent: {};
             CardDescription: {};
             CardFooter: {};
@@ -188,6 +190,10 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             NotFoundCard: {};
             NumberField: {};
             NumberFieldController: {};
+            PageHeader: {};
+            PageHeaderActions: {};
+            PageHeaderDescription: {};
+            PageHeaderTitle: {};
             Popover: {};
             PopoverContent: {};
             PopoverTrigger: {};
@@ -197,6 +203,11 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
                 isTypeOnly: true;
             };
             ScrollArea: {};
+            Section: {};
+            SectionActions: {};
+            SectionDescription: {};
+            SectionHeader: {};
+            SectionTitle: {};
             Select: {};
             SelectField: {};
             SelectFieldController: {};
@@ -252,7 +263,27 @@ export declare const authRoutesGenerator: import("@baseplate-dev/sync").Generato
             Textarea: {};
             TextareaField: {};
             TextareaFieldController: {};
+            Toast: {};
+            toast: {};
+            ToastAction: {};
+            ToastClose: {};
+            ToastContent: {};
+            ToastDescription: {};
             Toaster: {};
+            toastManager: {};
+            ToastOptions: {
+                isTypeOnly: true;
+            };
+            ToastPortal: {};
+            ToastProvider: {};
+            ToastTitle: {};
+            ToastType: {
+                isTypeOnly: true;
+            };
+            ToastUpdateOptions: {
+                isTypeOnly: true;
+            };
+            ToastViewport: {};
             Tooltip: {};
             TooltipContent: {};
             TooltipProvider: {};