Merge pull request #2222 from subray2014/users/subray/enhanceTeamsRscConfigStates

Add support for new states in RSC configuration.

Author: peombwa

src/Teams/beta/custom/GetMgBetaChatRscConfiguration_Get.cs

@@ -237,6 +237,13 @@ protected override void ProcessRecord()
                 {
                     await ((Microsoft.Graph.Beta.PowerShell.Runtime.IEventListener)this).Signal(Microsoft.Graph.Beta.PowerShell.Runtime.Events.CmdletBeforeAPICall); if (((Microsoft.Graph.Beta.PowerShell.Runtime.IEventListener)this).Token.IsCancellationRequested) { return; }
 
+                    MGTeamsInternalPermissionGrantPolicyCollection permissionGrantPolicyCollection =
+                        await this.Client.GetPermissionGrantPolicies(selectQuery: "id, resourceScopeType", eventListener: this, sender: this.Pipeline);
+
+                    WriteVerbose($"Fetched permission grant policies for tenant.");
+
+                    if (((Microsoft.Graph.Beta.PowerShell.Runtime.IEventListener)this).Token.IsCancellationRequested) { return; }
+
                     // Get Teams App Settings
                     Models.IMicrosoftGraphTeamsAppSettings teamsAppSettings = await this.Client.GetTeamsAppSettings(this, Pipeline);
 
@@ -253,7 +260,11 @@ protected override void ProcessRecord()
 
                     RscConfigurationSynthesizer rscConfigurationConverter = new RscConfigurationSynthesizer();
                     Models.IMicrosoftGraphRscConfiguration microsoftGraphRscConfiguration =
-                        rscConfigurationConverter.ConvertToChatRscConfiguration(teamsAppSettings, authorizationPolicy, this);
+                        rscConfigurationConverter.ConvertToChatRscConfiguration(
+                            permissionGrantPolicyCollection: permissionGrantPolicyCollection,
+                            teamsAppSettings: teamsAppSettings,
+                            authorizationPolicy: authorizationPolicy,
+                            eventListener: this);
 
                     WriteObject(microsoftGraphRscConfiguration);
 

src/Teams/beta/custom/GetMgBetaTeamRscConfiguration_Get.cs

@@ -237,6 +237,11 @@ protected override void ProcessRecord()
                 {
                     await ((Microsoft.Graph.Beta.PowerShell.Runtime.IEventListener)this).Signal(Microsoft.Graph.Beta.PowerShell.Runtime.Events.CmdletBeforeAPICall); if (((Microsoft.Graph.Beta.PowerShell.Runtime.IEventListener)this).Token.IsCancellationRequested) { return; }
 
+                    MGTeamsInternalPermissionGrantPolicyCollection permissionGrantPolicyCollection =
+                        await this.Client.GetPermissionGrantPolicies(selectQuery: "id, resourceScopeType", eventListener: this, sender: this.Pipeline);
+
+                    WriteVerbose($"Fetched permission grant policies for tenant.");
+
                     // Get Group consent settings
                     MGTeamsInternalTenantConsentSettingsCollection tenantConsentSettingCollection = await this.Client.GetTenantConsentSettings(this, Pipeline);
 
@@ -252,8 +257,11 @@ protected override void ProcessRecord()
                     if (((Microsoft.Graph.Beta.PowerShell.Runtime.IEventListener)this).Token.IsCancellationRequested) { return; }
 
                     RscConfigurationSynthesizer rscConfigurationConverter = new RscConfigurationSynthesizer();
-                    Models.IMicrosoftGraphRscConfiguration microsoftGraphRscConfiguration =
-                        rscConfigurationConverter.ConvertToTeamRscConfiguration(tenantConsentSettingCollection, authorizationPolicy, this);
+                    Models.IMicrosoftGraphRscConfiguration microsoftGraphRscConfiguration = rscConfigurationConverter.ConvertToTeamRscConfiguration(
+                        permissionGrantPolicyCollection,
+                        tenantConsentSettingCollection,
+                        authorizationPolicy,
+                        this);
 
                     WriteObject(microsoftGraphRscConfiguration);
 

src/Teams/beta/custom/HttpRequests/GetPermissionGrantPolicyCollectionRequest.cs

@@ -0,0 +1,58 @@
+using System.Text;
+
+namespace Microsoft.Graph.Beta.PowerShell.TeamsInternal.Requests
+{
+    /// <summary>
+    /// Request to get all permission grant policies in the tenant.
+    /// </summary>
+    internal class GetPermissionGrantPolicyCollectionRequest : TeamsHttpRequest
+    {
+        /// <summary>
+        /// Select query.
+        /// </summary>
+        private readonly string selectQuery;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GetPermissionGrantPolicyCollectionRequest"/> class.
+        /// </summary>
+        /// <param name="servicePrincipalId">The service principal Id.</param>
+        internal GetPermissionGrantPolicyCollectionRequest(string selectQuery)
+        {
+            this.selectQuery = selectQuery;
+        }
+
+        /// <summary>
+        /// Gets the Http method for the request.
+        /// </summary>
+        /// <returns>The http method.</returns>
+        protected override System.Net.Http.HttpMethod GetHttpMethod()
+        {
+            return Runtime.Method.Get;
+        }
+
+        /// <summary>
+        /// Gets the base url for the request.
+        /// </summary>
+        /// <returns>string containing the base url.</returns>
+        protected override string GetBaseUrl()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("https://graph.microsoft.com/beta/policies/permissiongrantpolicies");
+            if (this.selectQuery != null)
+            {
+                sb.Append($"?$select={this.selectQuery}");
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Gets the body of the request as a string.
+        /// </summary>
+        /// <returns>The body.</returns>
+        protected override string GetBodyAsString()
+        {
+            return null;
+        }
+    }
+}

src/Teams/beta/custom/MicrosoftGraphRscConfigurationState.cs

@@ -21,6 +21,16 @@ public enum MicrosoftGraphRscConfigurationState
         /// <summary>
         /// Enabled for all apps.
         /// </summary>
-        EnabledForAllApps
+        EnabledForAllApps,
+
+        /// <summary>
+        /// Enabled for selected group of users.
+        /// </summary>
+        EnabledForSelectedGroupOfUsers,
+
+        /// <summary>
+        /// Custom configuration not understood by the sdk.
+        /// </summary>
+        Custom
     }
 }