add: future changes to be committed

source/Public/Get-AdminRoleUserLicense.ps1

@@ -0,0 +1,52 @@
+function Get-AdminRoleUserLicense {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [switch]$SkipGraphConnection
+    )
+
+    begin {
+        if (-not $SkipGraphConnection) {
+            Connect-MgGraph -Scopes "Directory.Read.All", "Domain.Read.All", "Policy.Read.All", "Organization.Read.All" -NoWelcome
+        }
+
+        $adminRoleUsers = @()
+        $userIds = @()
+    }
+    Process {    # Connect to Microsoft Graph if not skipping connection
+
+        $adminroles = Get-MgRoleManagementDirectoryRoleDefinition | Where-Object { $_.DisplayName -like "*Admin*" }
+
+        foreach ($role in $adminroles) {
+            $usersInRole = Get-MgRoleManagementDirectoryRoleAssignment -Filter "roleDefinitionId eq '$($role.Id)'"
+
+            foreach ($user in $usersInRole) {
+                $userIds += $user.PrincipalId
+                $userDetails = Get-MgUser -UserId $user.PrincipalId -Property "DisplayName, UserPrincipalName, Id, onPremisesSyncEnabled"
+
+                $adminRoleUsers += [PSCustomObject]@{
+                    RoleName = $role.DisplayName
+                    UserName = $userDetails.DisplayName
+                    UserPrincipalName = $userDetails.UserPrincipalName
+                    UserId = $userDetails.Id
+                    HybridUser = $userDetails.onPremisesSyncEnabled
+                    Licenses = ""  # Placeholder for licenses, to be filled later
+                }
+            }
+        }
+
+        foreach ($userId in $userIds | Select-Object -Unique) {
+            $licenses = Get-MgUserLicenseDetail -UserId $userId
+            $licenseList = ($licenses.SkuPartNumber -join '|')
+
+            $adminRoleUsers | Where-Object { $_.UserId -eq $userId } | ForEach-Object {
+                $_.Licenses = $licenseList
+            }
+        }
+    }
+    End {
+        Write-Host "Disconnecting from Microsoft Graph..." -ForegroundColor Green
+        Disconnect-MgGraph | Out-Null
+        return $adminRoleUsers
+    }
+}

source/Public/Invoke-M365SecurityAudit.ps1

@@ -248,12 +248,12 @@ function Invoke-M365SecurityAudit {
     }
 
     End {
-        # Return all collected audit results
-        return $allAuditResults
-        # Check if the Disconnect switch is present
         if (!($DoNotDisconnect)) {
             # Clean up sessions
             Disconnect-M365Suite
         }
+        # Return all collected audit results
+        return $allAuditResults
+        # Check if the Disconnect switch is present
     }
 }