Merge pull request #467 from kavindadimuthu/fix-refresh-issue

Author: DonOmalVindula

packages/javascript/esbuild.config.mjs

@@ -42,3 +42,17 @@ await esbuild.build({
   outfile: 'dist/cjs/index.js',
   sourcemap: true,
 });
+
+await esbuild.build({
+  ...commonOptions,
+  define: {
+    // process.versions is a Node.js-only API not available in the Edge Runtime.
+    // Replacing it with undefined makes isNode() evaluate to false, causing the
+    // logger to fall back to plain console.log() — the correct behaviour for Edge.
+    'process.versions': 'undefined',
+  },
+  format: 'esm',
+  outfile: 'dist/edge/index.js',
+  platform: 'browser',
+  sourcemap: true,
+});

packages/javascript/package.json

@@ -19,6 +19,7 @@
   "main": "dist/cjs/index.js",
   "module": "dist/index.js",
   "exports": {
+    "edge-light": "./dist/edge/index.js",
     "import": "./dist/index.js",
     "require": "./dist/cjs/index.js"
   },

packages/nextjs/esbuild.config.mjs

@@ -20,7 +20,7 @@ import {build} from 'esbuild';
 
 const commonOptions = {
   bundle: false,
-  entryPoints: ['src/index.ts', 'src/server/index.ts'],
+  entryPoints: ['src/index.ts', 'src/server/index.ts', 'src/middleware.ts'],
   platform: 'node',
   target: ['node18'],
 };

packages/nextjs/package.json

@@ -28,6 +28,12 @@
       "types": "./dist/types/server/index.d.ts",
       "import": "./dist/esm/server/index.js",
       "require": "./dist/cjs/server/index.js"
+    },
+    "./middleware": {
+      "types": "./dist/types/middleware.d.ts",
+      "edge-light": "./dist/esm/middleware.js",
+      "import": "./dist/esm/middleware.js",
+      "require": "./dist/cjs/middleware.js"
     }
   },
   "files": [

packages/nextjs/src/client/contexts/Asgardeo/AsgardeoContext.ts

@@ -20,11 +20,15 @@
 
 import {AsgardeoContextProps as AsgardeoReactContextProps} from '@asgardeo/react';
 import {Context, createContext} from 'react';
+import {RefreshResult} from '../../../server/actions/refreshToken';
 
 /**
  * Props interface of {@link AsgardeoContext}
  */
-export type AsgardeoContextProps = Partial<AsgardeoReactContextProps>;
+export type AsgardeoContextProps = Partial<AsgardeoReactContextProps> & {
+  clearSession?: () => Promise<void>;
+  refreshToken?: () => Promise<RefreshResult>;
+};
 
 /**
  * Context object for managing the Authentication flow builder core context.
@@ -33,10 +37,12 @@ const AsgardeoContext: Context<AsgardeoContextProps | null> = createContext<null
   afterSignInUrl: undefined,
   applicationId: undefined,
   baseUrl: undefined,
+  clearSession: () => Promise.resolve(),
   isInitialized: false,
   isLoading: true,
   isSignedIn: false,
   organizationHandle: undefined,
+  refreshToken: () => Promise.resolve({expiresAt: 0}),
   signIn: () => Promise.resolve({} as any),
   signInUrl: undefined,
   signOut: () => Promise.resolve({} as any),

packages/nextjs/src/client/contexts/Asgardeo/AsgardeoProvider.tsx

@@ -48,6 +48,7 @@ import {AppRouterInstance} from 'next/dist/shared/lib/app-router-context.shared-
 import {useRouter, useSearchParams} from 'next/navigation';
 import {FC, PropsWithChildren, RefObject, useEffect, useMemo, useRef, useState} from 'react';
 import AsgardeoContext, {AsgardeoContextProps} from './AsgardeoContext';
+import {RefreshResult} from '../../../server/actions/refreshToken';
 import logger from '../../../utils/logger';
 
 /**
@@ -57,6 +58,7 @@ export type AsgardeoClientProviderProps = Partial<Omit<AsgardeoProviderProps, 'b
   Pick<AsgardeoProviderProps, 'baseUrl' | 'clientId'> & {
     applicationId: AsgardeoContextProps['applicationId'];
     brandingPreference?: BrandingPreference | null;
+    clearSession: () => Promise<void>;
     createOrganization: (payload: CreateOrganizationPayload, sessionId: string) => Promise<Organization>;
     currentOrganization: Organization;
     getAllOrganizations: (options?: any, sessionId?: string) => Promise<AllOrganizationsApiResponse>;
@@ -68,6 +70,7 @@ export type AsgardeoClientProviderProps = Partial<Omit<AsgardeoProviderProps, 'b
     isSignedIn: boolean;
     myOrganizations: Organization[];
     organizationHandle: AsgardeoContextProps['organizationHandle'];
+    refreshToken: () => Promise<RefreshResult>;
     revalidateMyOrganizations?: (sessionId?: string) => Promise<Organization[]>;
     signIn: AsgardeoContextProps['signIn'];
     signOut: AsgardeoContextProps['signOut'];
@@ -85,6 +88,8 @@ const AsgardeoClientProvider: FC<PropsWithChildren<AsgardeoClientProviderProps>>
   baseUrl,
   children,
   signIn,
+  clearSession,
+  refreshToken,
   signOut,
   signUp,
   handleOAuthCallback,
@@ -292,9 +297,11 @@ const AsgardeoClientProvider: FC<PropsWithChildren<AsgardeoClientProviderProps>>
     () => ({
       applicationId,
       baseUrl,
+      clearSession,
       isLoading,
       isSignedIn,
       organizationHandle,
+      refreshToken,
       signIn: handleSignIn,
       signInUrl,
       signOut: handleSignOut,

packages/nextjs/src/constants/sessionConstants.ts

@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Number of seconds before access token expiry at which the SDK proactively
+ * refreshes the token. A 25-second buffer prevents races where the token is
+ * valid when a request starts but expires mid-flight.
+ */
+export const REFRESH_BUFFER_SECONDS: number = 25;
+
+/**
+ * Default session cookie lifetime in seconds (24 hours).
+ *
+ * Used when no explicit session cookie expiry is configured. The session cookie
+ * lifetime can be overridden in two ways (evaluated in this order):
+ *
+ *   1. `sessionCookieExpiryTime` in `AsgardeoNodeConfig` — set programmatically
+ *      when initialising the SDK.
+ *   2. `ASGARDEO_SESSION_COOKIE_EXPIRY_TIME` environment variable — set in `.env`
+ *      (e.g. `ASGARDEO_SESSION_COOKIE_EXPIRY_TIME=86400`).
+ *   3. This constant — applied when neither of the above is present.
+ *
+ * Two independent expiry bounds apply to the session and they are generally
+ * NOT the same value:
+ *
+ *   - JWT `exp` claim — set by `SessionManager.createSessionToken(...)` from
+ *     the `accessTokenTtlSeconds` argument (i.e. the access token's `expires_in`
+ *     returned by the auth server, typically ~1 hour). This controls when
+ *     `verifySessionToken` rejects the token and is the trigger for a refresh.
+ *   - Browser cookie `maxAge` — set by the caller (sign-in / refresh / org-switch
+ *     actions) from `SessionManager.resolveSessionCookieExpiry(...)`, which returns
+ *     this constant by default (24 hours). This controls how long the browser
+ *     holds the cookie before discarding it.
+ */
+export const DEFAULT_SESSION_COOKIE_EXPIRY_TIME: number = 86400;

packages/nextjs/src/middleware.ts

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Edge Runtime entry point — safe for use in Next.js middleware.ts.
+ *
+ * This file must only import modules whose full transitive dependency graph
+ * contains zero Node.js-only APIs (process.versions, fs, crypto, etc.).
+ * Permitted dependencies: jose, fetch, next/server, and local utilities
+ * that themselves satisfy the same constraint.
+ *
+ * Do NOT import from:
+ *   - AsgardeoNextClient (depends on @asgardeo/node → @asgardeo/javascript)
+ *   - server/AsgardeoProvider (depends on @asgardeo/node)
+ *   - server/actions/* (depend on @asgardeo/node)
+ *   - client/* (depend on @asgardeo/javascript via @asgardeo/react)
+ */
+
+export {default as asgardeoMiddleware} from './server/middleware/asgardeoMiddleware';
+export * from './server/middleware/asgardeoMiddleware';
+
+export {default as createRouteMatcher} from './server/middleware/createRouteMatcher';

packages/nextjs/src/server/AsgardeoProvider.tsx

@@ -21,6 +21,7 @@
 import {BrandingPreference, AsgardeoRuntimeError, IdToken, Organization, User, UserProfile} from '@asgardeo/node';
 import {AsgardeoProviderProps} from '@asgardeo/react';
 import {FC, PropsWithChildren, ReactElement} from 'react';
+import clearSession from './actions/clearSession';
 import createOrganization from './actions/createOrganization';
 import getAllOrganizations from './actions/getAllOrganizations';
 import getBrandingPreference from './actions/getBrandingPreference';
@@ -32,6 +33,7 @@ import getUserAction from './actions/getUserAction';
 import getUserProfileAction from './actions/getUserProfileAction';
 import handleOAuthCallbackAction from './actions/handleOAuthCallbackAction';
 import isSignedIn from './actions/isSignedIn';
+import refreshToken from './actions/refreshToken';
 import signInAction from './actions/signInAction';
 import signOutAction from './actions/signOutAction';
 import signUpAction from './actions/signUpAction';
@@ -48,6 +50,20 @@ import {SessionTokenPayload} from '../utils/SessionManager';
  */
 export type AsgardeoServerProviderProps = Partial<AsgardeoProviderProps> & {
   clientSecret?: string;
+  /**
+   * Session cookie lifetime in seconds. Determines how long the session cookie
+   * remains valid in the browser after sign-in.
+   *
+   * Resolution order (first defined value wins):
+   *   1. This prop — set here when mounting the provider.
+   *   2. `ASGARDEO_SESSION_COOKIE_EXPIRY_TIME` environment variable.
+   *   3. Built-in default of 86400 seconds (24 hours).
+   *
+   * @example
+   * // 8-hour session cookie
+   * <AsgardeoServerProvider sessionCookieExpiryTime={28800} ... />
+   */
+  sessionCookieExpiryTime?: number;
 };
 
 /**
@@ -99,7 +115,7 @@ const AsgardeoServerProvider: FC<PropsWithChildren<AsgardeoServerProviderProps>>
   // Try to get session information from JWT first, then fall back to legacy
   const sessionPayload: SessionTokenPayload | undefined = await getSessionPayload();
   const sessionId: string = sessionPayload?.sessionId || (await getSessionId()) || '';
-  const signedIn: boolean = sessionPayload ? true : await isSignedIn(sessionId);
+  const signedIn: boolean = await isSignedIn(sessionId);
 
   let user: User = {};
   let userProfile: UserProfile = {
@@ -203,6 +219,8 @@ const AsgardeoServerProvider: FC<PropsWithChildren<AsgardeoServerProviderProps>>
       applicationId={config?.applicationId}
       baseUrl={config?.baseUrl}
       signIn={signInAction}
+      clearSession={clearSession}
+      refreshToken={refreshToken}
       signOut={signOutAction}
       signUp={signUpAction}
       handleOAuthCallback={handleOAuthCallbackAction}

packages/nextjs/src/server/actions/clearSession.ts

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use server';
+
+import {cookies} from 'next/headers';
+import logger from '../../utils/logger';
+import SessionManager from '../../utils/SessionManager';
+
+type RequestCookies = Awaited<ReturnType<typeof cookies>>;
+
+/**
+ * Deletes all Asgardeo session cookies from the browser without contacting the
+ * identity server.
+ *
+ * Use this for error-recovery scenarios where the local session must be wiped
+ * immediately: refresh token failures, corrupt sessions, or forced local sign-out
+ * when the identity server is unreachable.
+ *
+ * For a complete sign-out that also revokes the server-side session and obtains the
+ * after-sign-out redirect URL, use `signOutAction` instead.
+ *
+ * @example
+ * ```typescript
+ * import { clearSession } from '@asgardeo/nextjs/server';
+ *
+ * // Inside a Server Action or Route Handler:
+ * await clearSession();
+ * redirect('/sign-in');
+ * ```
+ */
+const clearSession = async (): Promise<void> => {
+  const cookieStore: RequestCookies = await cookies();
+  cookieStore.delete(SessionManager.getSessionCookieName());
+  cookieStore.delete(SessionManager.getTempSessionCookieName());
+  logger.debug('[clearSession] Session cookies cleared.');
+};
+
+export default clearSession;