Merge pull request #125 from NaturalSelectionLabs/feature/corss-domai…

…n-redirect Feature/corss domain redirect
NaturalSelectionLabs · Nov 24, 2021 · a271bac · a271bac
2 parents 6e14ee8 + 0f960c4
commit a271bac
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/src/views/Setup/Setup.vue b/src/views/Setup/Setup.vue
@@ -290,8 +290,13 @@ export default class Setup extends Vue {
 
     async initLoad() {
         if (!(await RSS3.reconnect())) {
-            sessionStorage.setItem('redirectFrom', this.$route.fullPath);
-            await this.$router.push('/');
+            if (config.subDomain.isSubDomainMode) {
+                // redirect back to root domain
+                window.location.host = config.subDomain.rootDomain;
+            } else {
+                sessionStorage.setItem('redirectFrom', this.$route.fullPath);
+                await this.$router.push('/');
+            }
         } else {
             this.rss3 = await RSS3.get();
         }

diff --git a/src/views/Setup/SetupAccounts.vue b/src/views/Setup/SetupAccounts.vue
@@ -418,8 +418,14 @@ export default class SetupAccounts extends Vue {
 
     async mounted() {
         if (!(await RSS3.reconnect())) {
-            sessionStorage.setItem('redirectFrom', this.$route.fullPath);
-            await this.$router.push('/');
+            if (config.subDomain.isSubDomainMode) {
+                // redirect back to root domain
+                window.location.host = config.subDomain.rootDomain;
+            } else {
+                sessionStorage.setItem('redirectFrom', this.$route.fullPath);
+                await this.$router.push('/');
+            }
+            return;
         }
         this.rss3 = await RSS3.get();
         if (sessionStorage.getItem('profile')) {

diff --git a/src/views/Setup/SetupFootprints.vue b/src/views/Setup/SetupFootprints.vue
@@ -186,8 +186,13 @@ export default class SetupFootprints extends Vue {
 
     async mounted() {
         if (!(await RSS3.reconnect())) {
-            sessionStorage.setItem('redirectFrom', this.$route.fullPath);
-            await this.$router.push('/');
+            if (config.subDomain.isSubDomainMode) {
+                // redirect back to root domain
+                window.location.host = config.subDomain.rootDomain;
+            } else {
+                sessionStorage.setItem('redirectFrom', this.$route.fullPath);
+                await this.$router.push('/');
+            }
             return;
         }
         this.rss3 = await RSS3.get();

diff --git a/src/views/Setup/SetupGitcoins.vue b/src/views/Setup/SetupGitcoins.vue
@@ -186,8 +186,13 @@ export default class SetupGitcoins extends Vue {
 
     async mounted() {
         if (!(await RSS3.reconnect())) {
-            sessionStorage.setItem('redirectFrom', this.$route.fullPath);
-            await this.$router.push('/');
+            if (config.subDomain.isSubDomainMode) {
+                // redirect back to root domain
+                window.location.host = config.subDomain.rootDomain;
+            } else {
+                sessionStorage.setItem('redirectFrom', this.$route.fullPath);
+                await this.$router.push('/');
+            }
             return;
         }
         this.rss3 = await RSS3.get();

diff --git a/src/views/Setup/SetupNFTs.vue b/src/views/Setup/SetupNFTs.vue
@@ -212,8 +212,13 @@ export default class SetupNFTs extends Vue {
 
     async mounted() {
         if (!(await RSS3.reconnect())) {
-            sessionStorage.setItem('redirectFrom', this.$route.fullPath);
-            await this.$router.push('/');
+            if (config.subDomain.isSubDomainMode) {
+                // redirect back to root domain
+                window.location.host = config.subDomain.rootDomain;
+            } else {
+                sessionStorage.setItem('redirectFrom', this.$route.fullPath);
+                await this.$router.push('/');
+            }
             return;
         }
         this.rss3 = await RSS3.get();