Merge pull request #8980 from OfficeDev/fix/dev-tunnel-token

fix: convert token fail return empty object (#8809)
OfficeDev · Jun 9, 2023 · 5798c86 · 5798c86
2 parents 4ea9bbf + a1061da
commit 5798c86
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/packages/vscode-extension/src/commonlib/codeFlowLogin.ts b/packages/vscode-extension/src/commonlib/codeFlowLogin.ts
@@ -523,10 +523,15 @@ export function UserCancelError(source: string): UserError {
   });
 }
 
+// if connot convert token via base64, return empty object
 export function ConvertTokenToJson(token: string): object {
-  const array = token.split(".");
-  const buff = Buffer.from(array[1], "base64");
-  return JSON.parse(buff.toString(UTF8));
+  try {
+    const array = token.split(".");
+    const buff = Buffer.from(array[1], "base64");
+    return JSON.parse(buff.toString(UTF8));
+  } catch (e) {
+    return {};
+  }
 }
 
 export async function checkIsOnline(): Promise<boolean> {

diff --git a/packages/vscode-extension/src/commonlib/m365Login.ts b/packages/vscode-extension/src/commonlib/m365Login.ts
@@ -270,6 +270,21 @@ export class M365Login extends BasicLogin implements M365TokenProvider {
       );
       if (tokenRes.isOk()) {
         const tokenJson = ConvertTokenToJson(tokenRes.value);
+        // if token is empty, try to get token by app studio scope, normally this should only affect UX
+        if (Object.keys(tokenJson).length === 0) {
+          const appStudioRes = await M365Login.codeFlowInstance.getTokenByScopes(
+            AppStudioScopes,
+            false
+          );
+          if (appStudioRes.isOk()) {
+            const appStudioJson = ConvertTokenToJson(appStudioRes.value);
+            return ok({
+              status: signedIn,
+              token: appStudioRes.value,
+              accountInfo: appStudioJson as any,
+            });
+          }
+        }
         return ok({ status: signedIn, token: tokenRes.value, accountInfo: tokenJson as any });
       } else {
         if (