Merge pull request #666 from pkbullock/main

Sample update
pnp · Feb 28, 2024 · fbe3b48 · fbe3b48
2 parents f9bbe00 + 78c5f1d
commit fbe3b48
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 13 deletions.
diff --git a/scripts/spo-dev-tenant-report-export/README.md b/scripts/spo-dev-tenant-report-export/README.md
@@ -369,12 +369,27 @@ process {
     #----------------------------------------------------------------------------
     Write-Host "Checking for Azure AD Apps" -ForegroundColor Cyan
    
-    Write-Host " - Reporting Azure AD Apps" -ForegroundColor Yellow
+    Write-Host " - Reporting Azure AD Apps and permissions" -ForegroundColor Yellow
     $azureADApps = Get-PnPAzureADApp
-    $azureADApps | Export-Csv -Path "$outputFolder\azure-ad-apps.csv" -NoTypeInformation
-    
+    $azureADAppPermission = Get-PnPAzureADAppPermission
+
+    # Delete existing site app catalog report
+    if (Test-Path "$outputFolder\azure-ad-apps.csv") {
+        Remove-Item "$outputFolder\azure-ad-apps.csv"
+    }
 
-    Write-Host "Checking for Azure AD App with SharePoint Permissions" -ForegroundColor Cyan
+    $azureADApps | ForEach-Object {
+        $app = $_
+        $perm = $azureADAppPermission | Where-Object {$_.AppId -eq $app.AppId }
+
+        $reportApps = $app | Select-Object Id,DisplayName,AppId,SignInAudience,IsFallbackPublicClient,`
+        @{Name='RequiredResourceAccess'; Expression={ $_.RequiredResourceAccess | ConvertTo-Json -Depth 4 }},`
+        @{Name='PublicClient'; Expression={$_.PublicClient | ForEach-Object { $_.RedirectUris }}}, `
+        @{Name='MicrosoftGraph'; Expression={ $perm | Select-Object -ExpandProperty MicrosoftGraph | ForEach-Object { $_ }}},`
+        @{Name='SharePoint'; Expression={ $perm | Select-Object -ExpandProperty SharePoint | ForEach-Object { $_ }}}
+
+        $reportApps | Export-Csv -Path "$outputFolder\azure-ad-apps.csv" -NoTypeInformation -Append
+    }
 
     #----------------------------------------------------------------------------
     # Process Teams apps

diff --git a/scripts/spo-dev-tenant-report-export/assets/sample.json b/scripts/spo-dev-tenant-report-export/assets/sample.json
@@ -9,15 +9,14 @@
       ""
     ],
     "creationDateTime": "2024-02-25",
-    "updateDateTime": "2024-02-25",
+    "updateDateTime": "2024-02-28",
     "products": [
       "SharePoint",
       "Office",
       "Graph",
       "PowerApps",
       "Teams",
       "Power Automate",
-      "Microsoft Todo",
       "Azure"
     ],
     "metadata": [
@@ -27,16 +26,28 @@
       }
     ],
     "categories": [
-      "Modernize",
-      "Data",
       "Deploy",
-      "Provision",
-      "Configure",
-      "Report",
-      "Security"
+      "Report"
     ],
     "tags": [
-      "<Cmdlets-Used>"
+      "Connect-PnPOnline",
+      "Export-PnPFlow",
+      "Export-PnPPowerApp",
+      "Get-PnPApp",
+      "Get-PnPAzureADApp",
+      "Get-PnPAzureADAppPermission",
+      "Get-PnPFile",
+      "Get-PnPFlow",
+      "Get-PnPList",
+      "Get-PnPListItem",
+      "Get-PnPPowerApp",
+      "Get-PnPPowerPlatformEnvironment",
+      "Get-PnPSite",
+      "Get-PnPSiteTemplate",
+      "Get-PnPTeamsApp",
+      "Get-PnPTenant",
+      "Get-PnPTenantAppCatalogUrl",
+      "Get-PnPTenantSite"
     ],
     "thumbnails": [
       {