@microsoft/teamsfx-core 2.0.0-alpha.2a6e2f57a.0 → 2.0.0-alpha.34e31d6eb.0

package/templates/core/v3Migration/csharp.app.yml

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://developer.microsoft.com/json-schemas/teams-toolkit/teamsapp-yaml/1.0.0/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.0.0/yaml.schema.json
 # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
 # Visit https://aka.ms/teamsfx-actions for details on actions
 version: 1.0.0
@@ -75,30 +75,39 @@ deploy:
 {{#if activePlugins.fx-resource-bot}}
   {{#if isFunctionBot}}
   # Deploy your application to Azure Functions using the zip deploy feature.
-  # For additional details, please refer to https://aka.ms/zip-deploy-to-azure-functions
+  # For additional details, see at https://aka.ms/zip-deploy-to-azure-functions
   - uses: azureFunctions/zipDeploy
     with:
       # deploy base folder
       artifactFolder: bin/Release/net6.0/win-x86/publish
-      # The resource id of the cloud resource to be deployed to. This key will be generated by arm/deploy action automatically. You can replace it with your existing Azure Resource id or add it to your environment variable file.
+      # The resource id of the cloud resource to be deployed to. 
+      # This key will be generated by arm/deploy action automatically. 
+      # You can replace it with your existing Azure Resource id 
+      # or add it to your environment variable file.
       resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-bot.functionAppResourceId]~}} }}
   {{else}}
   # Deploy your application to Azure App Service using the zip deploy feature.
-  # For additional details, please refer to https://aka.ms/zip-deploy-to-app-services.
+  # For additional details, refer to https://aka.ms/zip-deploy-to-app-services.
   - uses: azureAppService/zipDeploy
     with:
       # deploy base folder
       artifactFolder: bin/Release/net6.0/win-x86/publish
-      # The resource id of the cloud resource to be deployed to. This key will be generated by arm/deploy action automatically. You can replace it with your existing Azure Resource id or add it to your environment variable file.
+      # The resource id of the cloud resource to be deployed to. 
+      # This key will be generated by arm/deploy action automatically. 
+      # You can replace it with your existing Azure Resource id 
+      # or add it to your environment variable file.
       resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-bot.resourceId]~}} }}
   {{/if}}
 {{else if activePlugins.fx-resource-frontend-hosting}}
   # Deploy your application to Azure App Service using the zip deploy feature.
-  # For additional details, please refer to https://aka.ms/zip-deploy-to-app-services.
+  # For additional details, refer to https://aka.ms/zip-deploy-to-app-services.
   - uses: azureAppService/zipDeploy
     with:
       # deploy base folder
       artifactFolder: bin/Release/net6.0/win-x86/publish
-      # The resource id of the cloud resource to be deployed to. This key will be generated by arm/deploy action automatically. You can replace it with your existing Azure Resource id or add it to your environment variable file.
+      # The resource id of the cloud resource to be deployed to. 
+      # This key will be generated by arm/deploy action automatically. 
+      # You can replace it with your existing Azure Resource id 
+      # or add it to your environment variable file.
       resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-frontend-hosting.resourceId]~}} }}
 {{/if}}

package/templates/core/v3Migration/js.ts.app.local.yml

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://developer.microsoft.com/json-schemas/teams-toolkit/teamsapp-yaml/1.0.0/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.0.0/yaml.schema.json
 # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
 # Visit https://aka.ms/teamsfx-actions for details on actions
 version: 1.0.0
@@ -39,7 +39,8 @@ provision:
       botId: BOT_ID
       botPassword: SECRET_BOT_PASSWORD
 
-  - uses: botFramework/create # Create or update the bot registration on dev.botframework.com
+  # Create or update the bot registration on dev.botframework.com
+  - uses: botFramework/create
     with:
       botId: $\{{BOT_ID}}
       name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-bot
@@ -150,7 +151,8 @@ deploy:
 
   {{/dotnetCommand}}
   {{#tab}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./tabs/.env.teamsfx.local
       envs:
@@ -162,7 +164,8 @@ deploy:
 
   {{/tab}}
   {{#if bot}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./bot/.env.teamsfx.local
       envs:
@@ -171,7 +174,8 @@ deploy:
 
   {{/if}}
   {{#ssoTab}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./tabs/.env.teamsfx.local
       envs:
@@ -184,7 +188,8 @@ deploy:
 
   {{/ssoTab}}
   {{#if ssoBot}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./bot/.env.teamsfx.local
       envs:
@@ -204,7 +209,8 @@ deploy:
 
   {{/if}}
   {{#if ssoFunction}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./api/.env.teamsfx.local
       envs:
@@ -216,7 +222,8 @@ deploy:
 
   {{/if}}
   {{#npmCommands}}
-  - uses: cli/runNpmCommand # Run npm command
+  # Run npm command
+  - uses: cli/runNpmCommand
     with:
       args: {{args}}
       {{#if workingDirectory}}
@@ -225,7 +232,8 @@ deploy:
 
   {{/npmCommands}}
   {{#frontendStart}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./tabs/.localConfigs
       envs:
@@ -246,7 +254,8 @@ deploy:
 
   {{/frontendStart}}
   {{#authStart}}
-  - uses: file/createOrUpdateJsonFile # Generate runtime environment variables
+  # Generate runtime appsettings to JSON file
+  - uses: file/createOrUpdateJsonFile
     with:
       target: {{appsettingsPath}}
       appsettings:
@@ -261,7 +270,8 @@ deploy:
 
   {{/authStart}}
   {{#botStart}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./bot/.localConfigs
       envs:
@@ -285,7 +295,8 @@ deploy:
 
   {{/botStart}}
   {{#if backendStart}}
-  - uses: file/createOrUpdateEnvironmentFile # Generate runtime environment variables
+  # Generate runtime environment variables
+  - uses: file/createOrUpdateEnvironmentFile
     with:
       target: ./api/.localConfigs
       envs:

package/templates/core/v3Migration/js.ts.app.yml

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://developer.microsoft.com/json-schemas/teams-toolkit/teamsapp-yaml/1.0.0/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.0.0/yaml.schema.json
 # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
 # Visit https://aka.ms/teamsfx-actions for details on actions
 version: 1.0.0
@@ -89,12 +89,14 @@ provision:
 # Triggered when 'teamsfx deploy' is executed
 deploy:
 {{#if activePlugins.fx-resource-frontend-hosting}}
-  - uses: cli/runNpmCommand # Run npm command
+  # Run npm command
+  - uses: cli/runNpmCommand
     name: install tab dependencies
     with:
       workingDirectory: tabs
       args: install
-  - uses: cli/runNpmCommand # Run npm command
+  # Run npm command
+  - uses: cli/runNpmCommand
     name: build tab app
     {{#if activePlugins.fx-resource-aad-app-for-teams}}
     env:
@@ -114,7 +116,10 @@ deploy:
       workingDirectory: tabs
       # Deploy base folder. This folder includes manifest files for AAD app and Teams app that should be ignored using the ignoreFile.
       artifactFolder: build
-      # The resource id of the cloud resource to be deployed to. This key will be generated by arm/deploy action automatically. You can replace it with your existing Azure Resource id or add it to your environment variable file.
+      # The resource id of the cloud resource to be deployed to. 
+      # This key will be generated by arm/deploy action automatically. 
+      # You can replace it with your existing Azure Resource id 
+      # or add it to your environment variable file.
       resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-frontend-hosting.storageResourceId]~}} }}
 {{/if}}
 {{#if activePlugins.fx-resource-bot}}
@@ -132,37 +137,45 @@ deploy:
       args: run build --if-present
     {{/if}}
   # Deploy your application to Azure Functions using the zip deploy feature.
-  # For additional details, please refer to https://aka.ms/zip-deploy-to-azure-functions
+  # For additional details, see at https://aka.ms/zip-deploy-to-azure-functions
   - uses: azureFunctions/zipDeploy
     with:
       workingDirectory: bot
       # Deploy base folder
       artifactFolder: .
-      # Can be changed to any ignore file location, leave blank will ignore nothing
+      # Ignore file location, leave blank will ignore nothing
       ignoreFile: .funcignore
-      # The resource id of the cloud resource to be deployed to. This key will be generated by arm/deploy action automatically. You can replace it with your existing Azure Resource id or add it to your environment variable file.
+      # The resource id of the cloud resource to be deployed to. 
+      # This key will be generated by arm/deploy action automatically. 
+      # You can replace it with your existing Azure Resource id 
+      # or add it to your environment variable file.
       resourceId: $\{{ {{~botResourceId~}} }}
   {{else}}
-  - uses: cli/runNpmCommand # Run npm command
+  # Run npm command
+  - uses: cli/runNpmCommand
     name: install bot dependencies
     with:
       workingDirectory: bot
       args: install
     {{#if isTypescript}}
-  - uses: cli/runNpmCommand # Run npm command
+  # Run npm command
+  - uses: cli/runNpmCommand
     name: build bot app
     with:
       workingDirectory: bot
       args: run build --if-present
     {{/if}}
   # Deploy your application to Azure App Service using the zip deploy feature.
-  # For additional details, please refer to https://aka.ms/zip-deploy-to-app-services.
+  # For additional details, refer to https://aka.ms/zip-deploy-to-app-services.
   - uses: azureAppService/zipDeploy
     with:
       workingDirectory: bot
       # Deploy base folder.
       artifactFolder: .
-      # The resource id of the cloud resource to be deployed to. This key will be generated by arm/deploy action automatically. You can replace it with your existing Azure Resource id or add it to your environment variable file.
+      # The resource id of the cloud resource to be deployed to. 
+      # This key will be generated by arm/deploy action automatically. 
+      # You can replace it with your existing Azure Resource id 
+      # or add it to your environment variable file.
       resourceId: $\{{ {{~botResourceId~}} }}
   {{/if}}
 {{/if}}
@@ -193,15 +206,18 @@ deploy:
       args: run build --if-present
     {{/if}}
   # Deploy your application to Azure Functions using the zip deploy feature.
-  # For additional details, please refer to https://aka.ms/zip-deploy-to-azure-functions
+  # For additional details, see at https://aka.ms/zip-deploy-to-azure-functions
   - uses: azureFunctions/zipDeploy
     with:
       workingDirectory: api
       # Deploy base folder
       artifactFolder: .
-      # Can be changed to any ignore file location, leave blank will ignore nothing
+      # Ignore file location, leave blank will ignore nothing
       ignoreFile: .funcignore
-      # The resource id of the cloud resource to be deployed to. This key will be generated by arm/deploy action automatically. You can replace it with your existing Azure Resource id or add it to your environment variable file.
+      # The resource id of the cloud resource to be deployed to. 
+      # This key will be generated by arm/deploy action automatically. 
+      # You can replace it with your existing Azure Resource id 
+      # or add it to your environment variable file.
       resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-function.functionAppResourceId]~}} }}
 {{/if}}
 

package/templates/core/v3Migration/spfx.app.yml

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://developer.microsoft.com/json-schemas/teams-toolkit/teamsapp-yaml/1.0.0/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.0.0/yaml.schema.json
 # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
 # Visit https://aka.ms/teamsfx-actions for details on actions
 version: 1.0.0

package/templates/plugins/resource/aad/auth/V3/Bot/SSO/SsoOperations.cs

@@ -1,22 +1,37 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Graph;
+using Microsoft.Kiota.Abstractions.Authentication;
 using Microsoft.TeamsFx.Configuration;
 
 namespace {{YOUR_NAMESPACE}}.SSO;
 
+public class TokenProvider : IAccessTokenProvider
+{
+  private string token { get; set; }
+
+  public TokenProvider(String token)
+  {
+    this.token = token;
+  }
+
+  public Task<string> GetAuthorizationTokenAsync(Uri uri, Dictionary<string, object> additionalAuthenticationContext = default,
+      CancellationToken cancellationToken = default)
+  {
+    // get the token and return it
+    return Task.FromResult(this.token);
+  }
+
+  public AllowedHostsValidator AllowedHostsValidator { get; }
+}
+
 public static class SsoOperations
 {
     public static async Task ShowUserInfo(ITurnContext stepContext, string token, BotAuthenticationOptions botAuthOptions)
     {
         await stepContext.SendActivityAsync("Retrieving user information from Microsoft Graph ...");
-        var authProvider = new DelegateAuthenticationProvider((request) =>
-        {
-            request.Headers.Authorization =
-                new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
-            return Task.CompletedTask;
-        });
-        var graphClient = new GraphServiceClient(authProvider);
-        var profile = await graphClient.Me.Request().GetAsync();
+        var tokenCredential = new BaseBearerTokenAuthenticationProvider(new TokenProvider(token));
+        var graphClient = new GraphServiceClient(tokenCredential);
+        var profile = await graphClient.Me.GetAsync();
         await stepContext.SendActivityAsync($"You're logged in as {profile.DisplayName}");
     }
 }

package/templates/plugins/resource/aad/auth/V3/Tab/GetUserProfile.razor

@@ -1,6 +1,7 @@
 @using System.IO
 @using Azure.Core
 @using Microsoft.Graph
+@using Microsoft.Graph.Models
 @inject TeamsFx teamsfx
 @inject TeamsUserCredential teamsUserCredential
 
@@ -45,7 +46,7 @@
         IsLoading = true;
         var graph = GetGraphServiceClient();
 
-        Profile = await graph.Me.Request().GetAsync();
+        Profile = await graph.Me.GetAsync();
 
         IsLoading = false;
         ErrorMessage = string.Empty;