Fix types, lint

src/app/auth/hooks/trackUser.spec.ts

@@ -60,19 +60,19 @@ describe('trackUser', () => {
         });
       });
 
-      describe('with osano', () => {
+      describe('with CookieYes', () => {
         afterEach(() => {
-          delete window.Osano;
+          delete window.cookieYesActive;
         });
 
-        it('doesn\'t prompt if osano is running', async() => {
-          window.Osano = {cm: {mode: 'production'}};
+        it('doesn\'t prompt if CookieYes is running', async() => {
+          window.cookieYesActive = true;
           await (trackUserHookBody(helpers))(receiveUser(user));
           expect(dispatchMock).not.toHaveBeenCalled();
         });
 
-        it('prompts to accept cookies in debug', async() => {
-          window.Osano = {cm: {mode: 'debug'}};
+        it('prompts to accept if CookieYes is not running', async() => {
+          window.cookieYesActive = false;
           await (trackUserHookBody(helpers))(receiveUser(user));
           expect(dispatchMock).toHaveBeenCalledWith({
             meta: undefined,

src/app/notifications/acceptCookies.ts

@@ -7,11 +7,7 @@ export const doAcceptCookies = () => {
 };
 
 export const isAcceptCookiesNeeded = () => {
-  const osanoActive = typeof window !== 'undefined'
-    && window.Osano
-    && window.Osano.cm.mode !== 'debug';
-
-  return !osanoActive && Cookies.get(acknowledgedKey) !== 'true';
+  return !window?.cookieYesActive && Cookies.get(acknowledgedKey) !== 'true';
 };
 
 export const clearAcceptCookies = () => {

src/index.tsx

@@ -1,3 +1,5 @@
+import type { HTMLInputElement } from '@openstax/types/lib.dom';
+import type { ConsentPreferences, CookieYesBannerLoadEvent, CookieYesConsentUpdateEvent } from 'cookieyes';
 import queryString from 'query-string';
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -126,11 +128,6 @@ function cookiesBlocked(e: Error) {
   return e instanceof DOMException && ['SecurityError', 'NotSupportedError'].includes(e.name);
 }
 
-type ConsentPreferences = {
-  accepted: string[],
-  rejected: string[],
-};
-
 const sendConsentToAccounts = (consentPreferences: ConsentPreferences) => {
   fetch(`/lti/api/v0/consent${window.location.search}`, {
     body: JSON.stringify(consentPreferences),
@@ -148,11 +145,9 @@ const sendConsentToAccounts = (consentPreferences: ConsentPreferences) => {
 };
 
 app.services.userLoader.getCurrentUser().then((user) => {
-  document.addEventListener('cookieyes_banner_load', (eventData: unknown) => {
+  document.addEventListener('cookieyes_banner_load', (bannerLoadEventData: unknown) => {
     const consentPreferences = user?.consent_preferences;
-    const typedEventData = eventData as {
-      detail: { categories: Record<string, boolean>, isUserActionCompleted: boolean; },
-    };
+    const typedEventData = bannerLoadEventData as CookieYesBannerLoadEvent;
 
     if (consentPreferences) {
       // Accounts remembers some state
@@ -164,13 +159,19 @@ app.services.userLoader.getCurrentUser().then((user) => {
       consentPreferences.accepted.forEach((accepted) => {
         // There is no "necessary" switch
         if (accepted !== 'necessary') {
-          (document.getElementById(`ckySwitch${accepted}`) as any).checked = true;
-          if (!typedEventData.detail.categories[accepted]) { doUpdate = true; }
+          const checkbox = document.getElementById(`ckySwitch${accepted}`) as HTMLInputElement | null;
+          if (checkbox) {
+            checkbox.checked = true;
+            if (!typedEventData.detail.categories[accepted]) { doUpdate = true; }
+          }
         }
       });
       consentPreferences.rejected.forEach((rejected) => {
-        (document.getElementById(`ckySwitch${rejected}`) as any).checked = false;
-        if (typedEventData.detail.categories[rejected]) { doUpdate = true; }
+        const checkbox = document.getElementById(`ckySwitch${rejected}`) as HTMLInputElement | null;
+        if (checkbox) {
+          checkbox.checked = false;
+          if (typedEventData.detail.categories[rejected]) { doUpdate = true; }
+        }
       });
       if (doUpdate) { performBannerAction('accept_partial'); }
     } else if (typedEventData.detail.isUserActionCompleted) {
@@ -192,17 +193,21 @@ app.services.userLoader.getCurrentUser().then((user) => {
       );
     }
 
-    document.addEventListener('cookieyes_consent_update', (eventData: unknown) => {
-      if (user) { sendConsentToAccounts((eventData as { detail: ConsentPreferences }).detail); }
+    document.addEventListener('cookieyes_consent_update', (consentUpdateEventData: unknown) => {
+      if (user) { sendConsentToAccounts((consentUpdateEventData as CookieYesConsentUpdateEvent).detail); }
     });
+
+    window.cookieYesActive = true;
   });
 
   // GTM snippet slightly modified to assume f.parentNode is not null and with const types so ts doesn't complain
+  // tslint:disable
   (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode!.insertBefore(j,f);
-  })(window,document,'script' as const,'dataLayer' as const,'GTM-TFCS56G');
+    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode!.insertBefore(j,f);
+    })(window,document,'script' as const,'dataLayer' as const,'GTM-TFCS56G');
+  // tslint:enable
 });
 
 // Learn more about service workers: http://bit.ly/CRA-PWA

src/test/mocks/userLoader.ts

@@ -2,6 +2,10 @@ import createUserLoader, { AccountsUser } from '../../gateways/createUserLoader'
 
 export const testAccountsUser: AccountsUser = {
   applications: [],
+  consent_preferences: {
+    accepted: [],
+    rejected: [],
+  },
   contact_infos: [],
   external_ids: [],
   faculty_status: 'no_faculty_info',

src/typings/cookieyes.d.ts

@@ -0,0 +1,14 @@
+declare module 'cookieyes' {
+  export type ConsentPreferences = {
+    accepted: string[],
+    rejected: string[],
+  };
+
+  export type CookieYesBannerLoadEvent = {
+    detail: { categories: Record<string, boolean>, isUserActionCompleted: boolean; },
+  };
+
+  export type CookieYesConsentUpdateEvent = {
+    detail: ConsentPreferences;
+  };
+}

src/typings/global.d.ts

@@ -60,6 +60,7 @@ declare global {
     ga: UniversalAnalytics.ga;
     dataLayer: object[];
     gtag: (eventKey?: string, eventVal?: string, eventObj?: object) => boolean | void;
+    cookieYesActive?: boolean;
   }
 
   var fetch: (input: dom.RequestInfo, init?: dom.RequestInit) => Promise<Response>;
@@ -74,5 +75,6 @@ declare global {
   // tslint:disable-next-line:variable-name
   var ResizeObserver: dom.ResizeObserverConstructor;
 
-  var performBannerAction: (action: string) => void;
+  const performBannerAction: (action: string) => void;
+
 }