Merge branch 'rc' into 'main'

refactor: move has trial plan marker from sessionStorage to route query

See merge request locker/web!242

Author: duchunter

src/renderer/components/pages/plans/PlansTable.vue

@@ -146,8 +146,7 @@ export default {
         path: '/',
         maxAge: 3600 * 24
       })
-      window.sessionStorage.setItem('keepTrialPlan', '1')
-      this.$router.push(this.localeRoute({ path: '/register' }))
+      this.$router.push(this.localeRoute({ path: '/register?hasPlan=1' }))
     },
     choosePlan (alias) {
       if (alias === 'pm_free') {

src/renderer/pages/plans-family-promotion.vue

@@ -375,9 +375,8 @@ export default {
       if (this.$store.state.isLoggedIn) {
         this.$router.replace(this.localePath('/manage-plans'))
       } else {
-        window.sessionStorage.setItem('keepTrialPlan', '1')
         this.$router.replace(
-          this.localePath('/register?utm_source=plans-family-promotion')
+          this.localePath('/register?utm_source=plans-family-promotion&hasPlan=1')
         )
       }
     }

src/renderer/pages/private-email.vue

@@ -300,8 +300,7 @@ export default {
         path: '/',
         maxAge: 3600 * 24
       })
-      window.sessionStorage.setItem('keepTrialPlan', '1')
-      this.$router.replace(this.localePath('/register'))
+      this.$router.replace(this.localePath('/register?hasPlan=1'))
     }
   }
 }

src/renderer/pages/promotion-1.vue

@@ -555,8 +555,7 @@ export default {
       if (this.$store.state.isLoggedIn) {
         this.$router.replace(this.localePath('/manage-plans'))
       } else {
-        window.sessionStorage.setItem('keepTrialPlan', '1')
-        this.$router.replace(this.localePath('/register?utm_source=plans-promotion'))
+        this.$router.replace(this.localePath('/register?utm_source=plans-promotion&hasPlan=1'))
       }
     },
     claimOffer () {

src/renderer/pages/promotion.vue

@@ -491,8 +491,7 @@ export default {
       if (this.$store.state.isLoggedIn) {
         this.$router.replace(this.localePath('/manage-plans'))
       } else {
-        window.sessionStorage.setItem('keepTrialPlan', '1')
-        this.$router.replace(this.localePath('/register?utm_source=plans-promotion'))
+        this.$router.replace(this.localePath('/register?utm_source=plans-promotion&hasPlan=1'))
       }
     },
     claimOffer () {

src/renderer/pages/register.vue

@@ -16,10 +16,7 @@ export default {
         domain: '.locker.io',
         path: '/'
       })
-    } else if (process.client && window?.sessionStorage?.getItem('keepTrialPlan')) {
-      // Keep the trial plan if needed
-      window.sessionStorage.removeItem('keepTrialPlan')
-    } else {
+    } else if (!route.query.hasPlan) {
       // Auto set plan to premium
       $cookies.set('trial_plan', 'pm_premium', {
         domain: '.locker.io',