update tests

Author: SuaYoo

frontend/src/index.test.ts

@@ -51,15 +51,13 @@ const mockAppSettings: AppSettings = {
 describe("browsertrix-app", () => {
   beforeEach(() => {
     AppStateService.resetAll();
-    AuthService.broadcastChannel = new BroadcastChannel(AuthService.storageKey);
     window.sessionStorage.clear();
     window.localStorage.clear();
     stub(window.history, "pushState");
     stub(NotifyController.prototype, "toast");
   });
 
   afterEach(() => {
-    AuthService.broadcastChannel.close();
     restore();
   });
 
@@ -69,7 +67,7 @@ describe("browsertrix-app", () => {
   });
 
   it("don't block render if settings aren't defined", async () => {
-    stub(AuthService, "initSessionStorage").returns(
+    stub(AuthService.prototype, "initSessionStorage").returns(
       Promise.resolve({
         headers: { Authorization: "_fake_headers_" },
         tokenExpiresAt: 0,
@@ -85,7 +83,7 @@ describe("browsertrix-app", () => {
   });
 
   it("renders 404 when not in org", async () => {
-    stub(AuthService, "initSessionStorage").returns(
+    stub(AuthService.prototype, "initSessionStorage").returns(
       Promise.resolve({
         headers: { Authorization: "_fake_headers_" },
         tokenExpiresAt: 0,
@@ -117,7 +115,7 @@ describe("browsertrix-app", () => {
       role: 10,
     };
 
-    stub(AuthService, "initSessionStorage").returns(
+    stub(AuthService.prototype, "initSessionStorage").returns(
       Promise.resolve({
         headers: { Authorization: "_fake_headers_" },
         tokenExpiresAt: 0,
@@ -142,7 +140,9 @@ describe("browsertrix-app", () => {
   });
 
   it("renders log in when not authenticated", async () => {
-    stub(AuthService, "initSessionStorage").returns(Promise.resolve(null));
+    stub(AuthService.prototype, "initSessionStorage").returns(
+      Promise.resolve(null),
+    );
     // @ts-expect-error checkFreshness is private
     stub(AuthService.prototype, "checkFreshness");
     stub(NavigateController, "createNavigateEvent").callsFake(
@@ -184,7 +184,7 @@ describe("browsertrix-app", () => {
       Promise.resolve(mockAPIUser),
     );
     stub(AuthService.prototype, "startFreshnessCheck").callsFake(() => {});
-    stub(AuthService, "initSessionStorage").callsFake(async () =>
+    stub(AuthService.prototype, "initSessionStorage").callsFake(async () =>
       Promise.resolve({
         headers: { Authorization: "_fake_headers_" },
         tokenExpiresAt: 0,
@@ -203,7 +203,7 @@ describe("browsertrix-app", () => {
       Promise.resolve(mockAPIUser),
     );
     stub(AuthService.prototype, "startFreshnessCheck").callsFake(() => {});
-    stub(AuthService, "initSessionStorage").callsFake(async () =>
+    stub(AuthService.prototype, "initSessionStorage").callsFake(async () =>
       Promise.resolve({
         headers: { Authorization: "_fake_headers_" },
         tokenExpiresAt: 0,
@@ -235,7 +235,7 @@ describe("browsertrix-app", () => {
     );
     stub(App.prototype, "getLocationPathname").callsFake(() => `/orgs/${id}`);
     stub(AuthService.prototype, "startFreshnessCheck").callsFake(() => {});
-    stub(AuthService, "initSessionStorage").callsFake(async () =>
+    stub(AuthService.prototype, "initSessionStorage").callsFake(async () =>
       Promise.resolve({
         headers: { Authorization: "_fake_headers_" },
         tokenExpiresAt: 0,

frontend/src/utils/AuthService.test.ts

@@ -7,29 +7,34 @@ import { AppStateService } from "./state";
 describe("AuthService", () => {
   beforeEach(() => {
     AppStateService.resetAll();
-    AuthService.broadcastChannel = new BroadcastChannel(AuthService.storageKey);
+    window.sessionStorage.clear();
     window.sessionStorage.clear();
     stub(window.history, "pushState");
   });
 
   afterEach(() => {
-    AuthService.broadcastChannel.close();
     restore();
   });
 
-  describe("AuthService.initSessionStorage()", () => {
+  describe("initSessionStorage()", () => {
+    let authService = new AuthService();
+
+    beforeEach(() => {
+      authService = new AuthService();
+    });
+
     it("returns auth in session storage", async () => {
       stub(window.sessionStorage, "getItem").returns(
         JSON.stringify({
           headers: { Authorization: "_fake_headers_" },
-          tokenExpiresAt: "_fake_tokenExpiresAt_",
+          tokenExpiresAt: 1111,
           username: "test-auth@example.com",
         }),
       );
-      const result = await AuthService.initSessionStorage();
+      const result = await authService.initSessionStorage();
       expect(result).to.deep.equal({
         headers: { Authorization: "_fake_headers_" },
-        tokenExpiresAt: "_fake_tokenExpiresAt_",
+        tokenExpiresAt: 1111,
         username: "test-auth@example.com",
       });
     });
@@ -41,22 +46,22 @@ describe("AuthService", () => {
           name: "responding_auth",
           auth: {
             headers: { Authorization: "_fake_headers_from_tab_" },
-            tokenExpiresAt: "_fake_tokenExpiresAt_from_tab_",
+            tokenExpiresAt: 9999,
             username: "test-auth@example.com_from_tab_",
           },
         });
       });
-      const result = await AuthService.initSessionStorage();
+      const result = await authService.initSessionStorage();
       expect(result).to.deep.equal({
         headers: { Authorization: "_fake_headers_from_tab_" },
-        tokenExpiresAt: "_fake_tokenExpiresAt_from_tab_",
+        tokenExpiresAt: 9999,
         username: "test-auth@example.com_from_tab_",
       });
       otherTabChannel.close();
     });
     it("resolves without stored auth or another tab", async () => {
       stub(window.sessionStorage, "getItem");
-      const result = await AuthService.initSessionStorage();
+      const result = await authService.initSessionStorage();
       expect(result).to.equal(null);
     });
   });
@@ -84,26 +89,6 @@ describe("AuthService", () => {
         expect(window.sessionStorage.setItem).to.have.been.called;
       });
 
-      it("posts to the broadcast channel", () => {
-        stub(AuthService.storage, "getItem").returns("");
-        stub(AuthService.broadcastChannel, "postMessage");
-        stub(window.sessionStorage, "setItem");
-
-        const authValue = JSON.stringify({
-          headers: { Authorization: self.crypto.randomUUID() },
-          tokenExpiresAt: Date.now(),
-          username: "test-auth@example.com",
-        });
-        AuthService.storage.setItem(authValue);
-
-        expect(
-          AuthService.broadcastChannel.postMessage,
-        ).to.have.been.calledWith({
-          name: "auth_storage",
-          value: authValue,
-        });
-      });
-
       it("does not store the same value", () => {
         stub(AuthService.storage, "getItem").returns(JSON.stringify(mockAuth));
         stub(window.sessionStorage, "setItem");