Merge pull request #635 from Real-Dev-Squad/develop

Dev to Main Sync

Author: iamitprakash

app/constants/url.js

@@ -23,5 +23,9 @@ export const REDIRECT_URLS = {
   notifications: `${MAIN_SITE_PREFIX}/notifications?dev=true`,
   identity: `${MAIN_SITE_PREFIX}/identity?dev=true`,
   mobile: `${MAIN_SITE_PREFIX}/mobile?dev=true`,
-  // TODO: add other links after finishing their testing on main site
+  'new-signup': `${MAIN_SITE_PREFIX}/new-signup?dev=true`,
+  discord: `${MAIN_SITE_PREFIX}/discord?dev=true`,
+  // TODO: add link for the '/tasks` pas as well but on status site
+  // rishi should be doing this
+  // ticket link:
 };

app/controllers/goto.js

@@ -5,11 +5,15 @@ import { MAIN_SITE_PREFIX, REDIRECT_URLS } from '../constants/url';
 import { REDIRECTION_TIME } from '../constants/redirection-time';
 export default class GotoController extends Controller {
   @service router;
-  queryParams = ['from'];
+  queryParams = ['from', 'token'];
 
   @action
   redirectToAppropriatePage() {
-    const redirectUrl = REDIRECT_URLS[this.from];
+    let redirectUrl = REDIRECT_URLS[this.from];
+    if (this.token) {
+      const separator = redirectUrl.includes('?') ? '&' : '?';
+      redirectUrl = `${redirectUrl}${separator}token=${this.token}`;
+    }
 
     setTimeout(() => {
       window.location.href = redirectUrl ?? MAIN_SITE_PREFIX;

app/routes/discord.js

@@ -8,6 +8,14 @@ export default class DiscordRoute extends Route {
   @service router;
   @service toast;
 
+  beforeModel() {
+    this.router.transitionTo('goto', {
+      queryParams: {
+        from: this.routeName,
+        token: this.paramsFor('discord').token,
+      },
+    });
+  }
   queryParams = {
     token: { refreshModel: true },
   };

app/routes/new-signup.js

@@ -9,6 +9,13 @@ export default class NewSignupRoute extends Route {
   @service analytics;
   @service toast;
   @service featureFlag;
+  @service router;
+
+  beforeModel() {
+    this.router.transitionTo('goto', {
+      queryParams: { from: this.routeName },
+    });
+  }
 
   async model() {
     try {