richie-education 3.3.1-dev4 → 3.3.1-dev6

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/js/api/lms/openedx-fonzie.ts

@@ -7,6 +7,7 @@ import { handle } from 'utils/errors/handle';
 import { OpenEdxApiProfile } from 'types/openEdx';
 import { checkStatus } from 'api/utils';
 import { OpenEdxFullNameFormValues } from 'components/OpenEdxFullNameForm';
+import { location } from 'utils/indirection/window';
 import OpenEdxHawthornApiInterface from './openedx-hawthorn';
 
 /**
@@ -29,6 +30,7 @@ const API = (APIConf: AuthenticationBackend | LMSBackend): APILms => {
   const APIOptions = {
     routes: {
       user: {
+        login: `${APIConf.endpoint}/keycloak-login`,
         me: `${APIConf.endpoint}/api/v1.0/user/me`,
         account: `${APIConf.endpoint}/api/user/v1/accounts/:username`,
         preferences: `${APIConf.endpoint}/api/user/v1/preferences/:username`,
@@ -41,6 +43,10 @@ const API = (APIConf: AuthenticationBackend | LMSBackend): APILms => {
     ...ApiInterface,
     user: {
       ...ApiInterface.user,
+      login: () => {
+        const next = encodeURIComponent(location.href);
+        location.assign(`${APIOptions.routes.user.login}?next=${next}`);
+      },
       accessToken: () => {
         return sessionStorage.getItem(RICHIE_USER_TOKEN);
       },

package/js/widgets/SyllabusCourseRunsList/components/CourseWishButton/index.logout.spec.tsx

@@ -19,7 +19,7 @@ import CourseWishButton from '.';
 
 jest.mock('utils/indirection/window', () => ({
   location: {
-    pathname: '/tests/CourseAddToWishlist/',
+    href: 'https://example.com/tests/CourseAddToWishlist/',
     assign: jest.fn(() => true),
   },
 }));
@@ -61,7 +61,7 @@ describe('CourseWishButton', () => {
     await userEvent.click($logMeButton);
 
     expect(location.assign).toHaveBeenCalledWith(
-      `https://authentication.test/login?next=richie/tests/CourseAddToWishlist/`,
+      `https://authentication.test/keycloak-login?next=https%3A%2F%2Fexample.com%2Ftests%2FCourseAddToWishlist%2F`,
     );
   });
 });

package/package.json

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