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

package/resource/yaml-schema/yaml.schema.json

@@ -14,7 +14,7 @@
     "version": {
       "type": "string",
       "description": "The version of the yaml file schema",
-      "const": "v1.9"
+      "const": "v1.10"
     },
     "additionalMetadata": {
       "type": "object",
@@ -81,7 +81,6 @@
           { "$ref": "#/definitions/apiKeyUpdate"},
           { "$ref": "#/definitions/oauthRegister"},
           { "$ref": "#/definitions/oauthUpdate"},
-          { "$ref": "#/definitions/shareToOthers"},
           { "$ref": "#/definitions/devChannelCreate"},
           { "$ref": "#/definitions/devChannelInstallApp"},
           { "$ref": "#/definitions/typeSpecCompile"}
@@ -1385,58 +1384,10 @@
             "appPackagePath": {
               "type": "string",
               "description": "path to app package"
-            }
-          }
-        },
-        "writeToEnvironmentFile": {
-          "type": "object",
-          "additionalProperties": false,
-          "description": "Write environment variables to environment file",
-          "required": ["titleId", "appId"],
-          "properties": {
-            "titleId": {
-              "description": "Required. The ID of M365 title.",
-              "$ref": "#/definitions/envVarName"
             },
-            "appId": {
-              "description": "Required. The app ID of M365 title.",
-              "$ref": "#/definitions/envVarName"
-            }
-          }
-        }
-      }
-    },
-    "shareToOthers": {
-      "type": "object",
-      "additionalProperties": false,
-      "description": "Share apps to others.",
-      "required": ["uses", "with"],
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "An optional name of this action."
-        },
-        "env": {
-          "type": "object",
-          "description": "Define environment variables for this action.",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "uses": {
-          "type": "string",
-          "description": "Share apps to others.",
-          "const": "teamsApp/shareToOthers"
-        },
-        "with": {
-          "type": "object",
-          "additionalProperties": false,
-          "description": "parameters for this action",
-          "required": ["appPackagePath"],
-          "properties": {
-            "appPackagePath": {
+            "scope": {
               "type": "string",
-              "description": "path to app package"
+              "description": "The scope of the app (only works for declarative agent). personal is only visible to the owners. shared can be visible to other users in the tenant. Default is personal"
             }
           }
         },
@@ -1444,7 +1395,7 @@
           "type": "object",
           "additionalProperties": false,
           "description": "Write environment variables to environment file",
-          "required": ["titleId", "appId", "shareLink"],
+          "required": ["titleId", "appId"],
           "properties": {
             "titleId": {
               "description": "Required. The ID of M365 title.",
@@ -1455,7 +1406,7 @@
               "$ref": "#/definitions/envVarName"
             },
             "shareLink": {
-              "description": "Required. The share link of the app.",
+              "description": "Optional. The share link of the app.",
               "$ref": "#/definitions/envVarName"
             }
           }

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;