Merge pull request KelvinTegelaar#1416 from Zacgoose/update-mailbox-report

Updated mailbox report api for new frontend page

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Reports/Invoke-ListSharedMailboxAccountEnabled.ps1

@@ -20,27 +20,29 @@ Function Invoke-ListSharedMailboxAccountEnabled {
     # Get Shared Mailbox Stuff
     try {
         $SharedMailboxList = (New-GraphGetRequest -uri "https://outlook.office365.com/adminapi/beta/$($TenantFilter)/Mailbox?`$filter=RecipientTypeDetails eq 'SharedMailbox'" -Tenantid $TenantFilter -scope ExchangeOnline)
-        $AllUsersAccountState = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?select=id,userPrincipalName,accountEnabled,displayName,givenName,surname,onPremisesSyncEnabled' -tenantid $TenantFilter
-        $EnabledUsersWithSharedMailbox = foreach ($SharedMailbox in $SharedMailboxList) {
+        $AllUsersInfo = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?$select=id,userPrincipalName,accountEnabled,displayName,givenName,surname,onPremisesSyncEnabled,assignedLicenses' -tenantid $TenantFilter
+        $SharedMailboxDetails = foreach ($SharedMailbox in $SharedMailboxList) {
             # Match the User
-            $User = $AllUsersAccountState | Where-Object { $_.userPrincipalName -eq $SharedMailbox.userPrincipalName } | Select-Object -Property id, userPrincipalName, accountEnabled, displayName, givenName, surname, onPremisesSyncEnabled -First 1
-            if ($User.accountEnabled) {
-                $User | Select-Object `
-                @{Name = 'UserPrincipalName'; Expression = { $User.UserPrincipalName } }, `
-                @{Name = 'displayName'; Expression = { $User.displayName } },
-                @{Name = 'givenName'; Expression = { $User.givenName } },
-                @{Name = 'surname'; Expression = { $User.surname } },
-                @{Name = 'accountEnabled'; Expression = { $User.accountEnabled } },
-                @{Name = 'id'; Expression = { $User.id } },
-                @{Name = 'onPremisesSyncEnabled'; Expression = { $User.onPremisesSyncEnabled } }
-
+            $User = $AllUsersInfo | Where-Object { $_.userPrincipalName -eq $SharedMailbox.userPrincipalName } | Select-Object -First 1
+
+            if ($User) {
+                # Return all shared mailboxes with license information
+                [PSCustomObject]@{
+                    UserPrincipalName = $User.userPrincipalName
+                    displayName = $User.displayName
+                    givenName = $User.givenName
+                    surname = $User.surname
+                    accountEnabled = $User.accountEnabled
+                    assignedLicenses = $User.assignedLicenses
+                    id = $User.id
+                    onPremisesSyncEnabled = $User.onPremisesSyncEnabled
+                }
             }
         }
     } catch {
-        Write-LogMessage -API 'Tenant' -tenant $TenantFilter -message "Shared Mailbox Enabled Accounts on $($TenantFilter). Error: $($_.exception.message)" -sev 'Error'
+        Write-LogMessage -API 'Tenant' -tenant $TenantFilter -message "Shared Mailbox List on $($TenantFilter). Error: $($_.exception.message)" -sev 'Error'
     }
-
-    $GraphRequest = $EnabledUsersWithSharedMailbox
+    $GraphRequest = $SharedMailboxDetails
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK