Fix auth failure redirect (#39)

openmrs · Nov 23, 2020 · 5fac2de · 5fac2de
1 parent 89ae255
commit 5fac2de
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 41 deletions.
diff --git a/...mocks__/openmrs-esm-module-config.mock.ts → ...-api/__mocks__/openmrs-esm-config.mock.ts b/...mocks__/openmrs-esm-module-config.mock.ts → ...-api/__mocks__/openmrs-esm-config.mock.ts
@@ -3,3 +3,5 @@ export const defineConfigSchema = jest.fn();
 export const getConfig = jest
   .fn()
   .mockResolvedValue({ redirectAuthFailure: { enabled: false } });
+
+export const navigate = jest.fn();
diff --git a/packages/esm-api/jest.config.js b/packages/esm-api/jest.config.js
@@ -6,8 +6,7 @@ module.exports = {
     "lodash-es": "lodash",
     "@openmrs/esm-error-handling":
       "<rootDir>/__mocks__/openmrs-esm-error-handling.mock.ts",
-    "@openmrs/esm-config":
-      "<rootDir>/__mocks__/openmrs-esm-module-config.mock.ts",
+    "@openmrs/esm-config": "<rootDir>/__mocks__/openmrs-esm-config.mock.ts",
     "single-spa": "<rootDir>/__mocks__/single-spa.mock.ts",
   },
 };
diff --git a/packages/esm-api/src/openmrs-fetch.test.ts b/packages/esm-api/src/openmrs-fetch.test.ts
@@ -1,8 +1,10 @@
 import { openmrsFetch, openmrsObservableFetch } from "./openmrs-fetch";
 import { isObservable } from "rxjs";
 
-import { navigateToUrl as mockNavigateToUrl } from "single-spa";
-import { getConfig as mockGetConfig } from "@openmrs/esm-config";
+import {
+  getConfig as mockGetConfig,
+  navigate as mockNavigate,
+} from "@openmrs/esm-config";
 
 describe("openmrsFetch", () => {
   beforeEach(() => {
@@ -209,33 +211,9 @@ describe("openmrsFetch", () => {
 
     return openmrsFetch("/ws/rest/v1/session").then((data) => {
       //@ts-ignore
-      expect(mockNavigateToUrl.mock.calls[0][0]).toBe("/openmrs/spa/login");
-    });
-  });
-
-  it(`redirects to openmrs login page when the server responds with a 401`, () => {
-    (mockGetConfig as any).mockResolvedValueOnce({
-      redirectAuthFailure: {
-        enabled: true,
-        url: "/openmrs/login",
-        errors: [401],
-        resolvePromise: true,
-      },
-    });
-
-    // @ts-ignore
-    window.fetch.mockReturnValue(
-      Promise.resolve({
-        ok: false,
-        status: 401,
-        statusText: "You are not authorized",
-        text: () => Promise.resolve("a string response body"),
-      })
-    );
-
-    return openmrsFetch("/ws/rest/v1/session").then((data) => {
-      //@ts-ignore
-      expect(window.location.assign.mock.calls[0][0]).toBe("/openmrs/login");
+      expect(mockNavigate.mock.calls[0][0]).toStrictEqual({
+        to: "/openmrs/spa/login",
+      });
     });
   });
 });

diff --git a/packages/esm-api/src/openmrs-fetch.ts b/packages/esm-api/src/openmrs-fetch.ts
@@ -1,7 +1,7 @@
 import { Observable } from "rxjs";
 import { navigateToUrl } from "single-spa";
 import isPlainObject from "lodash-es/isPlainObject";
-import { getConfig } from "@openmrs/esm-config";
+import { getConfig, navigate } from "@openmrs/esm-config";
 import { FetchResponse } from "./types";
 
 export function openmrsFetch<T = any>(
@@ -94,16 +94,9 @@ export function openmrsFetch<T = any>(
       const { redirectAuthFailure } = await getConfig("@openmrs/esm-api");
       if (
         redirectAuthFailure.enabled &&
-        redirectAuthFailure.errors.indexOf(response.status) >= 0
+        redirectAuthFailure.errors.includes(response.status)
       ) {
-        const navigatesWithInSpa = (url) => {
-          // @ts-ignore
-          return url.startsWith(window.getOpenmrsSpaBase());
-        };
-
-        navigatesWithInSpa(redirectAuthFailure.url)
-          ? navigateToUrl(redirectAuthFailure.url)
-          : location.assign(redirectAuthFailure.url);
+        navigate({ to: redirectAuthFailure.url });
 
         /* We sometimes don't really want this promise to resolve since there's no response data,
          * nor do we want it to reject because that would trigger error handling. We instead