Merge pull request #204 from dfpc-coe/login-redirect

Redirect State on Login
dfpc-coe · Jun 21, 2024 · f2eccfd · f2eccfd
2 parents 5f2bf9c + 34425c9
commit f2eccfd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/api/web/src/App.vue b/api/web/src/App.vue
@@ -162,9 +162,10 @@ export default {
     },
     errorCaptured: function(err) {
         if (err.message === '401') {
+            // Popup Modal if reauthenticating vs initial login
             this.login = true;
         } else if (String(err) === 'Error: Authentication Required') {
-            this.$router.push('/login');
+            this.routeLogin();
         } else {
             this.err = err;
         }
@@ -178,7 +179,7 @@ export default {
             await this.getLogin();
             await this.getServer();
         } else if (this.$route.name !== 'login') {
-            this.$router.push("/login");
+            this.routeLogin();
         }
 
         this.mounted = true;
@@ -189,14 +190,19 @@ export default {
             delete localStorage.token;
             this.$router.push("/login");
         },
+        routeLogin: function() {
+            this.$router.push(`/login?redirect=${encodeURIComponent(window.location.pathname)}`);
+        },
         getLogin: async function() {
             this.loading = true;
             try {
                 this.user = await std('/api/login');
             } catch (err) {
                 this.user = null;
                 delete localStorage.token;
-                if (this.$route.name !== 'login') this.$router.push("/login");
+                if (this.$route.name !== 'login') {
+                    this.routeLogin();
+                }
                 this.loading = false;
             }
 

diff --git a/api/web/src/components/Login.vue b/api/web/src/components/Login.vue
@@ -116,7 +116,12 @@ export default {
                 localStorage.token = login.token;
 
                 this.$emit('login');
-                this.$router.push("/");
+
+                if (this.$route.query.redirect) {
+                    this.$router.push(this.$route.query.redirect);
+                } else {
+                    this.$router.push("/");
+                }
             } catch (err) {
                 this.loading = false;
                 throw err;