Merge 3059ddc into f918001

5monkeys · Mar 26, 2019 · a4fc5aa · a4fc5aa
2 parents f918001 + 3059ddc
commit a4fc5aa
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 9 deletions.
diff --git a/src/Admin.js b/src/Admin.js
@@ -219,7 +219,7 @@ class Admin extends React.Component {
     // Route to current window location if API is authenticatd
     if (swagger.isAuthenticated) {
       if (!this.state.context.user) {
-        this.setContext({ user: { pending: true } });
+        await this.authorize();
       }
       this.router.reroute();
     }
@@ -322,17 +322,24 @@ class Admin extends React.Component {
 
     // Authorize, load and mount page
     try {
-      await this.authorize();
       const { PageComponent, pageProps } = await this.loadPage(location, route);
       this.mountPage(PageComponent, pageProps);
     } catch (error) {
-      // TODO: Handle un-authorized data -> Mount 401/403 page
-      if (error instanceof AnonymousUserError) {
-        this.reboot();
-      } else if (error instanceof PageError) {
+      this.admin.loading(false);
+      if (error instanceof PageError) {
         this.mountErrorPage(t(error.message), error.code);
+      } else if (error.response && [401, 403].includes(error.response.status)) {
+        try {
+          await this.authorize();
+          this.mountErrorPage(t("Permission denied."), error.response.status);
+        } catch (authorizeError) {
+          if (authorizeError instanceof AnonymousUserError) {
+            this.reboot();
+          } else {
+            throw error;
+          }
+        }
       } else {
-        this.admin.loading(false);
         throw error;
       }
     }

diff --git a/src/pages/ErrorPage.js b/src/pages/ErrorPage.js
@@ -11,7 +11,9 @@ const ErrorPage = ({ title, data }) => {
       <Translate>
         {[404, 501].includes(statusCode)
           ? "We're sorry, but the requested page could not be found."
-          : "There's been an error. It's been reported to the site administrators via email and should be fixed shortly. Thanks for your patience."}
+          : statusCode >= 500
+          ? "There's been an error. It's been reported to the site administrators via email and should be fixed shortly. Thanks for your patience."
+          : ""}
       </Translate>
     </CardPage>
   );

diff --git a/tests/api.mock.js b/tests/api.mock.js
@@ -39,7 +39,10 @@ export function mockAPI({ anonymous, schema } = {}) {
   // Mock i18n, me and login
   fetchMock
     .get("http://foo.bar/api/v1.0/bananas/i18n/", { body: translations })
-    .get("http://foo.bar/api/v1.0/bananas/me/", { body: user })
+    .get(
+      "http://foo.bar/api/v1.0/bananas/me/",
+      anonymous ? 403 : { body: user }
+    )
     .post("http://foo.bar/api/v1.0/bananas/login/", () => {
       mockAPI(); // Re-mock API as authenticated
       return { body: user };

diff --git a/tests/app.test.js b/tests/app.test.js
@@ -145,6 +145,33 @@ test("Can render dashboard and navigate using menu", async () => {
   expect(queryAllByText(user.full_name)).toHaveLength(2);
 });
 
+test("Handles unauthenticated page load", async () => {
+  const { app, container, getByLabelText } = await renderApp();
+  const userListRoute = app.router.getRoute("example.user:list");
+
+  mockAPI({ anonymous: true });
+  fetchMock.get(`http://foo.bar/api/v1.0${userListRoute.path}`, {
+    body: {},
+    status: 403,
+  });
+
+  app.router.route(userListRoute.path);
+  await waitForElement(() => getByLabelText("login"), { container });
+});
+
+test("Handles unauthorized page load", async () => {
+  const { app, container, getByText } = await renderApp();
+  const userListRoute = app.router.getRoute("example.user:list");
+
+  fetchMock.get(`http://foo.bar/api/v1.0${userListRoute.path}`, {
+    body: {},
+    status: 403,
+  });
+
+  app.router.route(userListRoute.path);
+  await waitForElement(() => getByText("Status: 403"), { container });
+});
+
 test("Handles 404", async () => {
   const { app, container, getByText } = await renderApp();
   app.router.route("/foobar/");