@microsoft/teamsfx-core 3.0.5-alpha.e092ea0a6.0 → 3.0.5-alpha.e2e0fdf1c.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "3.0.5-alpha.e092ea0a6.0",
+  "version": "3.0.5-alpha.e2e0fdf1c.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -107,8 +107,8 @@
     "@microsoft/dev-tunnels-contracts": "1.1.9",
     "@microsoft/dev-tunnels-management": "1.1.9",
     "@microsoft/kiota": "1.26.1",
-    "@microsoft/m365-spec-parser": "^0.2.9-alpha.e092ea0a6.0",
-    "@microsoft/teamsfx-api": "0.23.9-alpha.e092ea0a6.0",
+    "@microsoft/m365-spec-parser": "^0.2.9-alpha.e2e0fdf1c.0",
+    "@microsoft/teamsfx-api": "0.23.9-alpha.e2e0fdf1c.0",
     "adm-zip": "^0.5.10",
     "ajv": "^8.5.0",
     "axios": "^1.8.3",
@@ -231,7 +231,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "b8351437d320da07286345328de693d772128075",
+  "gitHead": "e3a2ace37772f74633496d6313a22dd946751c48",
   "publishConfig": {
     "access": "public"
   },

package/resource/package.nls.json

@@ -64,15 +64,20 @@
   "core.collaboration.AccountUsedToCheck": "Account used to check: ",
   "core.collaboration.StartingListAllTeamsAppOwners": "\nStarting to list all app owners for environment: ",
   "core.collaboration.StartingListAllAadAppOwners": "\nStarting to list all Microsoft Entra app owners for environment: ",
+  "core.collaboration.StartingListAllAgentOwners": "\nStarting to list all agent owners for environment: ",
   "core.collaboration.M365TeamsAppId": "App (ID: ",
   "core.collaboration.SsoAadAppId": "SSO Microsoft Entra App (ID: ",
+  "core.collaboration.AgentTitleId": "Agent (ID: ",
   "core.collaboration.TeamsAppOwner": "App Owner: ",
   "core.collaboration.AadAppOwner": "Microsoft Entra App Owner: ",
+  "core.collaboration.AgentOwner": "Agent Owner: ",
   "core.collaboration.StaringCheckPermission": "Starting to check permission for environment: ",
   "core.collaboration.CheckPermissionResourceId": "Resource ID: ",
   "core.collaboration.Undefined": "undefined",
   "core.collaboration.ResourceName": ", Resource Name: ",
   "core.collaboration.Permission": ", Permission: ",
+  "core.collaboration.agent.label": "Agent",
+  "core.collaboration.agent.description": "Microsoft 365 Agent",
   "core.developerPortal.scaffold.CannotFindManifest": "Manifest not found from the downloaded package for app %s.",
   "plugins.spfx.questions.framework.title": "Framework",
   "plugins.spfx.questions.webpartName": "Name for SharePoint Framework Web Part",
@@ -641,7 +646,6 @@
   "core.common.ReceiveApiResponse": "Received API response: %s.",
   "core.common.shareWithTenant.success": "Agent successfully shared with tenant.",
   "core.common.shareWithUser.success": "Agent successfully shared with users: %s.",
-  "core.common.shareWithOwner.success": "Agent successfully shared with owners: %s.",
   "core.common.removeOwnership.success": "Shared agent ownership removed from the users: %s.",
   "core.common.removeShareAccess.success": "Shared access successfully removed from users: %s.",
   "core.envFunc.unsupportedFile.errorLog": "\"%s\" is an invalid file. Supported format: %s.",
@@ -702,11 +706,10 @@
   "core.share.removeAccess.operator": "Cannot remove permission of the operator. Email: %s.",
   "core.shareOperationQuestion.option.removeShareAccessFromUsers": "Remove access for selected user(s)",
   "core.shareOperationQuestion.option.shareWithUsers": "Share access with selected user(s)",
-  "core.shareOptionQuestion.option.shareWithOwners": "Share agent ownership with selected user(s)",
   "core.shareOptionQuestion.placeholder": "Select how to share the agent",
   "core.shareOptionQuestion.title": "Share the agent",
-  "core.shareOptionQuestion.unshare.emails.title": "Email addresses of users for agent access removal",
-  "core.shareScopeQuestion.emails.title": "Email addresses of users for agent sharing",
+  "core.shareOptionQuestion.unshare.emails.title": "Email addresses of users or groups for agent access removal",
+  "core.shareScopeQuestion.emails.title": "Email addresses of users or groups for agent sharing",
   "core.shareScopeQuestion.option.shareWithTenant": "Share the agent with all tenant users",
   "core.shareScopeQuestion.option.shareWithUsers": "Share the agent with selected user(s)",
   "core.shareScopeQuestion.placeholder": "Select a sharing scope",

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

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.ComponentModel.DataAnnotations;
+
+namespace {{YOUR_NAMESPACE}}.Configuration;
+
+/// <summary>
+/// Bot related authentication configuration.
+/// </summary>
+public class BotAuthenticationOptions
+{
+  /// <summary>
+  /// The client (application) ID of an App Registration in the tenant.
+  /// </summary>
+  [Required(ErrorMessage = "Client id is required")]
+  [RegularExpression(@"^[0-9A-Fa-f\-]{36}$")]
+  public string ClientId { get; set; }
+
+  /// <summary>
+  /// The client (application) Secret of an App Registration in the tenant.
+  /// </summary>
+  [Required(ErrorMessage = "Client secret is required")]
+  public string ClientSecret { get; set; }
+
+  /// <summary>
+  /// Authority URL that is used in OAuth On-behalf-of flow.
+  /// </summary>
+  [Required(ErrorMessage = "OAuth authority is required")]
+  [RegularExpression(@"^http(s)?://[-a-zA-Z0-9@:%._\+~#=/]{1,100}$")]
+  public string OAuthAuthority { get; set; }
+
+  /// <summary>
+  /// Application ID URI.
+  /// </summary>
+  [Required(ErrorMessage = "Application id uri is required")]
+  public string ApplicationIdUri { get; set; }
+
+  /// <summary>
+  /// Login authentication start page endpoint.
+  /// </summary>
+  [Required(ErrorMessage = "Login authentication start page endpoint is required")]
+  public string InitiateLoginEndpoint { get; set; }
+}

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

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.Identity.Client;
+
+namespace {{YOUR_NAMESPACE}}.SSO
+{
+  /// <summary>
+  /// Adapter of IConfidentialClientApplication On-behalf-of flow.
+  /// </summary>
+  public interface IIdentityClientAdapter
+  {
+    /// <summary>
+    /// Use On-behalf-of flow to exchange access token.
+    /// </summary>
+    /// <param name="ssoToken">token from Teams client</param>
+    /// <param name="scopes">required scopes</param>
+    /// <returns></returns>
+    Task<AuthenticationResult> GetAccessToken(string ssoToken, IEnumerable<string> scopes);
+  }
+}

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

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.Agents.Builder;
+using Microsoft.Agents.Extensions.Teams.Models;
+
+namespace {{YOUR_NAMESPACE}}.SSO
+{
+  /// <summary>
+  /// provides utility methods for interactions that occur within Microsoft Teams.
+  /// </summary>
+  public interface ITeamsInfo
+  {
+    /// <summary>
+    /// Gets the account of a single conversation member. 
+    /// This works in one-on-one, group, and teams scoped conversations.
+    /// </summary>
+    /// <param name="context"> Turn context. </param>
+    /// <param name="userId"> ID of the user in question. </param>
+    /// <param name="cancellationToken"> cancellation token. </param>
+    /// <returns>Team Account Details.</returns>
+    Task<TeamsChannelAccount> GetTeamsMemberAsync(ITurnContext context, string userId, CancellationToken cancellationToken = default);
+  }
+}

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

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.Identity.Client;
+
+namespace {{YOUR_NAMESPACE}}.SSO
+{
+  /// <summary>
+  /// Helper class used to simplify unit test.
+  /// https://stackoverflow.com/questions/65334284/how-to-mock-moq-iconfidentialclientapplication-which-has-sealed-setup-abstract
+  /// </summary>
+  internal class IdentityClientAdapter : IIdentityClientAdapter
+  {
+    private readonly IConfidentialClientApplication _confidentialClientApplication;
+
+    public IdentityClientAdapter(IConfidentialClientApplication confidentialClientApplication)
+    {
+      _confidentialClientApplication = confidentialClientApplication;
+    }
+
+    public async Task<AuthenticationResult> GetAccessToken(string ssoToken, IEnumerable<string> scopes)
+    {
+      var userAssertion = new UserAssertion(ssoToken);
+      return await _confidentialClientApplication
+          .AcquireTokenOnBehalfOf(scopes, userAssertion)
+          .ExecuteAsync()
+          .ConfigureAwait(false);
+    }
+  }
+}

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

@@ -1,9 +1,11 @@
-using Microsoft.Bot.Builder;
-using Microsoft.Bot.Builder.Dialogs;
-using Microsoft.Bot.Schema;
+using {{YOUR_NAMESPACE}}.Configuration;
+using Json.More;
+using Microsoft.Agents.Builder;
+using Microsoft.Agents.Builder.Dialogs;
+using Microsoft.Agents.Builder.State;
+using Microsoft.Agents.Core.Models;
+using Microsoft.Agents.Storage;
 using Microsoft.Extensions.Options;
-using Microsoft.TeamsFx.Bot;
-using Microsoft.TeamsFx.Configuration;
 
 namespace {{YOUR_NAMESPACE}}.SSO;
 
@@ -173,9 +175,10 @@ public class SsoDialog : ComponentDialog
 
     private async Task<bool> ShouldDedup(ITurnContext context)
     {
+        var tokenResponseObject = context.Activity.Value.ToJsonDocument();
         var storeItem = new StoreItem()
         {
-            eTag = (context.Activity.Value as dynamic).id,
+            eTag = tokenResponseObject.RootElement.GetProperty("id").ToString(),
         };
         var key = GetStorageKey(context);
         var storeItems = new Dictionary<string, object>()
@@ -209,13 +212,13 @@ public class SsoDialog : ComponentDialog
             throw new Exception("TokenExchangeState can only be used with Invokes of signin/tokenExchange.");
         }
 
-        var value = activity.Value;
-        if (value == null || (value as dynamic).id == null)
+        var value = activity.Value.ToJsonDocument();
+        if (value == null || value.RootElement.GetProperty("id").ToString() == null)
         {
             throw new Exception("Invalid signin/tokenExchange. Missing activity.value.id.");
         }
 
-        return $"{channelId}/{conversationId}/{(value as dynamic).id}";
+        return $"{channelId}/{conversationId}/{value.RootElement.GetProperty("id").ToString()}";
     }
 
     private string MatchCommands(string text)

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

@@ -1,7 +1,7 @@
-using Microsoft.Bot.Builder;
+using {{YOUR_NAMESPACE}}.Configuration;
+using Microsoft.Agents.Builder;
 using Microsoft.Graph;
 using Microsoft.Kiota.Abstractions.Authentication;
-using Microsoft.TeamsFx.Configuration;
 
 namespace {{YOUR_NAMESPACE}}.SSO;