@imtbl/auth-next-server 2.12.5-alpha.21 → 2.12.6-alpha.0

package/README.md

@@ -147,7 +147,6 @@ This package provides several utilities for handling authentication in Server Co
 | `getAuthenticatedData` | SSR data fetching with client fallback | Yes | Manual |
 | `createProtectedFetchers` | Multiple pages with same error handling | Optional | Centralized |
 | `getValidSession` | Custom logic for each auth state | No | Manual (detailed) |
-| `withServerAuth` | Render different JSX per auth state | Yes | Via callbacks |
 
 ### `getAuthProps(auth)`
 
@@ -318,53 +317,6 @@ export default async function AccountPage() {
 }
 ```
 
-### `withServerAuth(auth, serverRender, options)`
-
-**Use case:** You want to render a Server Component with authenticated data, but declaratively specify fallback components for different auth states.
-
-**When to use:**
-- Server Components that fetch and render data in one place
-- When you prefer a declarative, callback-based API over imperative if/else
-- Pages where the fallback UI is a different component (not just a redirect)
-
-**Comparison with `getAuthenticatedData`:**
-- `getAuthenticatedData` returns data for you to pass to a Client Component
-- `withServerAuth` lets you render JSX directly in the Server Component
-
-```typescript
-// app/inventory/page.tsx
-// Use case: Server Component that renders inventory with fallback components
-import { auth } from "@/lib/auth";
-import { withServerAuth } from "@imtbl/auth-next-server";
-import { redirect } from "next/navigation";
-
-export default async function InventoryPage() {
-  return withServerAuth(
-    auth,
-    // This runs when token is valid - fetch and render server-side
-    async (session) => {
-      const inventory = await fetchInventory(session.accessToken);
-      return (
-        <div>
-          <h1>Your Inventory</h1>
-          <InventoryGrid items={inventory} />
-        </div>
-      );
-    },
-    {
-      // Token expired - render a client component that will refresh and fetch
-      onTokenExpired: <InventoryClientFallback />,
-      
-      // Not authenticated - redirect to login
-      onUnauthenticated: () => redirect("/login"),
-      
-      // Auth error - redirect with error message
-      onError: (error) => redirect(`/login?error=${error}`),
-    }
-  );
-}
-```
-
 ## Middleware
 
 ### `createAuthMiddleware(auth, options)`

package/dist/node/index.cjs

@@ -43,8 +43,7 @@ __export(src_exports, {
   getValidSession: () => getValidSession,
   isTokenExpired: () => isTokenExpired,
   refreshAccessToken: () => refreshAccessToken,
-  withAuth: () => withAuth,
-  withServerAuth: () => withServerAuth
+  withAuth: () => withAuth
 });
 module.exports = __toCommonJS(src_exports);
 var import_server = require("next/server");
@@ -425,30 +424,6 @@ function createProtectedFetchers(auth, onAuthError) {
     getData: createProtectedDataFetcher(auth, onAuthError)
   };
 }
-async function withServerAuth(auth, serverRender, options = {}) {
-  const result = await getValidSession(auth);
-  switch (result.status) {
-    case "authenticated":
-      return serverRender(result.session);
-    case "token_expired":
-      if (options.onTokenExpired !== void 0) {
-        return typeof options.onTokenExpired === "function" ? options.onTokenExpired() : options.onTokenExpired;
-      }
-      return serverRender(result.session);
-    case "unauthenticated":
-      if (options.onUnauthenticated !== void 0) {
-        return typeof options.onUnauthenticated === "function" ? options.onUnauthenticated() : options.onUnauthenticated;
-      }
-      throw new Error("Unauthorized: No active session");
-    case "error":
-      if (options.onError !== void 0) {
-        return typeof options.onError === "function" ? options.onError(result.error) : options.onError;
-      }
-      throw new Error(`Unauthorized: ${result.error}`);
-    default:
-      throw new Error("Unknown auth state");
-  }
-}
 function createAuthMiddleware(auth, options = {}) {
   const { loginUrl = "/login", protectedPaths, publicPaths } = options;
   return async function middleware(request) {
@@ -519,6 +494,5 @@ function withAuth(auth, handler) {
   getValidSession,
   isTokenExpired,
   refreshAccessToken,
-  withAuth,
-  withServerAuth
+  withAuth
 });

package/dist/node/index.js

@@ -377,30 +377,6 @@ function createProtectedFetchers(auth, onAuthError) {
     getData: createProtectedDataFetcher(auth, onAuthError)
   };
 }
-async function withServerAuth(auth, serverRender, options = {}) {
-  const result = await getValidSession(auth);
-  switch (result.status) {
-    case "authenticated":
-      return serverRender(result.session);
-    case "token_expired":
-      if (options.onTokenExpired !== void 0) {
-        return typeof options.onTokenExpired === "function" ? options.onTokenExpired() : options.onTokenExpired;
-      }
-      return serverRender(result.session);
-    case "unauthenticated":
-      if (options.onUnauthenticated !== void 0) {
-        return typeof options.onUnauthenticated === "function" ? options.onUnauthenticated() : options.onUnauthenticated;
-      }
-      throw new Error("Unauthorized: No active session");
-    case "error":
-      if (options.onError !== void 0) {
-        return typeof options.onError === "function" ? options.onError(result.error) : options.onError;
-      }
-      throw new Error(`Unauthorized: ${result.error}`);
-    default:
-      throw new Error("Unknown auth state");
-  }
-}
 function createAuthMiddleware(auth, options = {}) {
   const { loginUrl = "/login", protectedPaths, publicPaths } = options;
   return async function middleware(request) {
@@ -470,6 +446,5 @@ export {
   getValidSession,
   isTokenExpired,
   refreshAccessToken,
-  withAuth,
-  withServerAuth
+  withAuth
 };

package/dist/types/index.d.ts

@@ -183,37 +183,6 @@ export interface ProtectedFetchers {
  * @returns Object with getAuthProps and getData functions
  */
 export declare function createProtectedFetchers(auth: AuthFunction, onAuthError: AuthErrorHandler): ProtectedFetchers;
-/**
- * Options for withServerAuth
- */
-export interface WithServerAuthOptions<TFallback> {
-    /**
-     * Content to render when token is expired.
-     * This should typically be a Client Component that will refresh tokens and fetch data.
-     * If not provided, the serverRender function will still be called with the expired session.
-     */
-    onTokenExpired?: TFallback | (() => TFallback);
-    /**
-     * Content to render when user is not authenticated at all.
-     * If not provided, throws an error.
-     */
-    onUnauthenticated?: TFallback | (() => TFallback);
-    /**
-     * Content to render when there's an auth error (e.g., refresh token invalid).
-     * If not provided, throws an error.
-     */
-    onError?: TFallback | ((error: string) => TFallback);
-}
-/**
- * Helper for Server Components that need authenticated data.
- * Automatically handles token expiration by rendering a client fallback.
- *
- * @param auth - The auth function from NextAuth(createAuthConfig(...))
- * @param serverRender - Async function that receives valid session and returns JSX
- * @param options - Fallback options for different auth states
- * @returns The rendered content based on auth state
- */
-export declare function withServerAuth<TResult, TFallback = TResult>(auth: AuthFunction, serverRender: (session: Session) => Promise<TResult>, options?: WithServerAuthOptions<TFallback>): Promise<TResult | TFallback>;
 /**
  * Options for createAuthMiddleware
  */

package/dist/types/refresh.d.ts

@@ -1,3 +1,4 @@
+import type { ZkEvmInfo } from './types';
 /**
  * Check if the access token is expired or about to expire
  * Returns true if token expires within the buffer time (default 60 seconds)
@@ -19,10 +20,7 @@ export interface RefreshedTokens {
 /**
  * zkEvm user data extracted from the ID token
  */
-export interface ZkEvmData {
-    ethAddress: string;
-    userAdminAddress: string;
-}
+export type ZkEvmData = ZkEvmInfo;
 /**
  * Extract zkEvm claims from an ID token.
  * The ID token contains zkEvm data in the `passport` claim after user registration.

package/dist/types/types.d.ts

@@ -5,9 +5,9 @@ import type { DefaultSession } from 'next-auth';
 /**
  * zkEVM wallet information for module augmentation
  */
-interface ZkEvmInfo {
-    ethAddress: string;
-    userAdminAddress: string;
+export interface ZkEvmInfo {
+    ethAddress: `0x${string}`;
+    userAdminAddress: `0x${string}`;
 }
 /**
  * Auth.js v5 module augmentation to add Immutable-specific fields
@@ -77,10 +77,7 @@ export interface ImmutableTokenData {
         email?: string;
         nickname?: string;
     };
-    zkEvm?: {
-        ethAddress: string;
-        userAdminAddress: string;
-    };
+    zkEvm?: ZkEvmInfo;
 }
 /**
  * Response from the userinfo endpoint
@@ -95,10 +92,7 @@ export interface UserInfoResponse {
 /**
  * zkEVM user data stored in session
  */
-export interface ZkEvmUser {
-    ethAddress: string;
-    userAdminAddress: string;
-}
+export type ZkEvmUser = ZkEvmInfo;
 /**
  * Immutable user data structure
  */
@@ -108,4 +102,3 @@ export interface ImmutableUser {
     nickname?: string;
     zkEvm?: ZkEvmUser;
 }
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imtbl/auth-next-server",
-  "version": "2.12.5-alpha.21",
+  "version": "2.12.6-alpha.0",
   "description": "Immutable Auth.js v5 integration for Next.js - Server-side utilities",
   "author": "Immutable",
   "license": "Apache-2.0",

package/src/index.ts

@@ -345,80 +345,6 @@ export function createProtectedFetchers(
   };
 }
 
-/**
- * Options for withServerAuth
- */
-export interface WithServerAuthOptions<TFallback> {
-  /**
-   * Content to render when token is expired.
-   * This should typically be a Client Component that will refresh tokens and fetch data.
-   * If not provided, the serverRender function will still be called with the expired session.
-   */
-  onTokenExpired?: TFallback | (() => TFallback);
-
-  /**
-   * Content to render when user is not authenticated at all.
-   * If not provided, throws an error.
-   */
-  onUnauthenticated?: TFallback | (() => TFallback);
-
-  /**
-   * Content to render when there's an auth error (e.g., refresh token invalid).
-   * If not provided, throws an error.
-   */
-  onError?: TFallback | ((error: string) => TFallback);
-}
-
-/**
- * Helper for Server Components that need authenticated data.
- * Automatically handles token expiration by rendering a client fallback.
- *
- * @param auth - The auth function from NextAuth(createAuthConfig(...))
- * @param serverRender - Async function that receives valid session and returns JSX
- * @param options - Fallback options for different auth states
- * @returns The rendered content based on auth state
- */
-export async function withServerAuth<TResult, TFallback = TResult>(
-  auth: AuthFunction,
-  serverRender: (session: Session) => Promise<TResult>,
-  options: WithServerAuthOptions<TFallback> = {},
-): Promise<TResult | TFallback> {
-  const result = await getValidSession(auth);
-
-  switch (result.status) {
-    case 'authenticated':
-      return serverRender(result.session);
-
-    case 'token_expired':
-      if (options.onTokenExpired !== undefined) {
-        return typeof options.onTokenExpired === 'function'
-          ? (options.onTokenExpired as () => TFallback)()
-          : options.onTokenExpired;
-      }
-      // If no fallback provided, still call serverRender - handler can check session.error
-      return serverRender(result.session);
-
-    case 'unauthenticated':
-      if (options.onUnauthenticated !== undefined) {
-        return typeof options.onUnauthenticated === 'function'
-          ? (options.onUnauthenticated as () => TFallback)()
-          : options.onUnauthenticated;
-      }
-      throw new Error('Unauthorized: No active session');
-
-    case 'error':
-      if (options.onError !== undefined) {
-        return typeof options.onError === 'function'
-          ? (options.onError as (error: string) => TFallback)(result.error)
-          : options.onError;
-      }
-      throw new Error(`Unauthorized: ${result.error}`);
-
-    default:
-      throw new Error('Unknown auth state');
-  }
-}
-
 // ============================================================================
 // Middleware
 // ============================================================================

package/src/refresh.ts

@@ -1,4 +1,5 @@
 import { TOKEN_EXPIRY_BUFFER_SECONDS, DEFAULT_AUTH_DOMAIN } from './constants';
+import type { ZkEvmInfo } from './types';
 
 /**
  * Check if the access token is expired or about to expire
@@ -52,10 +53,7 @@ function decodeJwtExpiry(token: string): number {
 /**
  * zkEvm user data extracted from the ID token
  */
-export interface ZkEvmData {
-  ethAddress: string;
-  userAdminAddress: string;
-}
+export type ZkEvmData = ZkEvmInfo;
 
 /**
  * Extract zkEvm claims from an ID token.

package/src/types.ts

@@ -7,9 +7,9 @@ import type { DefaultSession } from 'next-auth';
 /**
  * zkEVM wallet information for module augmentation
  */
-interface ZkEvmInfo {
-  ethAddress: string;
-  userAdminAddress: string;
+export interface ZkEvmInfo {
+  ethAddress: `0x${string}`;
+  userAdminAddress: `0x${string}`;
 }
 
 /**
@@ -88,10 +88,7 @@ export interface ImmutableTokenData {
     email?: string;
     nickname?: string;
   };
-  zkEvm?: {
-    ethAddress: string;
-    userAdminAddress: string;
-  };
+  zkEvm?: ZkEvmInfo;
 }
 
 /**
@@ -108,10 +105,7 @@ export interface UserInfoResponse {
 /**
  * zkEVM user data stored in session
  */
-export interface ZkEvmUser {
-  ethAddress: string;
-  userAdminAddress: string;
-}
+export type ZkEvmUser = ZkEvmInfo;
 
 /**
  * Immutable user data structure