From 33c20a71aa25efae1cca78636737a3be2b4184fd Mon Sep 17 00:00:00 2001
From: Prakash Choudhary <34452139+prakashchoudhary07@users.noreply.github.com>
Date: Mon, 26 Aug 2024 23:42:50 +0530
Subject: [PATCH] Discord-RDS linking fix (#609)

* chore: fix spelling mistake

* Fixed condition check for linking account
---
 app/routes/discord.js     |  2 +-
 app/templates/discord.hbs | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/routes/discord.js b/app/routes/discord.js
index 86579bca..1b126fa0 100644
--- a/app/routes/discord.js
+++ b/app/routes/discord.js
@@ -44,7 +44,7 @@ export default class DiscordRoute extends Route {
           toastNotificationTimeoutOptions
         );
 
-        return { isTokenEpired: true };
+        return { isTokenExpired: true };
       }
     } catch (error) {
       this.toast.error(error.message, '', toastNotificationTimeoutOptions);
diff --git a/app/templates/discord.hbs b/app/templates/discord.hbs
index ef1fb62b..5fc79e27 100644
--- a/app/templates/discord.hbs
+++ b/app/templates/discord.hbs
@@ -10,7 +10,19 @@
         <Spinner />
       </div>
     {{else}}
-      {{#if (and @model.userData.discordId (eq @model.userData.roles.archived false))}}
+      {{! Added (eq @model.userData.roles.archived false) check for temporary,
+          For users who have left RDS before and are rejoining again now
+          This
+          TODO: 1. fix (eq @model.userData.roles.archived false) after deprecating archived role
+                2. Remove this check and get a flow in place for users who had left RDS previously and are coming back now
+                3. fix @model.userData.discordId check, which was removed, get a proper solution in place
+          }}
+      {{#if
+        (or
+          (eq @model.userData.roles.archived false)
+          (eq this.linkStatus 'linked')
+        )
+      }}
         <div class='discord__success'>
           <p class='success__text'>Your Discord account has been successfully
             linked.</p>
@@ -20,7 +32,7 @@
         <div class='discord__error'>
           <p class='error__text'>Something went wrong. Please try again.</p>
         </div>
-      {{else}}
+      {{else if (eq this.linkStatus 'not-linked')}}
         <header class='header horizontal-flex w-100' data-test-header>
           <img
             src='RDSLogo.png'