Merge branch 'dev' into WeeklyApiRefresh/202308081559

Author: peombwa

.azure-pipelines/ci-build.yml

@@ -27,7 +27,11 @@ trigger:
     include:
       - main
       - dev
-pr: none
+pr:
+  branches:
+    include:
+      - main
+      - dev
 
 jobs:
   - job: MsGraphPsSdkCiBuild

.azure-pipelines/generation-templates/workload-modules.yml

@@ -54,11 +54,17 @@ steps:
               $ModuleMapping.Keys | ForEach-Object {
                   $ModuleName = $_
                   $ModulePath = "$(System.DefaultWorkingDirectory)/src/$ModuleName/$ApiVersion"
-                  if (Test-Path $ModulePath) {
-                    $ModulePsd1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psd1" -Resolve
-                    $ModulePsm1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psm1" -Resolve
-                    ($ModulePsd1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
-                    ($ModulePsm1 | Get-AuthenticodeSignature).Status | Should -Be "Valid"
+                  $ModulePsd1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psd1"
+                  $ModulePsm1 = Join-Path $ModulePath "Microsoft.Graph*.$ModuleName.psm1"
+                  Write-Host "Validating Authenticode Signature for $ModulePsd1"
+                  Write-Host "Validating Authenticode Signature for $ModulePsm1"
+                  if ((Test-Path $ModulePsd1) -and (Test-Path $ModulePsm1)) {
+                    $ModulePsd1AuthCodeSignature = $ModulePsd1 | Get-AuthenticodeSignature
+                    $ModulePsm1AuthCodeSignature = $ModulePsm1 | Get-AuthenticodeSignature
+                    Write-Host "Authenticode Signature for $ModulePsd1 is $($ModulePsd1AuthCodeSignature.Status)"
+                    Write-Host "Authenticode Signature for $ModulePsm1 is $($ModulePsm1AuthCodeSignature.Status)"
+                    $ModulePsd1AuthCodeSignature.Status | Should -Be "Valid"
+                    $ModulePsm1AuthCodeSignature.Status | Should -Be "Valid"
                   }
               }
             }

.github/workflows/projectsbot.yml

@@ -1,4 +1,4 @@
-# This workflow is used to add new issues to GitHub Projects (Beta)
+# This workflow is used to add new issues to GitHub Projects 
 
 name: Add PR to project
 on:
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
         with:
           app_id: ${{ secrets.GRAPHBOT_APP_ID }}
           private_key: ${{ secrets.GRAPHBOT_APP_PEM }}
@@ -25,22 +25,27 @@ jobs:
           gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
-                projectNext(number: $number) {
+                projectV2(number: $number) {
                   id
                   fields(first:20) {
                     nodes {
-                      id
-                      name
-                      settings
+                      ... on ProjectV2SingleSelectField {
+                        id
+                        name
+                        options {
+                          id
+                          name
+                        }
+                      }
                     }
                   }
                 }
               }
             }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
 
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV
 
       - name: Add Issue to project
         env:
@@ -49,12 +54,12 @@ jobs:
         run: |
           item_id="$( gh api graphql -f query='
             mutation($project:ID!, $issue:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
+                item {
                   id
                 }
               }
-            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
           
           echo 'ITEM_ID='$item_id >> $GITHUB_ENV
 
@@ -69,13 +74,13 @@ jobs:
               $status_field: ID!
               $status_value: String!              
             ) {
-              set_status: updateProjectNextItemField(input: {
+              set_status: updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
                 fieldId: $status_field
-                value: $status_value
+                value: {singleSelectOptionId: $status_value} 
               }) {
-                projectNextItem {
+                projectV2Item {
                   id
                   }
               }

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
     }
 }