Use response.ok, which is handled in tests, fixed some errors

Author: Dantemss

src/app/helpers/tag-manager.js

@@ -2,9 +2,9 @@
 import accountsModel from '~/models/accounts-model';
 const tagManagerID = 'GTM-W6N7PB';
 
-window.dataLayer = window.dataLayer || [];
+window.dataLayer ||= [];
 
-window.oxDLF = window.oxDLF || [];
+window.oxDLF ||= [];
 
 // eslint-disable-next-line max-params
 (function (w, d, s, l, i) {

src/app/models/accounts-model.ts

@@ -2,7 +2,7 @@ import settings from '~/helpers/window-settings';
 
 const accountsUrl = `${settings().accountHref}/api/user`;
 
-function cached<T>(fn: () => T) {
+function cached<T>(fn: () => T, invalidateFn: () => void) {
     let valid = false;
     let cachedResult: T | null = null;
     const cachedFn = function () {
@@ -14,32 +14,12 @@ function cached<T>(fn: () => T) {
     };
 
     cachedFn.invalidate = () => {
+        invalidateFn();
         valid = false;
     };
     return cachedFn;
 }
 
-export type SfUserModel = {
-    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;
-    }[];
-};
-
 export default {
     load: cached(() => {
         // Uncomment ONLY to TEST
@@ -82,34 +62,23 @@ export default {
         //     ]
         // });
         // eslint-disable-next-line no-unreachable
-        return fetch(accountsUrl, {credentials: 'include'}).then(
+        window._OX_USER_PROMISE ||= fetch(accountsUrl, { credentials: 'include' }).then(
             (response) => {
-                if (response.status === 403) {
-                    return {};
+                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`);
                 }
-                return response.json().then(
-                    (result) => {
-                        if (
-                            'dataLayer' in window &&
-                            window.dataLayer instanceof Array
-                        ) {
-                            window.dataLayer.push({
-                                // eslint-disable-next-line camelcase
-                                faculty_status: result.faculty_status
-                            });
-                        }
-                        return result as SfUserModel;
-                    },
-                    (err: unknown) => {
-                        console.warn('No JSON in Accounts response');
-                        return {err};
-                    }
-                );
-            },
-            (err: unknown) => {
-                console.warn('"Error fetching user info"');
-                return {err};
             }
         );
-    })
+        return window._OX_USER_PROMISE.then((user) => {
+            window.dataLayer ||= [];
+            window.dataLayer.push({
+                faculty_status: user.faculty_status
+            });
+            return user;
+        });
+    }, () => { window._OX_USER_PROMISE = undefined; })
 };

src/app/models/usermodel.ts

@@ -1,7 +1,8 @@
 import {useState, useEffect} from 'react';
 import isEqual from 'lodash/isEqual';
 import throttle from 'lodash/throttle';
-import accountsModel, {SfUserModel} from './accounts-model';
+import accountsModel from './accounts-model';
+import type {AccountsUserModel} from '../../typings/accounts';
 
 export type UserModelType = {
     id: number;
@@ -22,12 +23,12 @@ export type UserModelType = {
     self_reported_school: string;
     is_not_gdpr_location: boolean;
     salesforce_contact_id: string;
-    accountsModel: SfUserModel;
+    accountsModel: AccountsUserModel;
 };
 
 // eslint-disable-next-line complexity
-function oldUserModel(sfUserModel: SfUserModel) {
-    if (!('id' in sfUserModel)) {
+function oldUserModel(accountsUserModel: AccountsUserModel) {
+    if (!('id' in accountsUserModel)) {
         return {};
     }
     const findPreferredEmail = (
@@ -45,21 +46,21 @@ function oldUserModel(sfUserModel: SfUserModel) {
                 return a;
             }).value;
     const isStudent = ['student', 'unknown_role'].includes(
-        sfUserModel.self_reported_role
+        accountsUserModel.self_reported_role
     );
     const isVerificationStale =
-        !isStudent && sfUserModel.is_instructor_verification_stale;
+        !isStudent && accountsUserModel.is_instructor_verification_stale;
     const isVerificationPending =
         !isStudent &&
-        ['pending_faculty'].includes(sfUserModel.faculty_status) &&
+        ['pending_faculty'].includes(accountsUserModel.faculty_status) &&
         !isVerificationStale;
     const groups = (function () {
         const result = [];
 
         if (isStudent) {
             result.push('Student');
         }
-        if (sfUserModel.faculty_status === 'confirmed_faculty') {
+        if (accountsUserModel.faculty_status === 'confirmed_faculty') {
             result.push('Faculty');
         }
         return result;
@@ -69,44 +70,44 @@ function oldUserModel(sfUserModel: SfUserModel) {
     const pendingInstructorAccess = [
         'rejected_by_sheerid',
         'pending_faculty'
-    ].includes(sfUserModel.faculty_status);
-    const incompleteSignup = sfUserModel.faculty_status === 'incomplete_signup';
-    const emailUnverified = !sfUserModel.contact_infos.some(
+    ].includes(accountsUserModel.faculty_status);
+    const incompleteSignup = accountsUserModel.faculty_status === 'incomplete_signup';
+    const emailUnverified = !accountsUserModel.contact_infos.some(
         (i) => i.is_verified
     );
-    const instructorEligible = sfUserModel.faculty_status === 'no_faculty_info';
+    const instructorEligible = accountsUserModel.faculty_status === 'no_faculty_info';
 
     /* eslint camelcase: 0 */
     return {
-        id: sfUserModel.id,
-        accounts_id: sfUserModel.id,
-        uuid: sfUserModel.uuid,
-        email: sfUserModel.contact_infos.length
-            ? findPreferredEmail(sfUserModel.contact_infos)
+        id: accountsUserModel.id,
+        accounts_id: accountsUserModel.id,
+        uuid: accountsUserModel.uuid,
+        email: accountsUserModel.contact_infos.length
+            ? findPreferredEmail(accountsUserModel.contact_infos)
             : undefined,
-        first_name: sfUserModel.first_name,
+        first_name: accountsUserModel.first_name,
         groups,
-        last_name: sfUserModel.last_name,
+        last_name: accountsUserModel.last_name,
         instructorEligible,
         pending_verification: isVerificationPending,
         stale_verification: isVerificationStale,
         incompleteSignup,
         pendingInstructorAccess,
         emailUnverified,
-        username: sfUserModel.id,
-        self_reported_role: sfUserModel.self_reported_role,
-        self_reported_school: sfUserModel.self_reported_school,
-        is_not_gdpr_location: sfUserModel.is_not_gdpr_location,
-        salesforce_contact_id: sfUserModel.salesforce_contact_id,
-        accountsModel: sfUserModel
+        username: accountsUserModel.id,
+        self_reported_role: accountsUserModel.self_reported_role,
+        self_reported_school: accountsUserModel.self_reported_school,
+        is_not_gdpr_location: accountsUserModel.is_not_gdpr_location,
+        salesforce_contact_id: accountsUserModel.salesforce_contact_id,
+        accountsModel: accountsUserModel
     } as const;
 }
 
 const userModel = {
     load() {
         return accountsModel
             .load()
-            ?.then((sfModel) => oldUserModel(sfModel as SfUserModel));
+            ?.then((accountsUserModel) => oldUserModel(accountsUserModel as AccountsUserModel));
     }
 };
 

src/app/pages/details/common/get-this-title-files/give-before-pdf/give-before-pdf.tsx

@@ -87,11 +87,10 @@ function GiveBeforePdfAfterConditionals({
     });
 
     React.useEffect(() => {
-        if ('dataLayer' in window) {
-            (window.dataLayer as Array<object>).push({
-                event: 'optimize.giveBeforePdf'
-            });
-        }
+        window.dataLayer ||= [];
+        window.dataLayer.push({
+            event: 'optimize.giveBeforePdf'
+        });
     });
 
     const closeAfterDelay = React.useCallback(

src/index.html

@@ -27,7 +27,7 @@
         <script>
           window._OX_USER_PROMISE ||= fetch('/accounts/api/user?always_200=true', { credentials: 'include' }).then(
             (response) => {
-              if (response.status === 200) {
+              if (response.ok) {
                 return response.json().catch((error) => {
                   throw new Error(`Failed to parse user JSON: ${error.message}`);
                 });
@@ -46,7 +46,7 @@
                   method: 'PUT',
                 }).then(
                   (response) => {
-                    if (response.status === 200) {
+                    if (response.ok) {
                       window.location.reload();
                     } else {
                       throw new Error(`Failed to save cookie consent: HTTP ${response.status} status code`);
@@ -57,7 +57,6 @@
             };
 
             document.addEventListener('cookieyes_banner_load', async(eventData) => {
-              const user = userResponse.status === 200 ? await userResponse.json() : undefined;
               const userConsentPreferences = user?.consent_preferences;
 
               if (userConsentPreferences) {

src/typings/accounts.d.ts

@@ -0,0 +1,20 @@
+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;
+    }[];
+};

src/typings/global.d.ts

@@ -0,0 +1,8 @@
+import type { AccountsUserModel } from './accounts';
+
+declare global {
+    interface Window {
+        _OX_USER_PROMISE?: Promise<AccountsUserModel>;
+        dataLayer?: object[];
+    }
+}