richie-education 3.2.2-dev43 → 3.2.2-dev52

package/i18n/locales/ar-SA.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

package/i18n/locales/es-ES.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

package/i18n/locales/fa-IR.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

package/i18n/locales/fr-CA.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

package/i18n/locales/fr-FR.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Places"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {place} other {places}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assignée"
@@ -241,7 +245,7 @@
   },
   "batchOrder.title.company": {
     "description": "Step label for company information in the batch order form",
-    "message": "Organisation"
+    "message": "Organisme"
   },
   "batchOrder.title.financing": {
     "description": "Step label for financing/payment in the batch order form",
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Envoyer la convention pour signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assignée"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Complétée"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Brouillon"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Paiement échoué"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "En attente"
   },
@@ -1793,7 +1797,7 @@
   },
   "components.SaleTunnel.BatchOrderForm.stepCompany": {
     "description": "Step label for company information in the batch order form",
-    "message": "Organisation"
+    "message": "Organisme"
   },
   "components.SaleTunnel.BatchOrderForm.stepCompanyTitle": {
     "description": "Title of the section with company/organization details",

package/i18n/locales/ko-KR.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

package/i18n/locales/pt-PT.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

package/i18n/locales/ru-RU.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

package/i18n/locales/vi-VN.json

@@ -195,6 +195,10 @@
     "description": "Text displayed for seats value in batch order",
     "message": "Seats"
   },
+  "batchOrder.seatsCount": {
+    "description": "Text displayed for seats count with pluralization in batch order",
+    "message": "{seats} {seats, plural, one {seat} other {seats}}"
+  },
   "batchOrder.status.assigned": {
     "description": "Status label for an assigned batch order",
     "message": "Assigned"
@@ -1595,7 +1599,7 @@
     "description": "Action label to send a contract for signature",
     "message": "Send contract for signature"
   },
-  "components.OrganizationQuotesTable.state.assigned.": {
+  "components.OrganizationQuotesTable.state.assigned": {
     "description": "Batch order state: assigned",
     "message": "Assigned"
   },
@@ -1607,15 +1611,15 @@
     "description": "Batch order state: completed",
     "message": "Completed"
   },
-  "components.OrganizationQuotesTable.state.draft.": {
+  "components.OrganizationQuotesTable.state.draft": {
     "description": "Batch order state: draft",
     "message": "Draft"
   },
-  "components.OrganizationQuotesTable.state.failedPayment.": {
+  "components.OrganizationQuotesTable.state.failedPayment": {
     "description": "Batch order state: failed payment",
     "message": "Failed payment"
   },
-  "components.OrganizationQuotesTable.state.pending.": {
+  "components.OrganizationQuotesTable.state.pending": {
     "description": "Batch order state: pending",
     "message": "Pending"
   },

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

@@ -1,10 +1,22 @@
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
+import { KeycloakAccountApi } from 'types/api';
 import API from './keycloak';
 
 const mockKeycloakInit = jest.fn().mockResolvedValue(true);
 const mockKeycloakLogout = jest.fn().mockResolvedValue(undefined);
 const mockKeycloakLogin = jest.fn().mockResolvedValue(undefined);
 const mockKeycloakLoadUserProfile = jest.fn();
+const mockKeycloakUpdateToken = jest.fn().mockResolvedValue(true);
+const mockKeycloakCreateAccountUrl = jest
+  .fn()
+  .mockReturnValue('https://keycloak.test/auth/realms/richie-realm/account');
+const mockIdToken = 'mock-id-token-12345';
+const mockIdTokenParsed = {
+  preferred_username: 'johndoe',
+  firstName: 'John',
+  lastName: 'Doe',
+  email: 'johndoe@example.com',
+};
 
 jest.mock('keycloak-js', () => {
   return jest.fn().mockImplementation(() => ({
@@ -12,6 +24,10 @@ jest.mock('keycloak-js', () => {
     logout: mockKeycloakLogout,
     login: mockKeycloakLogin,
     loadUserProfile: mockKeycloakLoadUserProfile,
+    updateToken: mockKeycloakUpdateToken,
+    createAccountUrl: mockKeycloakCreateAccountUrl,
+    idToken: mockIdToken,
+    idTokenParsed: mockIdTokenParsed,
   }));
 });
 
@@ -50,17 +66,40 @@ describe('Keycloak API', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    sessionStorage.clear();
     keycloakApi = API(authConfig);
   });
 
+  describe('user.accessToken', () => {
+    it('returns null when no token is stored', () => {
+      const token = keycloakApi.user.accessToken!();
+      expect(token).toBeNull();
+    });
+
+    it('returns the token from sessionStorage', () => {
+      sessionStorage.setItem('RICHIE_USER_TOKEN', mockIdToken);
+      const token = keycloakApi.user.accessToken!();
+      expect(token).toEqual(mockIdToken);
+    });
+  });
+
   describe('user.me', () => {
+    it('returns null when updateToken fails', async () => {
+      mockKeycloakUpdateToken.mockRejectedValueOnce(new Error('Token refresh failed'));
+      const response = await keycloakApi.user.me();
+      expect(response).toBeNull();
+      expect(mockKeycloakLoadUserProfile).not.toHaveBeenCalled();
+    });
+
     it('returns null when loadUserProfile fails', async () => {
+      mockKeycloakUpdateToken.mockResolvedValueOnce(true);
       mockKeycloakLoadUserProfile.mockRejectedValueOnce(new Error('Not authenticated'));
       const response = await keycloakApi.user.me();
       expect(response).toBeNull();
     });
 
     it('returns user when loadUserProfile succeeds', async () => {
+      mockKeycloakUpdateToken.mockResolvedValueOnce(true);
       mockKeycloakLoadUserProfile.mockResolvedValueOnce({
         firstName: 'John',
         lastName: 'Doe',
@@ -68,10 +107,13 @@ describe('Keycloak API', () => {
       });
 
       const response = await keycloakApi.user.me();
+      expect(mockKeycloakUpdateToken).toHaveBeenCalledWith(30);
       expect(response).toEqual({
         username: 'John Doe',
         email: 'johndoe@example.com',
+        access_token: mockIdToken,
       });
+      expect(sessionStorage.getItem('RICHIE_USER_TOKEN')).toEqual(mockIdToken);
     });
   });
 
@@ -106,6 +148,24 @@ describe('Keycloak API', () => {
     });
   });
 
+  describe('user.account', () => {
+    it('returns profile data from idTokenParsed via account.get()', () => {
+      const profile = (keycloakApi.user.account as KeycloakAccountApi).get();
+      expect(profile).toEqual({
+        username: 'johndoe',
+        firstName: 'John',
+        lastName: 'Doe',
+        email: 'johndoe@example.com',
+      });
+    });
+
+    it('returns the account management URL via account.updateUrl()', () => {
+      const url = (keycloakApi.user.account as any).updateUrl();
+      expect(url).toBe('https://keycloak.test/auth/realms/richie-realm/account');
+      expect(mockKeycloakCreateAccountUrl).toHaveBeenCalled();
+    });
+  });
+
   describe('Keycloak initialization', () => {
     it('initializes keycloak with correct configuration', () => {
       const Keycloak = require('keycloak-js');
@@ -118,8 +178,9 @@ describe('Keycloak API', () => {
 
       expect(mockKeycloakInit).toHaveBeenCalledWith({
         checkLoginIframe: false,
-        flow: 'implicit',
-        token: undefined,
+        flow: 'standard',
+        onLoad: 'check-sso',
+        pkceMethod: 'S256',
       });
     });
   });

package/js/api/auth/keycloak.ts

@@ -1,8 +1,10 @@
 import Keycloak from 'keycloak-js';
 import { AuthenticationBackend } from 'types/commonDataProps';
 import { APIAuthentication } from 'types/api';
+import { KeycloakApiProfile } from 'types/keycloak';
 import { location } from 'utils/indirection/window';
 import { handle } from 'utils/errors/handle';
+import { RICHIE_USER_TOKEN } from 'settings';
 
 const API = (APIConf: AuthenticationBackend): { user: APIAuthentication } => {
   const keycloak = new Keycloak({
@@ -12,23 +14,46 @@ const API = (APIConf: AuthenticationBackend): { user: APIAuthentication } => {
   });
   keycloak.init({
     checkLoginIframe: false,
-    flow: 'implicit',
-    token: APIConf.token!,
+    flow: 'standard',
+    onLoad: 'check-sso',
+    pkceMethod: 'S256',
   });
 
+  keycloak.onTokenExpired = () => {
+    keycloak.updateToken(30).catch(() => {
+      sessionStorage.removeItem(RICHIE_USER_TOKEN);
+    });
+  };
+
+  keycloak.onAuthRefreshSuccess = () => {
+    if (keycloak.idToken) {
+      sessionStorage.setItem(RICHIE_USER_TOKEN, keycloak.idToken);
+    }
+  };
+
   const getRedirectUri = () => {
     return `${location.origin}${location.pathname}`;
   };
 
   return {
     user: {
+      accessToken: () => sessionStorage.getItem(RICHIE_USER_TOKEN),
       me: async () => {
+        try {
+          await keycloak.updateToken(30);
+        } catch (error) {
+          handle(error);
+          return null;
+        }
+
         return keycloak
           .loadUserProfile()
           .then((userProfile) => {
+            sessionStorage.setItem(RICHIE_USER_TOKEN, keycloak.idToken!);
             return {
               username: `${userProfile.firstName} ${userProfile.lastName}`,
               email: userProfile.email,
+              access_token: keycloak.idToken,
             };
           })
           .catch((error) => {
@@ -46,8 +71,21 @@ const API = (APIConf: AuthenticationBackend): { user: APIAuthentication } => {
       },
 
       logout: async () => {
+        sessionStorage.removeItem(RICHIE_USER_TOKEN);
         await keycloak.logout({ redirectUri: getRedirectUri() });
       },
+
+      account: {
+        get: (): KeycloakApiProfile => {
+          return {
+            username: keycloak.idTokenParsed?.preferred_username,
+            firstName: keycloak.idTokenParsed?.firstName,
+            lastName: keycloak.idTokenParsed?.lastName,
+            email: keycloak.idTokenParsed?.email,
+          };
+        },
+        updateUrl: () => keycloak.createAccountUrl(),
+      },
     },
   };
 };

package/js/components/SaleTunnel/SaleTunnelInformation/SaleTunnelInformationGroup.tsx

@@ -68,6 +68,16 @@ const messages = defineMessages({
     description: 'Step label for financing/payment in the batch order form',
     defaultMessage: 'Financing',
   },
+  previousButton: {
+    id: 'components.SaleTunnel.BatchOrderForm.previousButton',
+    description: 'Label for the button to go back to the previous step in the batch order form',
+    defaultMessage: 'Previous',
+  },
+  nextButton: {
+    id: 'components.SaleTunnel.BatchOrderForm.nextButton',
+    description: 'Label for the button to proceed to the next step in the batch order form',
+    defaultMessage: 'Next',
+  },
 });
 
 export const SaleTunnelInformationGroup = () => {
@@ -258,7 +268,7 @@ const BatchOrderForm = () => {
           hidden={activeStep === 0}
           color="secondary"
         >
-          Previous
+          <FormattedMessage {...messages.previousButton} />
         </Button>
         <Button
           onClick={() => {
@@ -269,7 +279,7 @@ const BatchOrderForm = () => {
           disabled={!isCurrentStepValid}
           hidden={activeStep === steps.length - 1}
         >
-          Next
+          <FormattedMessage {...messages.nextButton} />
         </Button>
       </div>
     </FormProvider>