@spidy092/auth-client 1.0.9 → 1.0.11

package/core.js

@@ -2,7 +2,60 @@
 import { setToken, clearToken, getToken } from './token';
 import { getConfig, isRouterMode } from './config';
 
+// ✅ Track if callback was already processed
+let callbackProcessed = false;
+
+export function handleCallback() {
+  const params = new URLSearchParams(window.location.search);
+  const accessToken = params.get('access_token');
+  const error = params.get('error');
+
+  console.log('🔄 Handling authentication callback:', {
+    mode: isRouterMode() ? 'ROUTER' : 'CLIENT',
+    hasAccessToken: !!accessToken,
+    error,
+    alreadyProcessed: callbackProcessed // ✅ Log if already processed
+  });
+
+  // ✅ If already processed and we have a token, return it
+  if (callbackProcessed) {
+    const existingToken = getToken();
+    if (existingToken) {
+      console.log('🔄 Callback already processed, returning existing token');
+      return existingToken;
+    }
+  }
+
+  // ✅ Mark as processed first
+  callbackProcessed = true;
+
+  // Clean up session storage (only once)
+  sessionStorage.removeItem('originalApp');
+  sessionStorage.removeItem('returnUrl');
+
+  if (error) {
+    throw new Error(`Authentication failed: ${error}`);
+  }
+
+  if (accessToken) {
+    setToken(accessToken);
+    console.log('✅ Token set successfully');
+    return accessToken;
+  }
+
+  throw new Error('No access token found in callback URL');
+}
+
+// ✅ Reset callback state when needed
+export function resetCallbackState() {
+  callbackProcessed = false;
+}
+
+// Your other functions remain the same...
 export function login(clientKeyArg, redirectUriArg) {
+  // ✅ Reset callback state when starting new login
+  resetCallbackState();
+  
   const {
     clientKey: defaultClientKey,
     authBaseUrl,
@@ -27,12 +80,10 @@ export function login(clientKeyArg, redirectUriArg) {
   sessionStorage.setItem('originalApp', clientKey);
   sessionStorage.setItem('returnUrl', redirectUri);
 
-  // ✅ Smart Router Logic
+  // Smart Router Logic (from my previous response)
   if (isRouterMode()) {
-    // Router mode: Direct backend authentication
     return routerLogin(clientKey, redirectUri);
   } else {
-    // Client mode: Redirect to centralized login
     return clientLogin(clientKey, redirectUri);
   }
 }
@@ -66,6 +117,9 @@ function clientLogin(clientKey, redirectUri) {
 }
 
 export function logout() {
+  // ✅ Reset callback state on logout
+  resetCallbackState();
+  
   const { clientKey, authBaseUrl, accountUiUrl } = getConfig();
   const token = getToken();
 
@@ -80,15 +134,13 @@ export function logout() {
   sessionStorage.clear();
 
   if (isRouterMode()) {
-    // Router logout: Backend logout for all sessions
     return routerLogout(clientKey, authBaseUrl, accountUiUrl, token);
   } else {
-    // Client logout: Simple redirect to centralized login
     return clientLogout(clientKey, accountUiUrl);
   }
 }
 
-// ✅ Router logout
+// Router logout (same as before)
 async function routerLogout(clientKey, authBaseUrl, accountUiUrl, token) {
   console.log('🏭 Router Logout: Backend logout for all sessions');
   
@@ -115,63 +167,12 @@ async function routerLogout(clientKey, authBaseUrl, accountUiUrl, token) {
     }
   }
 
-  // Fallback: redirect to login
   window.location.href = '/login';
 }
 
-// ✅ Client logout
+// Client logout (same as before)
 function clientLogout(clientKey, accountUiUrl) {
   console.log('🔄 Client Logout: Redirecting to centralized login');
   const logoutUrl = `${accountUiUrl}/login?client=${clientKey}&logout=true`;
   window.location.href = logoutUrl;
 }
-
-export function handleCallback() {
-  const params = new URLSearchParams(window.location.search);
-  const accessToken = params.get('access_token');
-  const error = params.get('error');
-
-  console.log('🔄 Handling authentication callback:', {
-    mode: isRouterMode() ? 'ROUTER' : 'CLIENT',
-    hasAccessToken: !!accessToken,
-    error
-  });
-
-  sessionStorage.removeItem('originalApp');
-  sessionStorage.removeItem('returnUrl');
-
-  if (error) {
-    throw new Error(`Authentication failed: ${error}`);
-  }
-
-  if (accessToken) {
-    setToken(accessToken);
-    return accessToken;
-  }
-
-  throw new Error('No access token found in callback URL');
-}
-
-export async function refreshToken() {
-  const { clientKey, authBaseUrl } = getConfig();
-  
-  console.log('🔄 Refreshing token:', { clientKey, mode: isRouterMode() ? 'ROUTER' : 'CLIENT' });
-  
-  try {
-    const response = await fetch(`${authBaseUrl}/refresh/${clientKey}`, {
-      method: 'POST',
-      credentials: 'include',
-    });
-
-    if (!response.ok) {
-      throw new Error('Refresh failed');
-    }
-
-    const { access_token } = await response.json();
-    setToken(access_token);
-    return access_token;
-  } catch (err) {
-    clearToken();
-    throw err;
-  }
-}

package/index.js

@@ -1,6 +1,6 @@
 // auth-client/index.js
 import { setConfig, getConfig, isRouterMode } from './config';
-import { login, logout, handleCallback, refreshToken } from './core';
+import { login, logout, handleCallback, refreshToken, resetCallbackState } from './core';
 import { getToken, setToken, clearToken } from './token';
 import api from './api';
 import { decodeToken, isTokenExpired } from './utils/jwt';
@@ -9,13 +9,14 @@ export const auth = {
   // 🔧 Config
   setConfig,
   getConfig,
-  isRouterMode, // ✅ Expose router mode check
+  isRouterMode,
 
   // 🔐 Core flows
   login,
   logout,
   handleCallback,
   refreshToken,
+  resetCallbackState, // ✅ Export reset function
 
   // 🔑 Token management
   getToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spidy092/auth-client",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Scalable frontend auth SDK for centralized login using Keycloak + Auth Service.",
   "main": "index.js",
   "module": "index.js",