Improved: support to not let user move around launchpad until passwor…

…d is not changed(hotwax#63)

src/router/index.ts

@@ -21,6 +21,14 @@ const authGuard = async (to: any, from: any, next: any) => {
   next()
 };
 
+const resetGuard = async (to: any, from: any, next: any) => {
+  const authStore = useAuthStore()
+  if (authStore.requirePasswordChange) {
+    next('/resetPassword')
+  }
+  next()
+};
+
 const routes: Array<RouteRecordRaw> = [
   {
     path: '/',
@@ -30,6 +38,7 @@ const routes: Array<RouteRecordRaw> = [
     path: '/home',
     name: 'Home',
     component: Home,
+    beforeEnter: resetGuard
   },
   {
     path: '/login',

src/store/auth.ts

@@ -13,7 +13,8 @@ export const useAuthStore = defineStore('authStore', {
       value: '',
       expiration: undefined
     },
-    redirectUrl: ''
+    redirectUrl: '',
+    requirePasswordChange: false // denotes if password change is required for the user
   }),
   getters: {
     isAuthenticated: (state) => {
@@ -41,7 +42,6 @@ export const useAuthStore = defineStore('authStore', {
       this.redirectUrl = redirectUrl
     },
     async login(username: string, password: string) {
-      let requirePasswordChange = false;  // denotes if password change is required for the user
       try {
         const resp = await UserService.login(username, password);
         if (hasError(resp)) {
@@ -55,7 +55,7 @@ export const useAuthStore = defineStore('authStore', {
           expiration: resp.data.expirationTime
         }
 
-        requirePasswordChange = resp.data.requirePasswordChange
+        this.requirePasswordChange = resp.data.requirePasswordChange
 
         this.current = await UserService.getUserProfile(this.token.value);
         updateToken(this.token.value)
@@ -71,8 +71,6 @@ export const useAuthStore = defineStore('authStore', {
         console.error("error: ", error);
         return Promise.reject(new Error(error))
       }
-
-      return requirePasswordChange;
     },
     async samlLogin(token: string, expirationTime: string) {
       try {

src/views/Login.vue

@@ -235,10 +235,10 @@ export default defineComponent({
       }
 
       try {
-        const requirePasswordChange = await this.authStore.login(username.trim(), password)
+        await this.authStore.login(username.trim(), password)
 
         // when password needs to be changed, redirecting the user to reset page
-        if(requirePasswordChange) {
+        if(this.authStore.requirePasswordChange) {
           this.username = ''
           this.password = ''
           this.router.push('/resetPassword');

src/views/ResetPassword.vue

@@ -15,7 +15,7 @@
             </ion-item>
             <ion-item lines="none">
               <ion-label position="fixed">{{ $t("Confirm Password") }}</ion-label>
-              <ion-input @ionFocus="passwordMatchError = false" name="confirmPassword" v-model="confirmPassword" id="confirmPassword" :type="showConfirmPassword ? 'text' : 'password'" error-text="Please enter password" />
+              <ion-input @ionFocus="passwordMatchError = false" name="confirmPassword" v-model="confirmPassword" id="confirmPassword" :type="showConfirmPassword ? 'text' : 'password'"/>
               <ion-button fill="clear" @click="showConfirmPassword = !showConfirmPassword">
                 <ion-icon :icon="showConfirmPassword ? eyeOutline : eyeOffOutline"/>
               </ion-button>
@@ -118,6 +118,8 @@ export default defineComponent({
         const resp = await UserService.resetPassword(params);
 
         if(!hasError(resp) && resp?.data?.successMessage) {
+          // once password is changed, resetting the value to false
+          this.authStore.requirePasswordChange = false;
           if (this.authStore.getRedirectUrl) {
             window.location.href = `${this.authStore.getRedirectUrl}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`
           } else {