richie-education 3.5.2-dev6 → 3.5.2-dev8

package/js/api/lms/dummy.ts

@@ -65,6 +65,7 @@ function getUserInfo(username: DevDemoUser): User {
     access_token: accessToken,
     username: JWTPayload.username,
     full_name: JWTPayload.full_name,
+    email: JWTPayload.email,
   };
 }
 

package/js/api/lms/openedx-fonzie-keycloak.spec.ts

@@ -31,19 +31,16 @@ describe('Fonzie Keycloak API', () => {
     jest.clearAllMocks();
   });
 
-  it('uses its own route to get user information and enriches with keycloak account', async () => {
+  it('reads the email and full name from the access token claims', async () => {
+    // JWT payload: { email: 'john.doe@example.com', full_name: 'John Doe' }
+    const accessToken =
+      'header.eyJlbWFpbCI6ImpvaG4uZG9lQGV4YW1wbGUuY29tIiwiZnVsbF9uYW1lIjoiSm9obiBEb2UifQ.signature';
     const user = {
       username: 'test-richie-ncl',
-      full_name: 'n c',
-    };
-    const keycloakAccount = {
-      firstName: 'John',
-      lastName: 'Doe',
-      email: 'john.doe@example.com',
+      access_token: accessToken,
     };
 
     fetchMock.get('https://demo.endpoint.api/api/v1.0/user/me', user);
-    fetchMock.get('https://keycloak.test/auth/realms/richie-realm/account/', keycloakAccount);
 
     const api = FonzieKeycloakAPIInterface(configuration);
     await expect(api.user.me()).resolves.toEqual({
@@ -53,14 +50,14 @@ describe('Fonzie Keycloak API', () => {
     });
   });
 
-  it('falls back to fonzie data when keycloak account call fails', async () => {
+  it('does not fail when the access token has no usable claims', async () => {
     const user = {
       username: 'test-richie-ncl',
       full_name: 'n c',
+      access_token: 'not-a-jwt',
     };
 
     fetchMock.get('https://demo.endpoint.api/api/v1.0/user/me', user);
-    fetchMock.get('https://keycloak.test/auth/realms/richie-realm/account/', 500);
 
     const api = FonzieKeycloakAPIInterface(configuration);
     await expect(api.user.me()).resolves.toEqual(user);

package/js/api/lms/openedx-fonzie-keycloak.ts

@@ -8,8 +8,25 @@ import { OpenEdxApiProfile } from 'types/openEdx';
 import { checkStatus } from 'api/utils';
 import { OpenEdxFullNameFormValues } from 'components/OpenEdxFullNameForm';
 import { location } from 'utils/indirection/window';
+import { base64Decode } from 'utils/base64Parser';
+import { Maybe } from 'types/utils';
 import OpenEdxHawthornApiInterface from './openedx-hawthorn';
 
+/**
+ * Extract claims from the JWT issued by Fonzie. The `user/me` route does not expose
+ * the email nor an up to date full name, but the token it returns always carries them.
+ */
+const getTokenClaims = (token: Maybe<string>): Maybe<{ email?: string; full_name?: string }> => {
+  if (!token) return undefined;
+
+  try {
+    const payload = token.split('.')[1].replace(/-/g, '+').replace(/_/g, '/');
+    return JSON.parse(base64Decode(payload));
+  } catch {
+    return undefined;
+  }
+};
+
 /**
  *
  * OpenEdX completed by Fonzie API Implementation
@@ -46,27 +63,13 @@ const API = (APIConf: AuthenticationBackend): APILms => {
       me: async () => {
         const user = await ApiInterface.user.me();
         if (!user) return null;
-        try {
-          const keycloakAccount = await fetch(APIOptions.routes.user.account, {
-            credentials: 'include',
-            headers: {
-              Accept: 'application/json',
-              Authorization: `Bearer ${user.access_token}`,
-            },
-          }).then((res) => {
-            if (!res.ok) throw new Error(`Keycloak account fetch failed: ${res.status}`);
-            return res.json();
-          });
-          return {
-            ...user,
-            full_name:
-              [keycloakAccount.firstName, keycloakAccount.lastName].filter(Boolean).join(' ') ||
-              user.full_name,
-            email: keycloakAccount.email || user.email,
-          };
-        } catch {
-          return user;
-        }
+
+        const claims = getTokenClaims(user.access_token);
+        return {
+          ...user,
+          full_name: user.full_name || claims?.full_name,
+          email: user.email ?? claims?.email,
+        };
       },
       login: () => {
         const next = encodeURIComponent(location.href);

package/js/components/SaleTunnel/index.spec.tsx

@@ -706,6 +706,36 @@ describe.each([
     screen.getByTestId('walkthrough-banner');
   });
 
+  it('should render the account name and email from the OpenEdx profile', async () => {
+    const product = ProductFactory().one();
+    const paymentPlan = PaymentPlanFactory().one();
+    fetchMock
+      .get(
+        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
+        [],
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-plan/`,
+        paymentPlan,
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/deep-link/`,
+        {},
+      );
+
+    render(<Wrapper product={product} isWithdrawable={true} paymentPlan={paymentPlan} />, {
+      queryOptions: { client: createTestQueryClient({ user: richieUser }) },
+    });
+
+    screen.getByRole('heading', { level: 4, name: 'Account email' });
+
+    await screen.findByText(openApiEdxProfile.email);
+
+    screen.getByText(
+      'This email will be used to send you confirmation mails, it is the one you created your account with.',
+    );
+  });
+
   it('should show a checkbox to waive withdrawal right if the product is not withdrawable', async () => {
     const product = ProductFactory().one();
     const paymentPlan = PaymentPlanFactory().one();

package/js/widgets/Dashboard/components/DashboardItem/Order/OrderWithdrawalModal/index.spec.tsx

@@ -32,7 +32,10 @@ jest.mock('@openfun/cunningham-react', () => ({
 describe('<OrderWithdrawalModal/>', () => {
   setupJoanieSession();
   const user = UserFactory().one();
-  const renderModal = (props: Partial<React.ComponentProps<typeof OrderWithdrawalModal>>) =>
+  const renderModal = (
+    props: Partial<React.ComponentProps<typeof OrderWithdrawalModal>>,
+    sessionUser = user,
+  ) =>
     render(
       <OrderWithdrawalModal
         isOpen
@@ -42,7 +45,7 @@ describe('<OrderWithdrawalModal/>', () => {
         reference="COURSE-CODE"
         {...props}
       />,
-      { queryOptions: { client: createTestQueryClient({ user }) } },
+      { queryOptions: { client: createTestQueryClient({ user: sessionUser }) } },
     );
 
   it('should display order and user information, without the account update link for a non-keycloak backend', () => {
@@ -53,8 +56,11 @@ describe('<OrderWithdrawalModal/>', () => {
     expect(
       screen.getByText('You wish to cancel your subscription to', { exact: false }),
     ).toBeInTheDocument();
+    expect(screen.getByText('Account name')).toBeInTheDocument();
     expect(screen.getByText(user.full_name!)).toBeInTheDocument();
+    expect(screen.getByText('Account email')).toBeInTheDocument();
     expect(screen.getByText(user.email!)).toBeInTheDocument();
+    expect(screen.getByText('Order reference')).toBeInTheDocument();
     expect(screen.getByText(order.id)).toBeInTheDocument();
     expect(
       screen.queryByRole('link', { name: 'please update your account' }),

package/package.json

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