@fishawack/lab-velocity 1.3.2 → 1.4.1

package/AuthModule/js/AuthRoutes.js

@@ -24,6 +24,14 @@ export function authRoutes(node, store, nested = 'auth') {
                           .default,
                 name: `${nested}.login`
             },
+            {
+                path: "force-login",
+                component: node
+                    ? ""
+                    : require("../routes/loginheadless.vue")
+                          .default,
+                name: `${nested}.force-login`
+            },
             {
                 path: "callback",
                 component: node
@@ -123,7 +131,7 @@ export function authRoutes(node, store, nested = 'auth') {
 export function configureRoutes(router) {
 
     router.beforeEach((to, from, next) => {
-        const { authenticated, user, authBase, redirect, forcePasswordChange } = store.state.auth;
+        const { authenticated, user, authBase, redirect, forcePasswordChange, autoLogin } = store.state.auth;
 
         const admin = to.path.includes("/admin");
 
@@ -133,7 +141,11 @@ export function configureRoutes(router) {
             if (admin && !user?.admin) {
                 next({ name: redirect });
             } else if (to.name === "login" || to.name === `${authBase}.login`) {
-                next({ name: redirect });
+                if(autoLogin) {
+                    next({ name: `${authBase}.force-login` });
+                } else {
+                    next({ name: redirect });
+                }
             } else if (
                 !user?.email_verified_at &&
                 to.matched.some((d) => d.meta.guest) !== true
@@ -147,8 +159,14 @@ export function configureRoutes(router) {
                 next();
             } else if (admin) {
                 next({ name: "login" });
+            } else if (to.path === "/callback") {
+                next({ name: `${authBase}.callback` });
             } else {
-                next({ name: `${authBase}.login` });
+                if(autoLogin === true) {
+                    next({ name: `${authBase}.force-login` });
+                } else {
+                    next({ name: `${authBase}.login` });
+                }
             }
         }
     });

package/AuthModule/js/AuthStore.js

@@ -9,7 +9,8 @@ const store = {
             forcePasswordChange: false,
             intended: null,
             user: null,
-            redirect: process.env.HYDRATE_REDIRECT ?? 'index'
+            redirect: process.env.HYDRATE_REDIRECT ?? 'index',
+            autoLogin: process.env.HYDRATE_ADMIN === 'true' ? true:  false,
         }
     },
 

package/AuthModule/routes/logincallback.vue

@@ -40,9 +40,7 @@ export default {
     },
 
     mounted() {
-        if (this.$route.query.authenticated) {
-            this.postLogin();
-        }
+        this.postLogin();
     },
 };
 </script>

package/AuthModule/routes/loginheadless.vue

@@ -0,0 +1,16 @@
+<template>
+    <!-- Set Spinner -->
+     <div class="mx-auto">
+        <VLoader class="mx-auto" />
+        <p v-text="`Logging in...`"/>
+     </div>
+</template>
+
+
+<script>
+    export default {
+        mounted(){
+            window.location = '/login';
+        }
+    }
+</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-velocity",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "description": "Avalere Health branded style system",
   "scripts": {
     "setup": "npm ci || npm i && npm run content",