@spidy092/auth-client 1.0.12 → 1.0.13

package/core.js

@@ -2,56 +2,9 @@
 import { setToken, clearToken, getToken } from './token';
 import { getConfig, isRouterMode } from './config';
 
-// ✅ Track if callback was already processed
+// ✅ Track callback state with listeners
 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();
@@ -80,10 +33,12 @@ export function login(clientKeyArg, redirectUriArg) {
   sessionStorage.setItem('originalApp', clientKey);
   sessionStorage.setItem('returnUrl', redirectUri);
 
-  // Smart Router Logic (from my previous response)
+  // ✅ Smart Router Logic
   if (isRouterMode()) {
+    // Router mode: Direct backend authentication
     return routerLogin(clientKey, redirectUri);
   } else {
+    // Client mode: Redirect to centralized login
     return clientLogin(clientKey, redirectUri);
   }
 }
@@ -129,7 +84,7 @@ export function logout() {
     hasToken: !!token
   });
 
-  // Clear local storage immediately
+  // Clear local storage immediately (this will trigger listeners)
   clearToken();
   sessionStorage.clear();
 
@@ -140,7 +95,7 @@ export function logout() {
   }
 }
 
-// Router logout (same as before)
+// ✅ Router logout
 async function routerLogout(clientKey, authBaseUrl, accountUiUrl, token) {
   console.log('🏭 Router Logout: Backend logout for all sessions');
   
@@ -170,13 +125,92 @@ async function routerLogout(clientKey, authBaseUrl, accountUiUrl, token) {
   window.location.href = '/login';
 }
 
-// Client logout (same as before)
+// ✅ Client logout
 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,
+    alreadyProcessed: callbackProcessed
+  });
+
+  // ✅ 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) {
+    // ✅ This will trigger token listeners
+    setToken(accessToken);
+    console.log('✅ Token set successfully, listeners notified');
+    return accessToken;
+  }
+
+  throw new Error('No access token found in callback URL');
+}
+
+// ✅ Reset callback state
+export function resetCallbackState() {
+  callbackProcessed = false;
+  console.log('🔄 Callback state reset');
+}
+
+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();
+    // ✅ This will trigger token listeners
+    setToken(access_token);
+    console.log('✅ Token refresh successful, listeners notified');
+    return access_token;
+  } catch (err) {
+    // ✅ This will trigger token listeners
+    clearToken();
+    throw err;
+  }
+}
+
+
 
 export async function refreshToken() {
   const { clientKey, authBaseUrl } = getConfig();

package/index.js

@@ -1,7 +1,7 @@
 // auth-client/index.js
 import { setConfig, getConfig, isRouterMode } from './config';
 import { login, logout, handleCallback, refreshToken, resetCallbackState } from './core';
-import { getToken, setToken, clearToken } from './token';
+import { getToken, setToken, clearToken, addTokenListener, removeTokenListener, getListenerCount } from './token';
 import api from './api';
 import { decodeToken, isTokenExpired } from './utils/jwt';
 
@@ -16,12 +16,15 @@ export const auth = {
   logout,
   handleCallback,
   refreshToken,
-  resetCallbackState, // ✅ Export reset function
+  resetCallbackState,
 
   // 🔑 Token management
   getToken,
   setToken,
   clearToken,
+  addTokenListener,    // ✅ Export new functions
+  removeTokenListener,
+  getListenerCount,    // ✅ Debug function
 
   // 🌐 Authenticated API client
   api,

package/package.json

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

package/token.js

@@ -1,12 +1,33 @@
+// auth-client/token.js
 let memoryToken = null;
+const listeners = new Set(); // ✅ Add listeners
 
 export function setToken(token) {
+  const previousToken = memoryToken;
   memoryToken = token;
+  
   try {
     localStorage.setItem('authToken', token);
   } catch (err) {
     console.warn('Could not write token to localStorage:', err);
   }
+
+  // ✅ Notify listeners when token changes
+  if (previousToken !== token) {
+    console.log('🔔 Token changed, notifying listeners:', { 
+      listenerCount: listeners.size,
+      hadToken: !!previousToken,
+      hasToken: !!token 
+    });
+    
+    listeners.forEach(listener => {
+      try {
+        listener(token, previousToken);
+      } catch (err) {
+        console.warn('Token listener error:', err);
+      }
+    });
+  }
 }
 
 export function getToken() {
@@ -22,10 +43,59 @@ export function getToken() {
 }
 
 export function clearToken() {
+  const previousToken = memoryToken;
   memoryToken = null;
+  
   try {
     localStorage.removeItem('authToken');
   } catch (err) {
     console.warn('Could not clear token from localStorage:', err);
   }
+
+  // ✅ Notify listeners when token is cleared
+  if (previousToken) {
+    console.log('🔔 Token cleared, notifying listeners:', { 
+      listenerCount: listeners.size 
+    });
+    
+    listeners.forEach(listener => {
+      try {
+        listener(null, previousToken);
+      } catch (err) {
+        console.warn('Token listener error:', err);
+      }
+    });
+  }
+}
+
+// ✅ Add listener management
+export function addTokenListener(listener) {
+  if (typeof listener !== 'function') {
+    throw new Error('Token listener must be a function');
+  }
+  
+  listeners.add(listener);
+  console.log('📎 Token listener added, total listeners:', listeners.size);
+  
+  // Return cleanup function
+  return () => {
+    const removed = listeners.delete(listener);
+    if (removed) {
+      console.log('📎 Token listener removed, remaining listeners:', listeners.size);
+    }
+    return removed;
+  };
+}
+
+export function removeTokenListener(listener) {
+  const removed = listeners.delete(listener);
+  if (removed) {
+    console.log('📎 Token listener removed, remaining listeners:', listeners.size);
+  }
+  return removed;
+}
+
+// ✅ Debug function to see current listeners
+export function getListenerCount() {
+  return listeners.size;
 }