From 66df285245bc30d34501adaceb608786358ea4f6 Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Thu, 19 Jun 2025 17:26:58 -0400
Subject: [PATCH] Improvements

---
 cli/packages/models/cli.go                                  | 2 +-
 frontend/src/components/utilities/attemptCliLogin.ts        | 6 ++++--
 frontend/src/components/utilities/attemptCliLoginMfa.ts     | 6 ++++--
 .../auth/LoginPage/components/PasswordStep/PasswordStep.tsx | 6 ++++--
 frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx  | 3 ++-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/cli/packages/models/cli.go b/cli/packages/models/cli.go
index 4785d81f1..9a3ff85b2 100644
--- a/cli/packages/models/cli.go
+++ b/cli/packages/models/cli.go
@@ -5,7 +5,7 @@ import "time"
 type UserCredentials struct {
 	Email        string `json:"email"`
 	PrivateKey   string `json:"privateKey"`
-	JWTToken     string `json:"JTWToken"`
+	JWTToken     string `json:"JWTToken"`
 	RefreshToken string `json:"refreshToken"`
 }
 
diff --git a/frontend/src/components/utilities/attemptCliLogin.ts b/frontend/src/components/utilities/attemptCliLogin.ts
index d897ebeaa..f677bc5ed 100644
--- a/frontend/src/components/utilities/attemptCliLogin.ts
+++ b/frontend/src/components/utilities/attemptCliLogin.ts
@@ -16,7 +16,8 @@ export interface IsCliLoginSuccessful {
   loginResponse?: {
     email: string;
     privateKey: string;
-    JTWToken: string;
+    JWTToken: string;
+    JTWToken: string; // CLI Versions 0.41.85 and below expect "JTWToken"
   };
   success: boolean;
 }
@@ -131,7 +132,8 @@ const attemptLogin = async ({
               loginResponse: {
                 email,
                 privateKey,
-                JTWToken: token
+                JWTToken: token,
+                JTWToken: token // CLI Versions 0.41.85 and below expect "JTWToken"
               },
               success: true
             });
diff --git a/frontend/src/components/utilities/attemptCliLoginMfa.ts b/frontend/src/components/utilities/attemptCliLoginMfa.ts
index 14a61d817..348c5f942 100644
--- a/frontend/src/components/utilities/attemptCliLoginMfa.ts
+++ b/frontend/src/components/utilities/attemptCliLoginMfa.ts
@@ -14,7 +14,8 @@ interface IsMfaLoginSuccessful {
   success: boolean;
   loginResponse: {
     privateKey: string;
-    JTWToken: string;
+    JWTToken: string;
+    JTWToken: string; // CLI Versions 0.41.85 and below expect "JTWToken"
   };
 }
 
@@ -95,7 +96,8 @@ const attemptLoginMfa = async ({
             success: true,
             loginResponse: {
               privateKey,
-              JTWToken: token
+              JWTToken: token,
+              JTWToken: token // CLI Versions 0.41.85 and below expect "JTWToken"
             }
           });
         } catch (err) {
diff --git a/frontend/src/pages/auth/LoginPage/components/PasswordStep/PasswordStep.tsx b/frontend/src/pages/auth/LoginPage/components/PasswordStep/PasswordStep.tsx
index ee8e334bf..74d4e6509 100644
--- a/frontend/src/pages/auth/LoginPage/components/PasswordStep/PasswordStep.tsx
+++ b/frontend/src/pages/auth/LoginPage/components/PasswordStep/PasswordStep.tsx
@@ -96,7 +96,8 @@ export const PasswordStep = ({
             const payload = {
               privateKey,
               email,
-              JTWToken: token,
+              JWTToken: token,
+              JTWToken: token, // CLI Versions 0.41.85 and below expect "JTWToken"
               refreshToken
             };
             await instance.post(cliUrl, payload).catch(() => {
@@ -209,7 +210,8 @@ export const PasswordStep = ({
               const instance = axios.create();
               const payload = {
                 ...isCliLoginSuccessful.loginResponse,
-                JTWToken: token,
+                JWTToken: token,
+                JTWToken: token, // CLI Versions 0.41.85 and below expect "JTWToken"
                 refreshToken
               };
               await instance.post(cliUrl, payload).catch(() => {
diff --git a/frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx b/frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx
index 014b4b1dd..9cd13a6cc 100644
--- a/frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx
+++ b/frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx
@@ -149,7 +149,8 @@ export const SelectOrganizationSection = () => {
         }
 
         const payload = {
-          JTWToken: token,
+          JWTToken: token,
+          JTWToken: token, // CLI Versions 0.41.85 and below expect "JTWToken"
           email: user?.email,
           privateKey,
           refreshToken