@markwharton/pwa-core 4.0.0 → 4.0.2

package/dist/server.d.ts

@@ -90,15 +90,15 @@ export declare const DEFAULT_TOKEN_EXPIRY_SECONDS: number;
  */
 export declare function requireAuth<T extends BaseJwtPayload>(authHeader: string | null): Result<T>;
 /**
- * Requires admin role. Use with RoleTokenPayload.
+ * Requires admin role. Generic like requireAuth — callers can extend RoleTokenPayload.
  * @param authHeader - The Authorization header value
- * @returns Result with RoleTokenPayload on success, or error with status on failure
+ * @returns Result with payload on success, or error with status on failure
  * @example
  * const auth = requireAdmin(request.headers.get('Authorization'));
  * if (!auth.ok) return resultToResponse(auth);
  * // User is admin
  */
-export declare function requireAdmin(authHeader: string | null): Result<RoleTokenPayload>;
+export declare function requireAdmin<T extends RoleTokenPayload = RoleTokenPayload>(authHeader: string | null): Result<T>;
 /**
  * Extracts API key from the X-API-Key header.
  * @param request - Request object with headers.get() method
@@ -444,6 +444,9 @@ export interface SessionAuthConfig {
     /** Additional email validation. Called after built-in domain/admin checks reject.
      *  Can only widen access, never narrow it. Supports async for database lookups. */
     isEmailAllowed?: (email: string) => boolean | Promise<boolean>;
+    /** Transform base SessionUser into an app-specific user type.
+     *  Called after session validation succeeds. Enables generic session functions. */
+    resolveUser?: (user: SessionUser) => Promise<SessionUser> | SessionUser;
     /** Base URL for magic links and SWA preview URL validation */
     appBaseUrl?: string;
     /** Required callback to send magic link emails */
@@ -482,6 +485,9 @@ export declare function initSessionAuthFromEnv(config: {
     /** Additional email validation. Called after built-in domain/admin checks reject.
      *  Can only widen access, never narrow it. */
     isEmailAllowed?: (email: string) => boolean | Promise<boolean>;
+    /** Transform base SessionUser into an app-specific user type.
+     *  Called after session validation succeeds. Enables generic session functions. */
+    resolveUser?: (user: SessionUser) => Promise<SessionUser> | SessionUser;
 }): void;
 /**
  * Parses cookies from a request's Cookie header.
@@ -580,12 +586,12 @@ export declare function verifyMagicLink(token: string): Promise<Result<{
  * const result = await validateSession(request);
  * if (!result.ok) return unauthorizedResponse();
  */
-export declare function validateSession(request: {
+export declare function validateSession<T extends SessionUser = SessionUser>(request: {
     headers: {
         get(name: string): string | null;
     };
 }): Promise<Result<{
-    user: SessionUser;
+    user: T;
     session: SessionInfo;
     refreshedCookie?: string;
 }>>;
@@ -598,12 +604,12 @@ export declare function validateSession(request: {
  * if (!result.ok) return resultToResponse(result);
  * const { user, headers } = result.data!;
  */
-export declare function getSessionUser(request: {
+export declare function getSessionUser<T extends SessionUser = SessionUser>(request: {
     headers: {
         get(name: string): string | null;
     };
 }): Promise<Result<{
-    user: SessionUser;
+    user: T;
     headers?: Record<string, string>;
 }>>;
 /**
@@ -631,8 +637,8 @@ export declare function destroySession(request: {
  *   })
  * });
  */
-export declare function withSessionAuth(handler: (request: HttpRequest, context: InvocationContext, auth: {
-    user: SessionUser;
+export declare function withSessionAuth<T extends SessionUser = SessionUser>(handler: (request: HttpRequest, context: InvocationContext, auth: {
+    user: T;
     headers?: Record<string, string>;
 }) => Promise<HttpResponseInit>): (request: HttpRequest, context: InvocationContext) => Promise<HttpResponseInit>;
 /**
@@ -647,8 +653,8 @@ export declare function withSessionAuth(handler: (request: HttpRequest, context:
  *   })
  * });
  */
-export declare function withSessionAdminAuth(handler: (request: HttpRequest, context: InvocationContext, auth: {
-    user: SessionUser;
+export declare function withSessionAdminAuth<T extends SessionUser = SessionUser>(handler: (request: HttpRequest, context: InvocationContext, auth: {
+    user: T;
     headers?: Record<string, string>;
 }) => Promise<HttpResponseInit>): (request: HttpRequest, context: InvocationContext) => Promise<HttpResponseInit>;
 /**

package/dist/server.js

@@ -245,9 +245,9 @@ function requireAuth(authHeader) {
     return (0, shared_1.ok)(result.data);
 }
 /**
- * Requires admin role. Use with RoleTokenPayload.
+ * Requires admin role. Generic like requireAuth — callers can extend RoleTokenPayload.
  * @param authHeader - The Authorization header value
- * @returns Result with RoleTokenPayload on success, or error with status on failure
+ * @returns Result with payload on success, or error with status on failure
  * @example
  * const auth = requireAdmin(request.headers.get('Authorization'));
  * if (!auth.ok) return resultToResponse(auth);
@@ -818,6 +818,7 @@ function initSessionAuthFromEnv(config) {
             ? adminEmailsStr.split(',').map(e => e.trim().toLowerCase())
             : undefined,
         isEmailAllowed: config.isEmailAllowed,
+        resolveUser: config.resolveUser,
         sendEmail: config.sendEmail,
     });
 }
@@ -1156,13 +1157,17 @@ async function validateSession(request) {
         const userEntity = await getEntityIfExists(usersClient, USER_PARTITION, sessionEntity.email.toLowerCase());
         if (!userEntity)
             return (0, shared_1.err)('User not found', shared_1.HTTP_STATUS.UNAUTHORIZED);
-        const user = {
+        const baseUser = {
             id: userEntity.id,
             email: userEntity.email,
             isAdmin: userEntity.isAdmin,
             createdAt: userEntity.createdAt,
             lastLoginAt: userEntity.lastLoginAt
         };
+        // Resolve to app-specific user type if callback is configured
+        const user = (config.resolveUser
+            ? await config.resolveUser(baseUser)
+            : baseUser);
         const session = {
             id: sessionEntity.id,
             userId: sessionEntity.userId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markwharton/pwa-core",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Shared patterns for Azure PWA projects",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",