refactor: add login error category

OfficeDev · Apr 28, 2024 · 71595c5 · 71595c5
1 parent 8d76945
commit 71595c5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/packages/fx-core/src/error/index.ts b/packages/fx-core/src/error/index.ts
@@ -10,3 +10,4 @@ export * from "./m365";
 export * from "./script";
 export * from "./upgrade";
 export * from "./yml";
+export * from "./types";
diff --git a/packages/vscode-extension/src/commonlib/codeFlowLogin.ts b/packages/vscode-extension/src/commonlib/codeFlowLogin.ts
@@ -44,6 +44,7 @@ import { env, Uri } from "vscode";
 import { randomBytes } from "crypto";
 import { getExchangeCode } from "./exchangeCode";
 import * as os from "os";
+import { ErrorCategory } from "@microsoft/teamsfx-core";
 interface Deferred<T> {
   resolve: (result: T | Promise<T>) => void;
   reject: (reason: any) => void;
@@ -177,14 +178,14 @@ export class CodeFlowLogin {
       } else {
         this.status = loggedOut;
       }
-      deferredRedirect.reject(
-        new UserError(
-          getDefaultString("teamstoolkit.codeFlowLogin.loginComponent"),
-          getDefaultString("teamstoolkit.codeFlowLogin.loginTimeoutTitle"),
-          getDefaultString("teamstoolkit.codeFlowLogin.loginTimeoutDescription"),
-          localize("teamstoolkit.codeFlowLogin.loginTimeoutDescription")
-        )
+      const err = new UserError(
+        getDefaultString("teamstoolkit.codeFlowLogin.loginComponent"),
+        getDefaultString("teamstoolkit.codeFlowLogin.loginTimeoutTitle"),
+        getDefaultString("teamstoolkit.codeFlowLogin.loginTimeoutDescription"),
+        localize("teamstoolkit.codeFlowLogin.loginTimeoutDescription")
       );
+      err.categories = [ErrorCategory.Internal];
+      deferredRedirect.reject(err);
     }, 5 * 60 * 1000); // keep the same as azure login
 
     function cancelCodeTimer() {

diff --git a/packages/vscode-extension/src/debug/prerequisitesHandler.ts b/packages/vscode-extension/src/debug/prerequisitesHandler.ts
@@ -61,6 +61,7 @@ import { vscodeTelemetry } from "./depsChecker/vscodeTelemetry";
 import { localTelemetryReporter } from "./localTelemetryReporter";
 import { ProgressHelper } from "./progressHelper";
 import { allRunningTeamsfxTasks, terminateAllRunningTeamsfxTasks } from "./teamsfxTaskHandler";
+import { ErrorCategory } from "@microsoft/teamsfx-core";
 
 enum Checker {
   M365Account = "Microsoft 365 Account",
@@ -411,13 +412,13 @@ function ensureM365Account(
       }
       if (token === undefined) {
         // corner case but need to handle
-        return err(
-          new SystemError(
-            ExtensionSource,
-            ExtensionErrors.PrerequisitesNoM365AccountError,
-            "No Microsoft 365 account login"
-          )
+        const e = new SystemError(
+          ExtensionSource,
+          ExtensionErrors.PrerequisitesNoM365AccountError,
+          "No Microsoft 365 account login"
         );
+        e.categories = [ErrorCategory.Internal];
+        return err(e);
       }
       const loginHint = typeof upn === "string" ? upn : undefined;
       const tenantId = typeof tid === "string" ? tid : undefined;