Merge branch 'rc' into 'main'

fix: go to new vault in iframe mode See merge request locker/web!214
lockerpm · Aug 6, 2024 · b52c4d8 · b52c4d8
2 parents dc6d663 + e68666b
commit b52c4d8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/src/renderer/components/landing/Header.vue b/src/renderer/components/landing/Header.vue
@@ -43,7 +43,7 @@
         </a>
 
         <template v-if="showMyVaultBtn">
-          <a href="https://passwords.locker.io" class="landing-btn">My Vault</a>
+          <a href="#" class="landing-btn" @click.prevent="goToVault">My Vault</a>
         </template>
         <template v-else>
           <nuxt-link
@@ -135,7 +135,7 @@
 
             <template v-if="showMyVaultBtn">
               <li class="sm:hidden">
-                <a href="https://passwords.locker.io" class="inline-block nav-item text-black landing-transition">My Vault</a>
+                <a href="#" class="inline-block nav-item text-black landing-transition" @click.prevent="goToVault">My Vault</a>
               </li>
             </template>
             <template v-else>

diff --git a/src/renderer/components/landing/whitepaper/Header.vue b/src/renderer/components/landing/whitepaper/Header.vue
@@ -30,7 +30,7 @@
       <!-- Right actions -->
       <div class="hidden sm:flex lg:ml-16 lg:mr-0 ml-auto mr-6 lg:order-4 order-2">
         <template v-if="showMyVaultBtn">
-          <a href="https://passwords.locker.io" class="landing-btn">My Vault</a>
+          <a href="#" class="landing-btn" @click.prevent="goToVault">My Vault</a>
         </template>
         <template v-else>
           <nuxt-link
@@ -87,7 +87,7 @@
           </div>
           <template v-if="showMyVaultBtn">
             <li class="sm:hidden">
-              <a href="https://passwords.locker.io" class="inline-block nav-item text-black landing-transition">My Vault</a>
+              <a href="#" class="inline-block nav-item text-black landing-transition" @click.prevent="goToVault">My Vault</a>
             </li>
           </template>
           <template v-else>

diff --git a/src/renderer/components/pages/promo/PaymentDialog.vue b/src/renderer/components/pages/promo/PaymentDialog.vue
@@ -293,8 +293,7 @@ export default {
     },
 
     goToLogin () {
-      // this.$router.push(this.localeRoute({ path: '/vault' }))
-      window.location = 'https://passwords.locker.io'
+      this.goToVault()
     },
 
     async handleAddCardDone ({ tokenId, country }) {

diff --git a/src/renderer/pages/business/confirmation/_token.vue b/src/renderer/pages/business/confirmation/_token.vue
@@ -112,8 +112,7 @@ export default {
   methods: {
     async goNext () {
       clearInterval(this.intervalTimer)
-      // this.$router.push(this.localePath('/vault'))
-      window.location = 'https://passwords.locker.io'
+      this.goToVault()
     },
     backHome () {
       this.$router.push(this.localePath('/business/register'))

diff --git a/src/renderer/pages/lifetime/index.vue b/src/renderer/pages/lifetime/index.vue
@@ -497,8 +497,7 @@ export default {
     },
 
     goToLogin () {
-      // this.$router.push(this.localePath('/vault'))
-      window.location = 'https://passwords.locker.io'
+      this.goToVault()
     },
 
     calcPrice: debounce(function () {

diff --git a/src/renderer/pages/thankyou.vue b/src/renderer/pages/thankyou.vue
@@ -93,12 +93,6 @@ export default {
   },
   beforeDestroy () {
     clearInterval(this.countdown)
-  },
-  methods: {
-    goToVault () {
-      // this.$router.push(this.localeRoute('/vault'))
-      window.location = 'https://passwords.locker.io'
-    }
   }
 }
 </script>

diff --git a/src/renderer/plugins/mixins/utils.js b/src/renderer/plugins/mixins/utils.js
@@ -59,6 +59,23 @@ Vue.mixin({
           domain
         )
       })
+    },
+
+    goToVault () {
+      let isIframe = false
+      try {
+        if (window) {
+          isIframe = !!window.sessionStorage.getItem('isIframe')
+        }
+      } catch (error) {
+        isIframe = this.$route.query.mode === 'iframe'
+      }
+      const vaultUrl = `https://passwords.locker.io?lang=${this.locale}`
+      if (isIframe) {
+        this.postIframeMessage('external', vaultUrl)
+      } else {
+        window.location = vaultUrl
+      }
     }
   }
 })