Implemented: support to login the user using the token and oms found in query params

package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@hotwax/dxp-components": "^1.11.0",
-    "@hotwax/oms-api": "^1.9.0",
+    "@hotwax/oms-api": "^1.13.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",
     "@ionic/vue-router": "^7.6.0",

src/router/index.ts

@@ -6,7 +6,7 @@ import { useAuthStore } from "@/store/auth";
 
 const loginGuard = (to: any, from: any, next: any) => {
   const authStore = useAuthStore()
-  if (authStore.isAuthenticated && !to.query?.redirectUrl) {
+  if (authStore.isAuthenticated && !to.query?.redirectUrl && !to.query?.oms) {
     next('/home')
   }
   next();

src/store/auth.ts

@@ -28,7 +28,7 @@
     getBaseUrl: (state) => {
       let baseURL = process.env.VUE_APP_BASE_URL
       if (!baseURL) baseURL = state.oms
-      return baseURL.startsWith('http') ? baseURL : `https://${baseURL}.hotwax.io/api/`
+      return baseURL.startsWith('http') ? baseURL.includes('/api') ? baseURL : `${baseURL}/api/` : `https://${baseURL}.hotwax.io/api/`
     },
     getRedirectUrl: (state) => state.redirectUrl,
   },
@@ -45,7 +45,7 @@
         const resp = await UserService.login(username, password);
         if (hasError(resp)) {
           showToast(translate('Sorry, your username or password is incorrect. Please try again.'));
           console.error("error", resp.data._ERROR_MESSAGE_);
           return Promise.reject(new Error(resp.data._ERROR_MESSAGE_));
         }
 
@@ -65,7 +65,7 @@
         // If any of the API call in try block has status code other than 2xx it will be handled in common catch block.
         // TODO Check if handling of specific status codes is required.
         showToast(translate('Something went wrong while login. Please contact administrator.'));
         console.error("error: ", error);
         return Promise.reject(new Error(error))
       }
     },
@@ -82,7 +82,7 @@
         // If any of the API call in try block has status code other than 2xx it will be handled in common catch block.
         // TODO Check if handling of specific status codes is required.
         showToast(translate('Something went wrong while login. Please contact administrator.'));
         console.error("error: ", error);
         return Promise.reject(new Error(error))
       }
     },
@@ -102,6 +102,16 @@
       }
       this.redirectUrl = ''
       updateToken('');
+    },
+    async setToken(token: any, expirationTime: any) {
+      this.token = {
+        value: token,
+        expiration: expirationTime
+      }
+      updateToken(token)
+    },
+    async setCurrent(current: any) {
+      this.current = current
     }
   },
   persist: true

src/views/Login.vue

@@ -113,8 +113,19 @@
     async initialise() {
       this.hideBackground = true
       await this.presentLoader("Processing");
-      // SAML login handling as only token will be returned in the query
-      if (this.$route.query?.token) {
+
+      // Run the basic login flow when oms and token both are found in query
+      if (this.$route.query?.oms && this.$route.query?.token) {
+        // if a session is already active, present alert
+        if (this.authStore.isAuthenticated) {
+          await this.confirmActvSessnLoginOnRedrct(true)
+        } else {
+          await this.basicLogin()
+          this.dismissLoader();
+          return;
+        }
+      } else if (this.$route.query?.token) {
+        // SAML login handling as only token will be returned in the query when login through SAML
         await this.samlLogin()
         this.dismissLoader();
         return
@@ -221,7 +232,7 @@
           this.loginOption = resp.data
         }
       } catch (error) {
         console.error(error)
       }
     },
     async login() {
@@ -242,7 +253,7 @@
           this.router.push('/')
         }
       } catch (error) {
         console.error(error)
       }
     },
     async samlLogin() {
@@ -255,10 +266,27 @@
           this.router.push('/')
         }
       } catch (error) {
         console.error(error)
       }
     },
-    async confirmActvSessnLoginOnRedrct() {
+    async basicLogin() {
+      try {
+        const { oms, token, expirationTime } = this.$route.query as any
+        await this.authStore.setOMS(oms);
+
+        // Setting token previous to getting user-profile, if not then the client method honors the state token
+        await this.authStore.setToken(token, expirationTime)
+
+        const current = await UserService.getUserProfile(token);
+        await this.authStore.setCurrent(current)
+      } catch (error) {
+        showToast(translate('Failed to fetch user-profile, please try again'));
+        console.error("error: ", error);
+      }
+      this.router.push('/')
+    },
+    // Pass redirect as true when you want to remove all the url params when user clicks on login
+    async confirmActvSessnLoginOnRedrct(redirect = false) {
       this.isConfirmingForActiveSession = true
       const alert = await alertController
         .create({
@@ -269,7 +297,11 @@
           buttons: [{
             text: translate('Resume'),
             handler: () => {
-              window.location.href = `${this.authStore.getRedirectUrl}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`
+              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 {
+                this.router.push('/')
+              }
               this.isConfirmingForActiveSession = false;
             }
           }, {
@@ -279,6 +311,11 @@
               await this.authStore.logout()
               this.authStore.setRedirectUrl(redirectUrl)
               this.isConfirmingForActiveSession = false;
+
+              if(redirect) {
+                this.basicLogin()
+                return;
+              }
             }
           }]
         });