Restored user load behavior, except using always_200=true

Author: Dantemss

src/app/models/accounts-model.ts

@@ -1,6 +1,6 @@
 import settings from '~/helpers/window-settings';
 
-const accountsUrl = `${settings().accountHref}/api/user`;
+const accountsUrl = `${settings().accountHref}/api/user?always_200=true`;
 
 function cached<T>(fn: () => T, invalidateFn: () => void) {
     let valid = false;
@@ -20,6 +20,34 @@ function cached<T>(fn: () => T, invalidateFn: () => void) {
     return cachedFn;
 }
 
+export type AccountsUserModel = {
+  id: number;
+  uuid: string;
+  first_name: string;
+  last_name: string;
+  email: string;
+  school_name: string;
+  self_reported_role: string;
+  self_reported_school: string;
+  is_not_gdpr_location: boolean;
+  salesforce_contact_id: string;
+  is_instructor_verification_stale: boolean;
+  faculty_status: string;
+  contact_infos: {
+      type: string;
+      value: string;
+      is_verified: boolean;
+      is_guessed_preferred: boolean;
+  }[];
+};
+
+declare global {
+    interface Window {
+        _OX_USER_PROMISE?: Promise<AccountsUserModel>;
+        dataLayer?: object[];
+    }
+}
+
 export default {
     load: cached(() => {
         // Uncomment ONLY to TEST
@@ -62,15 +90,17 @@ export default {
         //     ]
         // });
 
-        window._OX_USER_PROMISE ||= fetch(accountsUrl, { credentials: 'include' }).then(
-            (response) => {
-                if (response.ok) {
-                    return response.json().catch((error) => {
-                        throw new Error(`Failed to parse user JSON: ${error.message}`);
-                    });
-                } else {
-                    throw new Error(`Failed to load user: HTTP ${response.status} status code`);
+        // This code is shared with the CookieYes loader in index.html
+        window._OX_USER_PROMISE ||= fetch(accountsUrl, {credentials: 'include'}).then(
+            (response) => response.json().catch(
+                (err: unknown) => {
+                    console.warn('No JSON in Accounts response');
+                    return {err};
                 }
+            ),
+            (err: unknown) => {
+                console.warn('"Error fetching user info"');
+                return {err};
             }
         );
 

src/app/models/usermodel.ts

@@ -1,8 +1,7 @@
 import {useState, useEffect} from 'react';
 import isEqual from 'lodash/isEqual';
 import throttle from 'lodash/throttle';
-import accountsModel from './accounts-model';
-import type {AccountsUserModel} from '../../typings/accounts';
+import accountsModel, { AccountsUserModel } from './accounts-model';
 
 export type UserModelType = {
     id: number;

src/index.html

@@ -25,17 +25,20 @@
         <link rel="prefetch" href="<%= process.env.API_ORIGIN %>/apps/cms/api/books/?format=json">
         <link rel="prefetch" href="<%= process.env.API_ORIGIN %>/apps/cms/api/footer/?format=json">
         <script>
-          window._OX_USER_PROMISE ||= fetch('/accounts/api/user?always_200=true', { credentials: 'include' }).then(
-            (response) => {
-              if (response.ok) {
-                return response.json().catch((error) => {
-                  throw new Error(`Failed to parse user JSON: ${error.message}`);
-                });
-              } else {
-                throw new Error(`Failed to load user: HTTP ${response.status} status code`);
+          // This code is shared with the accounts-model
+          window._OX_USER_PROMISE ||= fetch('/accounts/api/user?always_200=true', {credentials: 'include'}).then(
+              (response) => response.json().catch(
+                  (err) => {
+                      console.warn('No JSON in Accounts response');
+                      return {err};
+                  }
+              ),
+              (err) => {
+                  console.warn('"Error fetching user info"');
+                  return {err};
               }
-            }
           );
+
           window._OX_USER_PROMISE.then((user) => {
             const updateUserConsentPreferences = (consentPreferences) => {
               if (user.id) {

src/typings/accounts.d.ts

@@ -11,10 +11,8 @@ describe('accounts-model', () => {
         accountsModel.load.invalidate();
         console.warn = saveWarn;
     });
-    it('handles 403 response', async () => {
-        mockFetch.mockResolvedValueOnce({
-            status: 403
-        });
+    it('handles empty json response', async () => {
+        mockFetch.mockResolvedValueOnce({json: () => Promise.resolve({})});
         expect(await accountsModel.load()).toEqual({});
     });
     it('catches rejection', async () => {