feat: login info change (#250)

* feat: login info change * feat: click LearnMore and popup again * feat: fix button name * feat: fix pr comment Co-authored-by: tianyuan <[email protected]>
OfficeDev · Apr 14, 2021 · 158ddb3 · 158ddb3
1 parent 5fecbb4
commit 158ddb3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/packages/vscode-extension/src/commonlib/appStudioLogin.ts b/packages/vscode-extension/src/commonlib/appStudioLogin.ts
@@ -126,13 +126,24 @@ export class AppStudioLogin extends login implements AppStudioTokenProvider {
   }
 
   private async doesUserConfirmLogin(): Promise<boolean> {
-    const warningMsg = "Please sign into your M365 account";
+    const warningMsg = "The Teams Toolkit requires a Microsoft 365 account. This is the account that you use to log in to Microsoft Teams. The Teams Toolkit will publish your application using this Microsoft 365 account.\nYou can quickly get started by using a developer account from the M365 Developer Program.";
     const confirm = "Confirm";
-    const userSelected: string | undefined = await vscode.window.showWarningMessage(
+    const learnMore = "Learn More";
+    let userSelected: string | undefined = await vscode.window.showWarningMessage(
       warningMsg,
       { modal: true },
-      confirm
+      confirm,
+      learnMore
     );
+    do {
+      vscode.env.openExternal(vscode.Uri.parse("https://developer.microsoft.com/en-us/microsoft-365/dev-program"));
+      userSelected = await vscode.window.showWarningMessage(
+        warningMsg,
+        { modal: true },
+        confirm,
+        learnMore
+      );
+    } while (userSelected === learnMore);
     return Promise.resolve(userSelected === confirm);
   }
 

diff --git a/packages/vscode-extension/src/commonlib/azureLogin.ts b/packages/vscode-extension/src/commonlib/azureLogin.ts
@@ -180,7 +180,7 @@ export class AzureAccountManager extends login implements AzureAccountProvider {
   }
 
   private async doesUserConfirmLogin(): Promise<boolean> {
-    const warningMsg = "Please sign into your Azure account";
+    const warningMsg = "The Teams Toolkit requires an Azure account and subscription to deploy Azure resources for your application.";
     const confirm = "Confirm";
     const userSelected: string | undefined = await vscode.window.showWarningMessage(
       warningMsg,