Implemented: support for maarg login in ofbiz apps (preorder-299)

.env.example

@@ -5,4 +5,5 @@ VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
 VUE_APP_DEFAULT_ALIAS=
 VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount"]
-VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
+VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
+VUE_APP_MAARG_LOGIN_REQUIRED=["preorder"]

src/util/index.ts

@@ -16,4 +16,10 @@ const isMaargLogin = (handle: string, environment = "") => {
   return maargLoginApps.some((appName: string) => appHandle.includes(appName))
 }
 
-export { isMaargLogin, showToast }
+const isMaargLoginRequired = (handle: string, environment = "") => {
+  const appHandle = environment ? handle + environment : handle
+  const maargOmsRequiredApps = JSON.parse(process.env.VUE_APP_MAARG_LOGIN_REQUIRED ? process.env.VUE_APP_MAARG_LOGIN_REQUIRED : [])
+  return maargOmsRequiredApps.some((appName: string) => appHandle.includes(appName))
+}
+
+export { isMaargLogin, isMaargLoginRequired, showToast }

src/views/Home.vue

@@ -95,7 +95,7 @@ import {
 import { useAuthStore } from '@/store/auth';
 import { useRouter } from "vue-router";
 import { goToOms } from '@hotwax/dxp-components'
-import { isMaargLogin } from '@/util';
+import { isMaargLogin, isMaargLoginRequired } from '@/util';
 import { translate } from '@/i18n';
 import UserActionsPopover from '@/components/UserActionsPopover.vue'
 import Image from "@/components/Image.vue";
@@ -144,7 +144,7 @@ export default defineComponent({
     },
     generateAppLink(app: any, appEnvironment = '') {
       const oms = isMaargLogin(app.handle, appEnvironment) ? this.authStore.getMaargOms : this.authStore.getOMS;
-      window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle, appEnvironment) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
+      window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle, appEnvironment) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getOMS : isMaargLoginRequired(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getMaargOms : ''}` : '')
     },
     async openUserActionsPopover(event: any) {
       const userActionsPopover = await popoverController.create({
@@ -251,6 +251,7 @@ export default defineComponent({
       domain,
       goToOms,
       isMaargLogin,
+      isMaargLoginRequired,
       lockClosedOutline,
       hardwareChipOutline,
       openOutline,

src/views/Login.vue

@@ -76,7 +76,7 @@
 import { arrowForwardOutline, gridOutline } from 'ionicons/icons'
 import { UserService } from "@/services/UserService";
 import { translate } from "@/i18n";
-import { isMaargLogin, showToast } from "@/util";
+import { isMaargLogin, isMaargLoginRequired, showToast } from "@/util";
 import { hasError } from "@hotwax/oms-api";
 
 export default defineComponent({
@@ -241,7 +241,7 @@
           await this.authStore.setMaargInstance(resp.data.maargInstanceUrl)
         }
       } catch (error) {
         console.error(error)
       }
     },
     async login() {
@@ -263,7 +263,7 @@
           this.router.push('/')
         }
       } catch (error) {
         console.error(error)
       }
       this.isLoggingIn = false;
     },
@@ -278,7 +278,7 @@
         }
       } catch (error) {
         this.router.push('/')
         console.error(error)
       }
     },
     async basicLogin() {
@@ -304,17 +304,23 @@
     },
     generateRedirectionLink() {
       let omsUrl = ''
+      let omsRedirectionUrl = ''
       if(isMaargLogin(this.authStore.getRedirectUrl)) {
         if(this.authStore.getMaargOms) omsUrl = this.authStore.getMaargOms
         else {
           showToast(translate("This application is not enabled for your account"))
           this.router.push("/")
           return;
         }
+        omsRedirectionUrl = this.authStore.oms
+      }
+
+      if(isMaargLoginRequired(this.authStore.getRedirectUrl) && this.authStore.getMaargOms) {
+        omsRedirectionUrl = this.authStore.getMaargOms
       }
 
       omsUrl = omsUrl ? omsUrl : this.authStore.oms.startsWith('http') ? this.authStore.oms.includes('/api') ? this.authStore.oms : `${this.authStore.oms}/api/` : this.authStore.oms
-      window.location.replace(`${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(this.authStore.getRedirectUrl) ? '&omsRedirectionUrl=' + this.authStore.oms : ''}`)
+      window.location.replace(`${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${omsRedirectionUrl ? '&omsRedirectionUrl=' + omsRedirectionUrl : ''}`)
     }
   },
   setup () {