Support in-between version 2.2.3-2.2.4 for Microsoft Login Prompt

Author: Power-Maverick

CHANGELOG.md

@@ -16,8 +16,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 ### Commits
 
 -   Removed Keyboard bindings
+-   Support in-between version 2.2.3-2.2.4 for Microsoft Login Prompt
 -   first version of themed views completed [`c7757f9`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/c7757f9c92bb6b9b6a726033cb9536bf084e542d)
 -   webview ui toolkit removed and replaced with pure css [`b225952`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/b22595265cc38276a131b91932803fcbc804cc09)
+-   updated the logs [`d9140e1`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/d9140e1c76448033b30504a309a6a6cc22cd7526)
 -   Update version to v2.2.5 [`83dc3ea`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/83dc3ea2a3948153cbf4a34bd30df09c4b74a64d)
 -   Docs: Add @kkazala as a contributor [`17685bc`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/17685bcc7d90c77a0f10382d82a4de24aa499d58)
 -   Docs: Update @cyco77 as a contributor [`93572b3`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/93572b307db0db12650feffe38d956f812fbc6d9)

src/helpers/dataverseHelper.ts

@@ -63,9 +63,11 @@ export class DataverseHelper {
         try {
             if (conn) {
                 const tokenResponse = await this.connectInternal(conn.loginType, conn);
-                conn.currentAccessToken = tokenResponse.access_token!;
-                conn.refreshToken = tokenResponse.refresh_token!;
-                this.vsstate.saveInWorkspace(connectionCurrentStoreKey, conn);
+                if (tokenResponse) {
+                    conn.currentAccessToken = tokenResponse.access_token!;
+                    conn.refreshToken = tokenResponse.refresh_token!;
+                    this.vsstate.saveInWorkspace(connectionCurrentStoreKey, conn);
+                }
             }
         } catch (err) {
             throw err;
@@ -115,8 +117,9 @@ export class DataverseHelper {
                     });
                     progress.report({ increment: 0, message: "Connecting to environment..." });
                     const tokenResponse = await this.connectInternal(conn.loginType, conn);
-                    conn.currentAccessToken = tokenResponse.access_token!;
-                    if (tokenResponse.access_token) {
+
+                    if (tokenResponse && tokenResponse.access_token) {
+                        conn.currentAccessToken = tokenResponse.access_token!;
                         switch (conn.loginType) {
                             case LoginTypes.clientIdSecret:
                                 conn.userName = JSON.parse(Buffer.from(tokenResponse.access_token.split(".")[1], "base64").toString())?.appid;
@@ -128,8 +131,12 @@ export class DataverseHelper {
                                 conn.userName = JSON.parse(Buffer.from(tokenResponse.access_token.split(".")[1], "base64").toString())?.upn;
                                 break;
                         }
+                        conn.refreshToken = tokenResponse.refresh_token!;
+                    } else {
+                        vscode.window.showErrorMessage("Unable to connect to Dataverse. Please try again.");
+                        return undefined;
                     }
-                    conn.refreshToken = tokenResponse.refresh_token!;
+
                     progress.report({ increment: 10 });
                     this.vsstate.saveInWorkspace(connectionCurrentStoreKey, conn);
                     progress.report({ increment: 30, message: "Getting entity metadata..." });
@@ -409,6 +416,7 @@ export class DataverseHelper {
                     tokenResponse = await loginWithClientIdSecret(currentConnection.environmentUrl, currentConnection.userName!, currentConnection.password!, currentConnection.tenantId!);
                     break;
                 case LoginTypes.microsoftLogin:
+                case `${LoginTypes.microsoftLogin} (Recommended)`: // Support in-between version 2.2.3-2.2.4
                     tokenResponse = await loginWithMicrosoftPrompt(currentConnection.environmentUrl, openUri, redirectTimeout);
                     break;
                 // case LoginTypes.azure:
@@ -518,7 +526,7 @@ export class DataverseHelper {
         return conn;
     }
 
-    private async connectInternal(loginType: string, conn: IConnection): Promise<Token> {
+    private async connectInternal(loginType: string, conn: IConnection): Promise<Token | undefined> {
         switch (loginType) {
             case LoginTypes.userNamePassword:
                 return await loginWithUsernamePassword(conn.environmentUrl, conn.userName!, conn.password!);
@@ -527,9 +535,11 @@ export class DataverseHelper {
             // case LoginTypes.azure:
             //     return await loginWithAzure(conn.environmentUrl);
             case LoginTypes.microsoftLogin:
+            case `${LoginTypes.microsoftLogin} (Recommended)`: // Support in-between version 2.2.3-2.2.4
                 return await loginWithMicrosoftPrompt(conn.environmentUrl, openUri, redirectTimeout);
             default:
-                throw new Error(ErrorMessages.invalidLoginType);
+                vscode.window.showErrorMessage(ErrorMessages.invalidLoginType);
+                return undefined;
         }
     }