chore: update vs m365 getStatus (#5313)

Author: xiaolang124

.azure-pipelines/CredScanSuppressions.json

@@ -36,6 +36,10 @@
         {
             "placeholder": "crypto_025d3c0a85c31e192ff0d8b8d0c9f44e3d5044fa95e642ce6c46d8ee5c4e2ad6b90c3ab385589e7c0d52862898efea47433586f4a14c9f899a7769b3ec73eff372161bbe4b98eb8ba928d58a4ad942bfc880585fe0de737c2f3e5d1a0509e844a4adaf55fa8dd0ecd1e6b3f52dc9812cf6bebb0e",
             "_justification": "This is the secret place holder used by TeamsFx project."
+        },
+        {
+            "placeholder": "user!",
+            "_justification": "This is the secret place holder used by TeamsFx project."
         }
     ]
 }

packages/server/src/apis.ts

@@ -163,37 +163,16 @@ export const RequestTypes = {
       `${Namespaces.Azure}/getSelectedSubscriptionRequest`
     ),
   },
-  [Namespaces.Graph]: {
-    getAccessToken: new RequestType0<Result<string, FxError>, Error>(
-      `${Namespaces.Graph}/getAccessTokenRequest`
-    ),
-    getJsonObject: new RequestType0<Result<string, FxError>, Error>(
-      `${Namespaces.Graph}/getJsonObjectRequest`
-    ),
-  },
-  [Namespaces.AppStudio]: {
-    getAccessToken: new RequestType0<Result<string, FxError>, Error>(
-      `${Namespaces.AppStudio}/getAccessTokenRequest`
-    ),
-    getJsonObject: new RequestType0<Result<string, FxError>, Error>(
-      `${Namespaces.AppStudio}/getJsonObjectRequest`
-    ),
-  },
-  [Namespaces.SharePoint]: {
-    getAccessToken: new RequestType0<Result<string, FxError>, Error>(
-      `${Namespaces.SharePoint}/getAccessTokenRequest`
-    ),
-    getJsonObject: new RequestType0<Result<string, FxError>, Error>(
-      `${Namespaces.SharePoint}/getJsonObjectRequest`
-    ),
-  },
   [Namespaces.M365]: {
     getAccessToken: new RequestType1<TokenRequest, Result<string, FxError>, Error>(
       `${Namespaces.M365}/getAccessTokenRequest`
     ),
     getJsonObject: new RequestType1<TokenRequest, Result<string, FxError>, Error>(
       `${Namespaces.M365}/getJsonObjectRequest`
     ),
+    getStatus: new RequestType1<TokenRequest, Result<LoginStatus, FxError>, Error>(
+      `${Namespaces.M365}/getStatusRequest`
+    ),
   },
 
   /**

packages/server/src/providers/token/m365.ts

@@ -46,17 +46,12 @@ export default class ServerM365TokenProvider implements M365TokenProvider {
   }
 
   async getStatus(tokenRequest: TokenRequest): Promise<Result<LoginStatus, FxError>> {
-    const promise = this.connection.sendRequest(RequestTypes.m365.getAccessToken, tokenRequest);
+    const promise = this.connection.sendRequest(RequestTypes.m365.getStatus, tokenRequest);
     const result = await getResponseWithErrorHandling(promise);
     if (result.isErr()) {
       return err(result.error);
     }
-    const jsonPromise = this.connection.sendRequest(RequestTypes.m365.getJsonObject, tokenRequest);
-    const jsonResult = await getResponseWithErrorHandling(jsonPromise);
-    if (jsonResult.isErr()) {
-      return err(jsonResult.error);
-    }
-    return ok({ status: signedIn, token: result.value, accountInfo: JSON.parse(jsonResult.value) });
+    return ok(result.value);
   }
 
   async signout(): Promise<boolean> {