Move storage call to Application route (#127)

* Simplify session/localStorage logic; add isLoggedIn check * Revert application.js change * Add comment * Reduce diff * Move redirect storage call into Application route
hashicorp-forge · Apr 7, 2023 · a303a44 · a303a44
1 parent 12f1f30
commit a303a44
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 29 deletions.
diff --git a/web/app/routes/application.js b/web/app/routes/application.js
@@ -3,6 +3,8 @@ import { UnauthorizedError } from "@ember-data/adapter/error";
 import { action } from "@ember/object";
 import config from "hermes/config/environment";
 import { inject as service } from "@ember/service";
+import window from "ember-window-mock";
+import { REDIRECT_STORAGE_KEY } from "hermes/services/session";
 
 export default class ApplicationRoute extends Route {
   @service config;
@@ -18,7 +20,30 @@ export default class ApplicationRoute extends Route {
     }
   }
 
-  async beforeModel() {
+  async beforeModel(transition) {
+    /**
+     * We expect a `transition.intent.url`, but in rare cases, it's undefined,
+     * e.g., when clicking the "view dashboard" button from the 404 route.
+     * When this happens, we fall back to `transition.to.name`.
+     *
+     * For reference:
+     * `transition.intent.url` e.g., 'documents/1'
+     * `transition.to.name` e.g., 'authenticated.documents'
+     */
+    let transitionTo = transition.intent.url ?? transition.to.name;
+
+    /**
+     * Capture the transition intent and save it to session/localStorage.
+     */
+    window.sessionStorage.setItem(REDIRECT_STORAGE_KEY, transitionTo);
+    window.localStorage.setItem(
+      REDIRECT_STORAGE_KEY,
+      JSON.stringify({
+        url: transitionTo,
+        expiresOn: Date.now() + 60 * 5000, // 5 minutes
+      })
+    );
+
     await this.session.setup();
 
     // Flags read from the environment and set properties on the service this

diff --git a/web/app/routes/authenticated.ts b/web/app/routes/authenticated.ts
@@ -1,14 +1,13 @@
 import Route from "@ember/routing/route";
 import { inject as service } from "@ember/service";
 import AuthenticatedUserService from "hermes/services/authenticated-user";
-import window from "ember-window-mock";
-import SessionService, { REDIRECT_STORAGE_KEY } from "hermes/services/session";
+import SessionService from "hermes/services/session";
 
 export default class AuthenticatedRoute extends Route {
   @service declare session: SessionService;
   @service declare authenticatedUser: AuthenticatedUserService;
 
-  async afterModel(transition: any): Promise<void> {
+  async beforeModel(transition: any): Promise<void> {
     // If the user isn't authenticated, transition to the auth screen
     let isLoggedIn = this.session.requireAuthentication(
       transition,
@@ -19,29 +18,4 @@ export default class AuthenticatedRoute extends Route {
       void this.session.pollForExpiredAuth.perform();
     }
   }
-
-  beforeModel(transition: any): void {
-    /**
-     * We expect a `transition.intent.url`, but in rare cases, it's undefined,
-     * e.g., when clicking the "view dashboard" button from the 404 route.
-     * When this happens, we fall back to `transition.to.name`.
-     *
-     * For reference:
-     * `transition.intent.url` e.g., 'documents/1'
-     * `transition.to.name` e.g., 'authenticated.documents'
-     */
-    let transitionTo = transition.intent.url ?? transition.to.name;
-
-    /**
-     * Capture the transition intent and save it to session/localStorage.
-     */
-    window.sessionStorage.setItem(REDIRECT_STORAGE_KEY, transitionTo);
-    window.localStorage.setItem(
-      REDIRECT_STORAGE_KEY,
-      JSON.stringify({
-        url: transitionTo,
-        expiresOn: Date.now() + 60 * 5000, // 5 minutes
-      })
-    );
-  }
 }