richie-education 3.3.1-dev3 → 3.3.1-dev5

package/js/api/auth/keycloak.spec.ts

@@ -84,6 +84,22 @@ describe('Keycloak API', () => {
   });
 
   describe('user.me', () => {
+    it('returns null when init returns false (not authenticated)', async () => {
+      mockKeycloakInit.mockResolvedValueOnce(false);
+      const api = API(authConfig);
+      const response = await api.user.me();
+      expect(response).toBeNull();
+      expect(mockKeycloakUpdateToken).not.toHaveBeenCalled();
+    });
+
+    it('returns null when init rejects', async () => {
+      mockKeycloakInit.mockRejectedValueOnce(new Error('Init failed'));
+      const api = API(authConfig);
+      const response = await api.user.me();
+      expect(response).toBeNull();
+      expect(mockKeycloakUpdateToken).not.toHaveBeenCalled();
+    });
+
     it('returns null when updateToken fails', async () => {
       mockKeycloakUpdateToken.mockRejectedValueOnce(new Error('Token refresh failed'));
       const response = await keycloakApi.user.me();

package/js/api/auth/keycloak.ts

@@ -12,7 +12,7 @@ const API = (APIConf: AuthenticationBackend): { user: APIAuthentication } => {
     realm: APIConf.realm!,
     clientId: APIConf.client_id!,
   });
-  keycloak.init({
+  const initPromise = keycloak.init({
     checkLoginIframe: false,
     flow: 'standard',
     onLoad: 'check-sso',
@@ -39,6 +39,15 @@ const API = (APIConf: AuthenticationBackend): { user: APIAuthentication } => {
     user: {
       accessToken: () => sessionStorage.getItem(RICHIE_USER_TOKEN),
       me: async () => {
+        let isAuthenticated: boolean;
+        try {
+          isAuthenticated = await initPromise;
+        } catch (error) {
+          handle(error);
+          return null;
+        }
+        if (!isAuthenticated) return null;
+
         try {
           await keycloak.updateToken(30);
         } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "richie-education",
-  "version": "3.3.1-dev3",
+  "version": "3.3.1-dev5",
   "description": "A CMS to build learning portals for Open Education",
   "main": "sandbox/manage.py",
   "scripts": {