@asgardeo/nextjs 0.1.9 → 0.1.11

package/dist/middleware/createRouteMatcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createRouteMatcher.js","sourceRoot":"","sources":["../../src/middleware/createRouteMatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,kBAAkB,GAAG,CAAC,QAAkB,EAAE,EAAE;IAChD,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC3C,sCAAsC;QACtC,MAAM,YAAY,GAAG,OAAO;aACzB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAE,cAAc;aACrC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAG,kBAAkB;aACzC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,gCAAgC;QAEjE,OAAO,IAAI,MAAM,CAAC,IAAI,YAAY,GAAG,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,GAAgB,EAAW,EAAE;QACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtC,OAAO,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/server/AsgardeoProvider.js

@@ -24,6 +24,7 @@ import getBrandingPreference from './actions/getBrandingPreference';
 import getCurrentOrganizationAction from './actions/getCurrentOrganizationAction';
 import getMyOrganizations from './actions/getMyOrganizations';
 import getSessionId from './actions/getSessionId';
+import getSessionPayload from './actions/getSessionPayload';
 import getUserAction from './actions/getUserAction';
 import getUserProfileAction from './actions/getUserProfileAction';
 import handleOAuthCallbackAction from './actions/handleOAuthCallbackAction';
@@ -64,8 +65,10 @@ const AsgardeoServerProvider = async ({ children, afterSignInUrl, afterSignOutUr
     if (!asgardeoClient.isInitialized) {
         return _jsx(_Fragment, {});
     }
-    const sessionId = (await getSessionId());
-    const _isSignedIn = await isSignedIn(sessionId);
+    // Try to get session information from JWT first, then fall back to legacy
+    const sessionPayload = await getSessionPayload();
+    const sessionId = sessionPayload?.sessionId || (await getSessionId()) || '';
+    const _isSignedIn = sessionPayload ? true : await isSignedIn(sessionId);
     let user = {};
     let userProfile = {
         schemas: [],
@@ -80,21 +83,43 @@ const AsgardeoServerProvider = async ({ children, afterSignInUrl, afterSignOutUr
     let myOrganizations = [];
     let brandingPreference = null;
     if (_isSignedIn) {
-        // Check if there's a `user_org` claim in the ID token to determine if this is an organization login
-        const idToken = await asgardeoClient.getDecodedIdToken(sessionId);
         let updatedBaseUrl = config?.baseUrl;
-        if (idToken?.['user_org']) {
-            // Treat this login as an organization login and modify the base URL
+        if (sessionPayload?.organizationId) {
             updatedBaseUrl = `${config?.baseUrl}/o`;
             config = { ...config, baseUrl: updatedBaseUrl };
         }
-        const userResponse = await getUserAction(sessionId);
-        const userProfileResponse = await getUserProfileAction(sessionId);
-        const currentOrganizationResponse = await getCurrentOrganizationAction(sessionId);
-        myOrganizations = await getMyOrganizations({}, sessionId);
-        user = userResponse.data?.user || {};
-        userProfile = userProfileResponse.data?.userProfile;
-        currentOrganization = currentOrganizationResponse?.data?.organization;
+        else if (sessionId) {
+            try {
+                const idToken = await asgardeoClient.getDecodedIdToken(sessionId);
+                if (idToken?.['user_org']) {
+                    updatedBaseUrl = `${config?.baseUrl}/o`;
+                    config = { ...config, baseUrl: updatedBaseUrl };
+                }
+            }
+            catch {
+                // Continue without organization info
+            }
+        }
+        try {
+            const userResponse = await getUserAction(sessionId);
+            const userProfileResponse = await getUserProfileAction(sessionId);
+            const currentOrganizationResponse = await getCurrentOrganizationAction(sessionId);
+            if (sessionId) {
+                myOrganizations = await getMyOrganizations({}, sessionId);
+            }
+            else {
+                console.warn('[AsgardeoServerProvider] No session ID available, skipping organization fetch');
+            }
+            user = userResponse.data?.user || {};
+            userProfile = userProfileResponse.data?.userProfile;
+            currentOrganization = currentOrganizationResponse?.data?.organization;
+        }
+        catch (error) {
+            user = {};
+            userProfile = { schemas: [], profile: {}, flattenedProfile: {} };
+            currentOrganization = { id: '', name: '', orgHandle: '' };
+            myOrganizations = [];
+        }
     }
     // Fetch branding preference if branding is enabled in config
     if (config?.preferences?.theme?.inheritFromBranding !== false) {

package/dist/server/AsgardeoProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"AsgardeoProvider.js","sourceRoot":"","sources":["../../src/server/AsgardeoProvider.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"AsgardeoProvider.js","sourceRoot":"","sources":["../../src/server/AsgardeoProvider.tsx"],"names":[],"mappings":"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"}

package/dist/server/actions/getMyOrganizations.js

@@ -24,7 +24,28 @@ import AsgardeoNextClient from '../../AsgardeoNextClient';
 const getMyOrganizations = async (options, sessionId) => {
     try {
         const client = AsgardeoNextClient.getInstance();
-        return await client.getMyOrganizations(options, sessionId);
+        // Get session ID if not provided
+        let resolvedSessionId = sessionId;
+        if (!resolvedSessionId) {
+            // Import getSessionId locally to avoid circular dependencies
+            const { default: getSessionId } = await import('./getSessionId');
+            resolvedSessionId = await getSessionId();
+        }
+        if (!resolvedSessionId) {
+            throw new AsgardeoAPIError('No session ID available for fetching organizations', 'getMyOrganizations-SessionError-001', 'nextjs', 401);
+        }
+        // Check if user is signed in by trying to get access token
+        try {
+            const accessToken = await client.getAccessToken(resolvedSessionId);
+            if (!accessToken) {
+                throw new AsgardeoAPIError('No access token available - user is not signed in', 'getMyOrganizations-NoAccessToken-001', 'nextjs', 401);
+            }
+        }
+        catch (error) {
+            console.error('[getMyOrganizations] Failed to get access token:', error);
+            throw new AsgardeoAPIError('User is not signed in - access token retrieval failed', 'getMyOrganizations-NotSignedIn-001', 'nextjs', 401);
+        }
+        return await client.getMyOrganizations(options, resolvedSessionId);
     }
     catch (error) {
         throw new AsgardeoAPIError(`Failed to get the organizations for the user: ${error instanceof Error ? error.message : String(error)}`, 'getMyOrganizations-ServerActionError-001', 'nextjs', error instanceof AsgardeoAPIError ? error.statusCode : undefined);

package/dist/server/actions/getMyOrganizations.js.map

@@ -1 +1 @@
-{"version":3,"file":"getMyOrganizations.js","sourceRoot":"","sources":["../../../src/server/actions/getMyOrganizations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,EAAC,gBAAgB,EAAe,MAAM,gBAAgB,CAAC;AAC9D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D;;GAEG;AACH,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAAa,EAAE,SAA8B,EAA2B,EAAE;IAC1G,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAChD,OAAO,MAAM,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC7D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CACxB,iDAAiD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACzG,0CAA0C,EAC1C,QAAQ,EACR,KAAK,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CACjE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"getMyOrganizations.js","sourceRoot":"","sources":["../../../src/server/actions/getMyOrganizations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,EAAC,gBAAgB,EAAe,MAAM,gBAAgB,CAAC;AAC9D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D;;GAEG;AACH,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAAa,EAAE,SAA8B,EAA2B,EAAE;IAC1G,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAEhD,iCAAiC;QACjC,IAAI,iBAAiB,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,6DAA6D;YAC7D,MAAM,EAAC,OAAO,EAAE,YAAY,EAAC,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAC/D,iBAAiB,GAAG,MAAM,YAAY,EAAE,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,gBAAgB,CACxB,oDAAoD,EACpD,qCAAqC,EACrC,QAAQ,EACR,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,2DAA2D;QAC3D,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;YAEnE,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,gBAAgB,CACxB,mDAAmD,EACnD,sCAAsC,EACtC,QAAQ,EACR,GAAG,CACJ,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,kDAAkD,EAAE,KAAK,CAAC,CAAC;YACzE,MAAM,IAAI,gBAAgB,CACxB,uDAAuD,EACvD,oCAAoC,EACpC,QAAQ,EACR,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CACxB,iDAAiD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACzG,0CAA0C,EAC1C,QAAQ,EACR,KAAK,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CACjE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/server/actions/getSessionId.d.ts

@@ -15,5 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Get the session ID from cookies.
+ * Tries JWT session first, then falls back to legacy session ID.
+ *
+ * @returns The session ID if it exists, undefined otherwise
+ */
 declare const getSessionId: () => Promise<string | undefined>;
 export default getSessionId;

package/dist/server/actions/getSessionId.js

@@ -16,11 +16,27 @@
  * under the License.
  */
 'use server';
-import { CookieConfig } from '@asgardeo/node';
 import { cookies } from 'next/headers';
+import SessionManager from '../../utils/SessionManager';
+/**
+ * Get the session ID from cookies.
+ * Tries JWT session first, then falls back to legacy session ID.
+ *
+ * @returns The session ID if it exists, undefined otherwise
+ */
 const getSessionId = async () => {
     const cookieStore = await cookies();
-    return cookieStore.get(CookieConfig.SESSION_COOKIE_NAME)?.value;
+    const sessionToken = cookieStore.get(SessionManager.getSessionCookieName())?.value;
+    if (sessionToken) {
+        try {
+            const sessionPayload = await SessionManager.verifySessionToken(sessionToken);
+            return sessionPayload.sessionId;
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
+    return undefined;
 };
 export default getSessionId;
 //# sourceMappingURL=getSessionId.js.map

package/dist/server/actions/getSessionId.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSessionId.js","sourceRoot":"","sources":["../../../src/server/actions/getSessionId.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,MAAM,YAAY,GAAG,KAAK,IAAiC,EAAE;IAC3D,MAAM,WAAW,GAA2B,MAAM,OAAO,EAAE,CAAC;IAE5D,OAAO,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,KAAK,CAAC;AAClE,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"getSessionId.js","sourceRoot":"","sources":["../../../src/server/actions/getSessionId.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAIb,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,cAAc,MAAM,4BAA4B,CAAC;AAExD;;;;;GAKG;AACH,MAAM,YAAY,GAAG,KAAK,IAAiC,EAAE;IAC3D,MAAM,WAAW,GAA2B,MAAM,OAAO,EAAE,CAAC;IAE5D,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,EAAE,KAAK,CAAC;IAEnF,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAE7E,OAAO,cAAc,CAAC,SAAS,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/server/actions/getSessionPayload.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+import { SessionTokenPayload } from '../../utils/SessionManager';
+/**
+ * Get the session payload from JWT session cookie.
+ * This includes user ID, session ID, scopes, and organization ID.
+ *
+ * @returns The session payload if valid JWT session exists, undefined otherwise
+ */
+declare const getSessionPayload: () => Promise<SessionTokenPayload | undefined>;
+export default getSessionPayload;

package/dist/server/actions/getSessionPayload.js

@@ -0,0 +1,41 @@
+/**
+ * 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 SessionManager from '../../utils/SessionManager';
+/**
+ * Get the session payload from JWT session cookie.
+ * This includes user ID, session ID, scopes, and organization ID.
+ *
+ * @returns The session payload if valid JWT session exists, undefined otherwise
+ */
+const getSessionPayload = async () => {
+    const cookieStore = await cookies();
+    const sessionToken = cookieStore.get(SessionManager.getSessionCookieName())?.value;
+    if (!sessionToken) {
+        return undefined;
+    }
+    try {
+        return await SessionManager.verifySessionToken(sessionToken);
+    }
+    catch {
+        return undefined;
+    }
+};
+export default getSessionPayload;
+//# sourceMappingURL=getSessionPayload.js.map

package/dist/server/actions/getSessionPayload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getSessionPayload.js","sourceRoot":"","sources":["../../../src/server/actions/getSessionPayload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAGb,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,cAAqC,MAAM,4BAA4B,CAAC;AAE/E;;;;;GAKG;AACH,MAAM,iBAAiB,GAAG,KAAK,IAA8C,EAAE;IAC7E,MAAM,WAAW,GAA2B,MAAM,OAAO,EAAE,CAAC;IAE5D,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,EAAE,KAAK,CAAC;IACnF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/server/actions/handleOAuthCallbackAction.js

@@ -17,8 +17,8 @@
  */
 'use server';
 import { cookies } from 'next/headers';
-import { CookieConfig } from '@asgardeo/node';
 import AsgardeoNextClient from '../../AsgardeoNextClient';
+import SessionManager from '../../utils/SessionManager';
 /**
  * Server action to handle OAuth callback with authorization code.
  * This action processes the authorization code received from the OAuth provider
@@ -34,45 +34,65 @@ const handleOAuthCallbackAction = async (code, state, sessionState) => {
         if (!code || !state) {
             return {
                 success: false,
-                error: 'Missing required OAuth parameters: code and state are required'
+                error: 'Missing required OAuth parameters: code and state are required',
             };
         }
-        // Get the Asgardeo client instance
         const asgardeoClient = AsgardeoNextClient.getInstance();
         if (!asgardeoClient.isInitialized) {
             return {
                 success: false,
-                error: 'Asgardeo client is not initialized'
+                error: 'Asgardeo client is not initialized',
             };
         }
-        // Get the session ID from cookies
         const cookieStore = await cookies();
-        const sessionId = cookieStore.get(CookieConfig.SESSION_COOKIE_NAME)?.value;
+        let sessionId;
+        const tempSessionToken = cookieStore.get(SessionManager.getTempSessionCookieName())?.value;
+        if (tempSessionToken) {
+            try {
+                const tempSession = await SessionManager.verifyTempSession(tempSessionToken);
+                sessionId = tempSession.sessionId;
+            }
+            catch {
+                // TODO: Invalid temp session, throw error.
+            }
+        }
         if (!sessionId) {
             return {
                 success: false,
-                error: 'No session found. Please start the authentication flow again.'
+                error: 'No session found. Please start the authentication flow again.',
             };
         }
         // Exchange the authorization code for tokens
-        await asgardeoClient.signIn({
+        const signInResult = await asgardeoClient.signIn({
             code,
             session_state: sessionState,
             state,
         }, {}, sessionId);
-        // Get the after sign-in URL from configuration
+        if (signInResult) {
+            try {
+                const idToken = await asgardeoClient.getDecodedIdToken(sessionId);
+                const userIdFromToken = idToken.sub || signInResult['sub'] || sessionId;
+                const scopes = idToken['scope'] ? idToken['scope'].split(' ') : [];
+                const organizationId = idToken['user_org'] || idToken['organization_id'];
+                const sessionToken = await SessionManager.createSessionToken(userIdFromToken, sessionId, scopes, organizationId);
+                cookieStore.set(SessionManager.getSessionCookieName(), sessionToken, SessionManager.getSessionCookieOptions());
+                cookieStore.delete(SessionManager.getTempSessionCookieName());
+            }
+            catch (error) {
+                console.warn('[handleOAuthCallbackAction] Failed to create JWT session, continuing with legacy session:', error);
+            }
+        }
         const config = await asgardeoClient.getConfiguration();
         const afterSignInUrl = config.afterSignInUrl || '/';
         return {
             success: true,
-            redirectUrl: afterSignInUrl
+            redirectUrl: afterSignInUrl,
         };
     }
     catch (error) {
-        console.error('[handleOAuthCallbackAction] OAuth callback error:', error);
         return {
             success: false,
-            error: error instanceof Error ? error.message : 'Authentication failed'
+            error: error instanceof Error ? error.message : 'Authentication failed',
         };
     }
 };

package/dist/server/actions/handleOAuthCallbackAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleOAuthCallbackAction.js","sourceRoot":"","sources":["../../../src/server/actions/handleOAuthCallbackAction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;;;GASG;AACH,MAAM,yBAAyB,GAAG,KAAK,EACrC,IAAY,EACZ,KAAa,EACb,YAAqB,EAKpB,EAAE;IACH,IAAI,CAAC;QACH,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,gEAAgE;aACxE,CAAC;QACJ,CAAC;QAED,mCAAmC;QACnC,MAAM,cAAc,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAExD,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;YAClC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,oCAAoC;aAC5C,CAAC;QACJ,CAAC;QAED,kCAAkC;QAClC,MAAM,WAAW,GAAG,MAAM,OAAO,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,KAAK,CAAC;QAE3E,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,+DAA+D;aACvE,CAAC;QACJ,CAAC;QAED,6CAA6C;QAC7C,MAAM,cAAc,CAAC,MAAM,CACzB;YACE,IAAI;YACJ,aAAa,EAAE,YAAY;YAC3B,KAAK;SACC,EACR,EAAE,EACF,SAAS,CACV,CAAC;QAEF,+CAA+C;QAC/C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACvD,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,GAAG,CAAC;QAEpD,OAAO;YACL,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,cAAc;SAC5B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAC;QAE1E,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB;SACxE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"handleOAuthCallbackAction.js","sourceRoot":"","sources":["../../../src/server/actions/handleOAuthCallbackAction.ts"],"names":[],"mappings":"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"}

package/dist/server/actions/isSignedIn.d.ts

@@ -15,5 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-declare const isSignedIn: (sessionId: string) => Promise<boolean>;
+/**
+ * Check if the user is currently signed in.
+ * First tries JWT session validation, then falls back to legacy session check.
+ *
+ * @param sessionId - Optional session ID to check (if not provided, gets from cookies)
+ * @returns True if user is signed in, false otherwise
+ */
+declare const isSignedIn: (sessionId?: string) => Promise<boolean>;
 export default isSignedIn;

package/dist/server/actions/isSignedIn.js

@@ -17,10 +17,47 @@
  */
 'use server';
 import AsgardeoNextClient from '../../AsgardeoNextClient';
+import getSessionId from './getSessionId';
+import getSessionPayload from './getSessionPayload';
+/**
+ * Check if the user is currently signed in.
+ * First tries JWT session validation, then falls back to legacy session check.
+ *
+ * @param sessionId - Optional session ID to check (if not provided, gets from cookies)
+ * @returns True if user is signed in, false otherwise
+ */
 const isSignedIn = async (sessionId) => {
-    const client = AsgardeoNextClient.getInstance();
-    const accessToken = await client.getAccessToken(sessionId);
-    return !!accessToken;
+    try {
+        const sessionPayload = await getSessionPayload();
+        if (sessionPayload) {
+            const resolvedSessionId = sessionPayload.sessionId;
+            if (resolvedSessionId) {
+                const client = AsgardeoNextClient.getInstance();
+                try {
+                    const accessToken = await client.getAccessToken(resolvedSessionId);
+                    return !!accessToken;
+                }
+                catch (error) {
+                    return false;
+                }
+            }
+        }
+        const resolvedSessionId = sessionId || (await getSessionId());
+        if (!resolvedSessionId) {
+            return false;
+        }
+        const client = AsgardeoNextClient.getInstance();
+        try {
+            const accessToken = await client.getAccessToken(resolvedSessionId);
+            return !!accessToken;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    catch {
+        return false;
+    }
 };
 export default isSignedIn;
 //# sourceMappingURL=isSignedIn.js.map

package/dist/server/actions/isSignedIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"isSignedIn.js","sourceRoot":"","sources":["../../../src/server/actions/isSignedIn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAG1D,MAAM,UAAU,GAAG,KAAK,EAAE,SAAiB,EAAoB,EAAE;IAC/D,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;IAChD,MAAM,WAAW,GAAuB,MAAM,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAE/E,OAAO,CAAC,CAAC,WAAW,CAAC;AACvB,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"isSignedIn.js","sourceRoot":"","sources":["../../../src/server/actions/isSignedIn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD;;;;;;GAMG;AACH,MAAM,UAAU,GAAG,KAAK,EAAE,SAAkB,EAAoB,EAAE;IAChE,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAEjD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,iBAAiB,GAAG,cAAc,CAAC,SAAS,CAAC;YAEnD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;gBAChD,IAAI,CAAC;oBACH,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;oBACnE,OAAO,CAAC,CAAC,WAAW,CAAC;gBACvB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,iBAAiB,GAAG,SAAS,IAAI,CAAC,MAAM,YAAY,EAAE,CAAC,CAAC;QAE9D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAEhD,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;YAEnE,OAAO,CAAC,CAAC,WAAW,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/server/actions/signInAction.js

@@ -19,6 +19,7 @@
 import { cookies } from 'next/headers';
 import { CookieConfig, generateSessionId, EmbeddedSignInFlowStatus, } from '@asgardeo/node';
 import AsgardeoNextClient from '../../AsgardeoNextClient';
+import SessionManager from '../../utils/SessionManager';
 /**
  * Server action for signing in a user.
  * Handles the embedded sign-in flow and manages session cookies.
@@ -31,10 +32,36 @@ const signInAction = async (payload, request) => {
     try {
         const client = AsgardeoNextClient.getInstance();
         const cookieStore = await cookies();
-        let userId = cookieStore.get(CookieConfig.SESSION_COOKIE_NAME)?.value;
-        if (!userId) {
-            userId = generateSessionId();
-            cookieStore.set(CookieConfig.SESSION_COOKIE_NAME, userId, {
+        let sessionId;
+        let userId;
+        const existingSessionToken = cookieStore.get(SessionManager.getSessionCookieName())?.value;
+        if (existingSessionToken) {
+            try {
+                const sessionPayload = await SessionManager.verifySessionToken(existingSessionToken);
+                sessionId = sessionPayload.sessionId;
+                userId = sessionPayload.sub;
+            }
+            catch {
+                // Invalid session token, will create new temp session
+            }
+        }
+        if (!sessionId) {
+            const tempSessionToken = cookieStore.get(SessionManager.getTempSessionCookieName())?.value;
+            if (tempSessionToken) {
+                try {
+                    const tempSession = await SessionManager.verifyTempSession(tempSessionToken);
+                    sessionId = tempSession.sessionId;
+                }
+                catch {
+                    // Invalid temp session, will create new one
+                }
+            }
+        }
+        if (!sessionId) {
+            sessionId = generateSessionId();
+            const tempSessionToken = await SessionManager.createTempSession(sessionId);
+            cookieStore.set(SessionManager.getTempSessionCookieName(), tempSessionToken, SessionManager.getTempSessionCookieOptions());
+            cookieStore.set(CookieConfig.SESSION_COOKIE_NAME, sessionId, {
                 httpOnly: CookieConfig.DEFAULT_HTTP_ONLY,
                 maxAge: CookieConfig.DEFAULT_MAX_AGE,
                 sameSite: CookieConfig.DEFAULT_SAME_SITE,
@@ -42,25 +69,31 @@ const signInAction = async (payload, request) => {
             });
         }
         // If no payload provided, redirect to sign-in URL for redirect-based sign-in.
-        // If there's a payload, handle the embedded sign-in flow.
         if (!payload) {
-            const defaultSignInUrl = await client.getAuthorizeRequestUrl({}, userId);
+            const defaultSignInUrl = await client.getAuthorizeRequestUrl({}, sessionId);
             return { success: true, data: { signInUrl: String(defaultSignInUrl) } };
         }
-        else {
-            const response = await client.signIn(payload, request, userId);
-            if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
-                // Complete the sign-in process
-                await client.signIn({
-                    code: response?.authData?.code,
-                    session_state: response?.authData?.session_state,
-                    state: response?.authData?.state,
-                }, {}, userId);
-                const afterSignInUrl = await (await client.getStorageManager()).getConfigDataParameter('afterSignInUrl');
-                return { success: true, data: { afterSignInUrl: String(afterSignInUrl) } };
+        // Handle embedded sign-in flow
+        const response = await client.signIn(payload, request, sessionId);
+        if (response.flowStatus === EmbeddedSignInFlowStatus.SuccessCompleted) {
+            const signInResult = await client.signIn({
+                code: response?.authData?.code,
+                session_state: response?.authData?.session_state,
+                state: response?.authData?.state,
+            }, {}, sessionId);
+            if (signInResult) {
+                const idToken = await client.getDecodedIdToken(sessionId);
+                const userIdFromToken = idToken['sub'] || signInResult['sub'] || sessionId;
+                const scopes = idToken['scope'] ? idToken['scope'].split(' ') : [];
+                const organizationId = idToken['user_org'] || idToken['organization_id'];
+                const sessionToken = await SessionManager.createSessionToken(userIdFromToken, sessionId, scopes, organizationId);
+                cookieStore.set(SessionManager.getSessionCookieName(), sessionToken, SessionManager.getSessionCookieOptions());
+                cookieStore.delete(SessionManager.getTempSessionCookieName());
             }
-            return { success: true, data: response };
+            const afterSignInUrl = await (await client.getStorageManager()).getConfigDataParameter('afterSignInUrl');
+            return { success: true, data: { afterSignInUrl: String(afterSignInUrl) } };
         }
+        return { success: true, data: response };
     }
     catch (error) {
         console.error('[signInAction] Error during sign-in:', error);

package/dist/server/actions/signInAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"signInAction.js","sourceRoot":"","sources":["../../../src/server/actions/signInAction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,GAIzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;GAOG;AACH,MAAM,YAAY,GAAG,KAAK,EACxB,OAAgD,EAChD,OAA0C,EAUzC,EAAE;IACH,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,WAAW,GAAG,MAAM,OAAO,EAAE,CAAC;QAEpC,IAAI,MAAM,GAAuB,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,KAAK,CAAC;QAE1F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC7B,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAM,EAAE;gBACxD,QAAQ,EAAE,YAAY,CAAC,iBAAiB;gBACxC,MAAM,EAAE,YAAY,CAAC,eAAe;gBACpC,QAAQ,EAAE,YAAY,CAAC,iBAAiB;gBACxC,MAAM,EAAE,YAAY,CAAC,cAAc;aACpC,CAAC,CAAC;QACL,CAAC;QAED,8EAA8E;QAC9E,0DAA0D;QAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAEzE,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAC,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAC,EAAC,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAQ,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAQ,EAAE,MAAM,CAAC,CAAC;YAErE,IAAI,QAAQ,CAAC,UAAU,KAAK,wBAAwB,CAAC,gBAAgB,EAAE,CAAC;gBACtE,+BAA+B;gBAC/B,MAAM,MAAM,CAAC,MAAM,CACjB;oBACE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI;oBAC9B,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa;oBAChD,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK;iBAC1B,EACR,EAAE,EACF,MAAM,CACP,CAAC;gBAEF,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;gBAEzG,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,EAAC,EAAC,CAAC;YACzE,CAAC;YAED,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAA8C,EAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;QAC7D,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAC,CAAC;IAChD,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"signInAction.js","sourceRoot":"","sources":["../../../src/server/actions/signInAction.ts"],"names":[],"mappings":"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"}

package/dist/server/actions/signOutAction.d.ts

@@ -15,6 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/**
+ * Server action for signing out a user.
+ * Clears both JWT and legacy session cookies.
+ *
+ * @returns Promise that resolves with success status and optional after sign-out URL
+ */
 declare const signOutAction: () => Promise<{
     success: boolean;
     data?: {

package/dist/server/actions/signOutAction.js

@@ -16,13 +16,28 @@
  * under the License.
  */
 'use server';
+import { cookies } from 'next/headers';
 import AsgardeoNextClient from '../../AsgardeoNextClient';
-import deleteSessionId from './deleteSessionId';
+import SessionManager from '../../utils/SessionManager';
+import getSessionId from './getSessionId';
+/**
+ * Server action for signing out a user.
+ * Clears both JWT and legacy session cookies.
+ *
+ * @returns Promise that resolves with success status and optional after sign-out URL
+ */
 const signOutAction = async () => {
     try {
         const client = AsgardeoNextClient.getInstance();
-        const afterSignOutUrl = await client.signOut();
-        await deleteSessionId();
+        const sessionId = await getSessionId();
+        let afterSignOutUrl = '/';
+        if (sessionId) {
+            afterSignOutUrl = await client.signOut({}, sessionId);
+        }
+        const cookieStore = await cookies();
+        cookieStore.delete(SessionManager.getSessionCookieName());
+        cookieStore.delete(SessionManager.getTempSessionCookieName());
+        await import('./deleteSessionId').then(module => module.default());
         return { success: true, data: { afterSignOutUrl } };
     }
     catch (error) {

package/dist/server/actions/signOutAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"signOutAction.js","sourceRoot":"","sources":["../../../src/server/actions/signOutAction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAGb,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,MAAM,aAAa,GAAG,KAAK,IAAqF,EAAE;IAChH,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,eAAe,GAAW,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvD,MAAM,eAAe,EAAE,CAAC;QAExB,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAC,eAAe,EAAC,EAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"signOutAction.js","sourceRoot":"","sources":["../../../src/server/actions/signOutAction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,YAAY,CAAC;AAEb,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AACrC,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C;;;;;GAKG;AACH,MAAM,aAAa,GAAG,KAAK,IAAqF,EAAE;IAChH,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,YAAY,EAAE,CAAC;QAEvC,IAAI,eAAe,GAAW,GAAG,CAAC;QAElC,IAAI,SAAS,EAAE,CAAC;YACd,eAAe,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,OAAO,EAAE,CAAC;QAEpC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAE1D,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,wBAAwB,EAAE,CAAC,CAAC;QAE9D,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAEnE,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAC,eAAe,EAAC,EAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}