@fishawack/lab-velocity 1.11.1 → 2.0.0-beta.2

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/expired-reset.vue

@@ -5,11 +5,12 @@
         <strong class="">Email: {{ form?.email }}</strong>
     </p>
     <p class="AM-mt-0.5">
-        For security, password reset requests are only <strong>active for 1&nbsp;hour</strong>. If you still want to reset your password, please request a new password reset-link.</p>
+        For security, password reset requests are only
+        <strong>active for 1&nbsp;hour</strong>. If you still want to reset your
+        password, please request a new password reset-link.
+    </p>
 
-    <form class="form"
-        @submit.prevent="submit"
-    >
+    <form class="form" @submit.prevent="submit">
         <el-input
             class="hidden"
             v-model="form.email"
@@ -21,6 +22,7 @@
             required
         />
         <elButton
+            native-type="submit"
             type="primary"
             :disabled="form.processing"
             :loading="form.processing"
@@ -30,7 +32,7 @@
         </elButton>
 
         <p class="disclaimer AM-mt-3">
-            <router-link class="color-1 underline" :to="{ name: `${$store.state.auth.authBase}.login` }">
+            <router-link class="color-1 underline" :to="{ name: 'auth.login' }">
                 Back to Sign in
             </router-link>
         </p>
@@ -42,15 +44,15 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
     data: () => ({
         form: new Form(
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
     }),
 
@@ -60,7 +62,7 @@ export default {
                 await this.form.post("/forgot-password");
 
                 this.$router.push({
-                    name: `${this.$store.state.auth.authBase}.success-forgot`,
+                    name: "auth.success-forgot",
                     query: { email: this.form.email },
                 });
             } catch (e) {
@@ -69,8 +71,8 @@ export default {
         },
     },
 
-    mounted(){
+    mounted() {
         this.form.email = this.$route.query.email;
-    }
+    },
 };
 </script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/expired-verification.vue

@@ -6,7 +6,8 @@
             <strong class="">Email: {{ form?.email }}</strong>
         </p>
         <p class="AM-mt-0.5">
-            This email verification link has expired. Not to worry, we can email you a new one.
+            This email verification link has expired. Not to worry, we can email
+            you a new one.
         </p>
 
         <el-input
@@ -21,6 +22,7 @@
         />
 
         <elButton
+            native-type="submit"
             type="primary"
             :disabled="form.processing"
             :loading="form.processing"
@@ -32,7 +34,7 @@
 
     <p class="disclaimer AM-mt-3">
         Having trouble singing in?
-        <a :href="contact" class="underline">Contact us</a>
+        <a :href="$store.state.auth.contact" class="underline">Contact us</a>
     </p>
 </template>
 
@@ -41,18 +43,17 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
     data: () => ({
         form: new Form(
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
         notification: null,
-        contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
     }),
 
     methods: {
@@ -68,25 +69,24 @@ export default {
                 this.$notify.success({
                     message: "Email has been re-sent",
                     duration: 10000,
-                    class: 'el-notification--success el-notification--right-override'
+                    class: "el-notification--success el-notification--right-override",
                 });
             } catch (e) {
                 if (e.response && e.response.status === 429) {
                     this.notification = this.$notify({
                         type: "warning",
-                        message: 'Please allow 10 minutes before re-requesting',
+                        message: "Please allow 10 minutes before re-requesting",
                         duration: 0,
-                        class: 'el-notification--warning el-notification--right-override'
+                        class: "el-notification--warning el-notification--right-override",
                     });
                 } else if (e.response && e.response.status === 422) {
                     this.notification = this.$notify({
                         type: "error",
                         message: e.response.data.message,
                         duration: 0,
-                        class: 'el-notification--error el-notification--right-override'
+                        class: "el-notification--error el-notification--right-override",
                     });
-                }
-                else {
+                } else {
                     this.$root.errors(e);
                 }
             }

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/force-reset.vue

@@ -1,14 +1,25 @@
 <template>
     <div class="relative">
         <section id="resetPasswordForm">
-            <h1 class="h2 h2--small" v-html="!form.successful ? 'Welcome' : 'Success'" />
+            <h1
+                class="h2 h2--small"
+                v-html="!form.successful ? 'Welcome' : 'Success'"
+            />
             <form class="form" @submit.prevent="submit">
                 <div v-if="!form.successful">
                     <p class="AM-mt-2 AM-mb-0 AM-color-highlight">
-                        <strong class="">Email: {{ $store.state?.auth?.user?.email }}</strong>
+                        <strong class=""
+                            >Email:
+                            {{ $store.state?.auth?.user?.email }}</strong
+                        >
                     </p>
                     <p class="AM-mt-0.5">
-                        <strong>Hello {{ $store.state?.auth?.user?.name }}</strong>, and welcome to {{ $store.state.auth.platformName }}. To maintain security, anyone signing in with a one-time-password must <strong>create a new password</strong> the first time they access the {{ $store.state.auth.platformName }} portal.
+                        <strong
+                            >Hello {{ $store.state?.auth?.user?.name }}</strong
+                        >, and welcome to {{ $root.appName }}. To maintain
+                        security, anyone signing in with a one-time-password
+                        must <strong>create a new password</strong> the first
+                        time they access the {{ $root.appName }} portal.
                     </p>
                     <el-input
                         v-model="form.password"
@@ -22,9 +33,13 @@
                         required
                     />
 
-                    <VPasswordValidation :password="form.password" @passwordValid="updatePasswordValidity" />
+                    <VPasswordValidation
+                        :password="form.password"
+                        @passwordValid="updatePasswordValidity"
+                    />
 
                     <elButton
+                        native-type="submit"
                         class="AM-mt-3"
                         type="primary"
                         :disabled="form.processing || !isPasswordValid"
@@ -35,12 +50,11 @@
                     </elButton>
                 </div>
                 <div v-else>
-                    <strong class="">Email: {{ $store.state.auth?.user?.email }}</strong>
-                    <p v-text="`Your password has been updated.`" />
-                    <elButton
-                        type="primary"
-                        @click="handleButton"
+                    <strong class=""
+                        >Email: {{ $store.state.auth?.user?.email }}</strong
                     >
+                    <p v-text="`Your password has been updated.`" />
+                    <elButton type="primary" @click="handleButton">
                         Continue
                     </elButton>
                 </div>
@@ -58,17 +72,15 @@ export default {
             form: new Form(
                 {
                     email: this.$store.state.auth.user?.email,
-                    password: '',
-                    otp: true,
+                    password: "",
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             isPasswordValid: false,
         };
     },
 
     mounted() {
-
         this.$store.dispatch("getUser", {
             errors: this.$root.errors,
         });
@@ -79,7 +91,7 @@ export default {
             this.loading = true;
 
             try {
-                await this.form.put('/user/password');
+                await this.form.put("/user/password");
                 await this.login();
             } catch (e) {
                 this.$root.errors(e);
@@ -93,16 +105,15 @@ export default {
             try {
                 const res = await this.form.post("/login");
 
-                if(res['logged-in']){
-                    try{
+                if (res["logged-in"]) {
+                    try {
                         await this.$store.dispatch("logout", {
                             errors: this.$root.errors,
                         });
-                    } catch(e){}
+                    } catch (e) {}
 
                     await this.form.post("/login");
                 }
-
             } catch (e) {
                 this.$root.errors(e);
             } finally {
@@ -110,10 +121,8 @@ export default {
                 await this.postLogin();
             }
         },
-        
-        async postLogin() {
-            this.$store.commit("setAuth", true);
 
+        async postLogin() {
             const { data: user } = await this.$store.dispatch("getUser", {
                 errors: this.$root.errors,
             });
@@ -123,8 +132,8 @@ export default {
             this.isPasswordValid = isValid;
         },
         handleButton() {
-            this.$emit('close');
-        }
+            this.$emit("close");
+        },
     },
 
     metaInfo() {
@@ -134,9 +143,10 @@ export default {
     },
 
     components: {
-        VPasswordValidation: require("./../components/VPasswordValidation.vue").default,
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        VPasswordValidation: require("./../components/VPasswordValidation.vue")
+            .default,
+        elInput: require("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
 };
 </script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/forgot.vue

@@ -4,7 +4,8 @@
             <h1 class="h2 h2--small">Reset password</h1>
             <form class="form" @submit.prevent="submit">
                 <p class="AM-mt-2">
-                    Enter the email address associated with your account to continue.
+                    Enter the email address associated with your account to
+                    continue.
                 </p>
 
                 <el-input
@@ -20,8 +21,11 @@
                 />
 
                 <elButton
+                    native-type="submit"
                     type="primary"
-                    :disabled="form.processing || !form.email || form.email?.length < 5"
+                    :disabled="
+                        form.processing || !form.email || form.email?.length < 5
+                    "
                     :loading="form.processing"
                     @click="onSubmit"
                 >
@@ -31,7 +35,7 @@
                 <p class="disclaimer AM-mt-3">
                     <router-link
                         class="color-1 underline"
-                        :to="{ name: `${$store.state.auth.authBase}.login` }"
+                        :to="{ name: 'auth.login' }"
                     >
                         Back to Sign in
                     </router-link>
@@ -46,8 +50,8 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
 
     data: () => ({
@@ -55,7 +59,7 @@ export default {
             {
                 email: "",
             },
-            { resetOnSuccess: false }
+            { resetOnSuccess: false },
         ),
     }),
 
@@ -65,7 +69,7 @@ export default {
                 await this.form.post("/forgot-password");
 
                 this.$router.push({
-                    name: `${this.$store.state.auth.authBase}.success-forgot`,
+                    name: "auth.success-forgot",
                     query: { email: this.form.email },
                 });
             } catch (e) {

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/login.vue

@@ -37,8 +37,11 @@
         </div>
 
         <el-button
+            native-type="submit"
             type="primary"
-            :disabled="loading || (form.email?.length < 5 || form.password?.length < 8 )"
+            :disabled="
+                loading || form.email?.length < 5 || form.password?.length < 8
+            "
             @click="onSubmit"
         >
             Continue
@@ -46,11 +49,16 @@
 
         <p class="disclaimer AM-mt-3">
             Having trouble signing in?
-            <router-link class="color-1 underline" :to="{ name: `${$store.state.auth.authBase}.forgot` }">
+            <router-link
+                class="color-1 underline"
+                :to="{ name: 'auth.forgot' }"
+            >
                 Reset password
             </router-link>
             or
-            <a :href="contact" class="underline">Contact us</a>
+            <a :href="$store.state.auth.contact" class="underline"
+                >Contact us</a
+            >
         </p>
     </form>
 </template>
@@ -60,25 +68,24 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
     data() {
         return {
             form: new Form(
                 {
-                    email: this.$route.query.email ?? '',
-                    password: '',
+                    email: this.$route.query.email ?? "",
+                    password: "",
                     device_name: "Mobile device",
                     remember: true,
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             loading: false,
-            contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
         };
     },
-    
+
     methods: {
         async onSubmit() {
             if (this.loading) return;
@@ -107,8 +114,6 @@ export default {
         },
 
         async postLogin() {
-            this.$store.commit("setAuth", true);
-
             const { data: user } = await this.$store.dispatch("getUser", {
                 errors: this.$root.errors,
             });
@@ -120,9 +125,9 @@ export default {
             if (this.$store.state.auth.intended) {
                 this.$router.push(this.$store.state.auth.intended);
             } else {
-                this.$router.push({ name: this.$store.state.auth.postLoginRedirect });
-                // this.$router.push({ name: "members" });
-                // Problem here
+                this.$router.push({
+                    name: this.$store.state.auth.redirect,
+                });
             }
 
             this.$store.commit("setIntended", null);

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/logincallback.vue

@@ -1,26 +1,21 @@
 <template>
     <!-- Set Spinner -->
-     <div class="mx-auto">
+    <div class="mx-auto">
         <VLoader class="mx-auto" />
-     </div>
+    </div>
 </template>
 
 <script>
-
 export default {
     components: {
-        VLoader: require("../../layout/Loader.vue").default
+        VLoader: require("../../layout/Loader.vue").default,
     },
     data() {
-        return {
-
-        }
+        return {};
     },
-    
+
     methods: {
         async postLogin() {
-            this.$store.commit("setAuth", true);
-
             const { data: user } = await this.$store.dispatch("getUser", {
                 errors: this.$root.errors,
             });

package/_Build/vue/modules/AuthModule/routes/loginheadless.vue

@@ -0,0 +1,21 @@
+<template>
+    <!-- Set Spinner -->
+    <div class="mx-auto">
+        <VLoader class="mx-auto" />
+        <p v-text="`Logging in...`" />
+    </div>
+</template>
+
+<script>
+export default {
+    mounted() {
+        const { authenticated } = this.$store.getters;
+
+        if (!authenticated) {
+            window.location = `${process.env.APP_URL}/hydrate/sso/redirect`;
+        } else {
+            window.location = `${process.env.APP_URL}/`;
+        }
+    },
+};
+</script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/loginsso.vue

@@ -1,7 +1,7 @@
 <template>
     <template v-if="stage === 1">
         <h1 class="h2 h2--small">Sign in</h1>
-        <p class="AM-mb-3 AM-mt-2">Enter your email address to continue. </p>
+        <p class="AM-mb-3 AM-mt-2">Enter your email address to continue.</p>
 
         <form @submit.prevent="submit" class="form" id="memberLoginForm">
             <el-input
@@ -27,8 +27,9 @@
             </div>
 
             <el-button
+                native-type="submit"
                 type="primary"
-                :disabled="loading || (!isValidEmail(form.email))"
+                :disabled="loading || !isValidEmail(form.email)"
                 @click="onSubmit"
             >
                 Continue
@@ -36,13 +37,20 @@
 
             <p class="disclaimer AM-mt-3">
                 Having trouble signing in?
-                <a :href="contact" class="underline">Contact us</a>
+                <a :href="$store.state.auth.contact" class="underline"
+                    >Contact us</a
+                >
             </p>
         </form>
     </template>
     <template v-else>
         <h1 class="h2 h2--small">Sign in with SSO</h1>
-        <p class="AM-mt-2">Redirecting you to your organisation’s Single Sign-On (SSO) gateway <span class="AM-color-highlight">in {{ countdown }} seconds...</span></p>
+        <p class="AM-mt-2">
+            Redirecting you to your organisation’s Single Sign-On (SSO) gateway
+            <span class="AM-color-highlight"
+                >in {{ countdown }} seconds...</span
+            >
+        </p>
         <p class="disclaimer AM-mt-3">
             <a :href="redirect_url" class="underline">Go to SSO gateway</a>
         </p>
@@ -54,27 +62,26 @@ import Form from "form-backend-validation";
 
 export default {
     components: {
-        elInput: require('../../form/basic.vue').default,
-        elButton: require('../../basic/Button.vue').default,
+        elInput: require("../../form/basic.vue").default,
+        elButton: require("../../basic/Button.vue").default,
     },
     data() {
         return {
             form: new Form(
                 {
-                    email: '',
+                    email: "",
                     device_name: "Mobile device",
                     remember: true,
                 },
-                { resetOnSuccess: false }
+                { resetOnSuccess: false },
             ),
             countdown: 3,
             loading: false,
             redirect_url: null,
             stage: 1,
-            contact:  process.env.HYDRATE_CONTACT ?? 'mailto:EP@avalerehealth.com',
         };
     },
-    
+
     methods: {
         async onSubmit() {
             if (this.loading) return;
@@ -82,12 +89,15 @@ export default {
             this.loading = true;
 
             try {
-                const res = await this.form.post(`/sso`);
-                if(res['redirect_url']) {
-                    this.redirect_url = res['redirect_url'];
+                const res = await this.form.post(`/hydrate/sso/check`);
+                if (res["redirect_url"]) {
+                    this.redirect_url = res["redirect_url"];
                     this.setRedirect();
                 } else {
-                    this.$router.push({name: `${this.$store.state.auth.authBase}.logincreds`,query: {email: this.form.email}});
+                    this.$router.push({
+                        name: "auth.logincreds",
+                        query: { email: this.form.email },
+                    });
                 }
             } catch (e) {
                 this.$root.errors(e);
@@ -95,33 +105,30 @@ export default {
                 this.loading = false;
             }
         },
-        setRedirect(){
+        setRedirect() {
             this.stage = 2;
             let vue = this;
-            setTimeout(function() {
+            setTimeout(function () {
                 vue.setCountdown();
-            },1000);
+            }, 1000);
         },
         setCountdown() {
             this.countdown--;
-            if(this.countdown === 0) {
+            if (this.countdown === 0) {
                 window.location = this.redirect_url;
             } else {
                 let vue = this;
-                setTimeout(function() {
+                setTimeout(function () {
                     vue.setCountdown();
-                },1000);
+                }, 1000);
             }
         },
         isValidEmail(email) {
             const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
             return emailRegex.test(email);
-        }
-
+        },
     },
 
-    mounted() {
-        
-    },
+    mounted() {},
 };
 </script>

package/{AuthModule → _Build/vue/modules/AuthModule}/routes/logout.vue

@@ -6,16 +6,16 @@ export default {
         };
     },
 
-    mounted() {
+    async mounted() {
         try {
-            this.$store.dispatch("logout", {
+            await this.$store.dispatch("logout", {
                 errors: this.$root.errors,
             });
-        } catch(e){
-
+        } catch {
+            /* empty */
+        } finally {
+            this.$router.push({ name: "auth.login" });
         }
-
-        this.$router.push({ name: `${this.$store.state.auth.authBase}.login` });
     },
 };
 </script>