Merge pull request #641 from weyCC81/wey-EntraIDUserCount

Adjust User Output in regards to Count
maester365 · Feb 13, 2025 · e7b1526 · e7b1526
2 parents 9465165 + 814cbef
commit e7b1526
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/powershell/public/Get-MtUser.ps1 b/powershell/public/Get-MtUser.ps1
@@ -77,14 +77,14 @@ function Get-MtUser {
             foreach ( $EntraIDRole in $EntraIDRoles ) {
                 $TmpUsers = Invoke-MtGraphRequest -RelativeUri "directoryRoles/$($EntraIDRole.id)/members" -Select id, userPrincipalName, userType -OutputType Hashtable
                 if ( $TmpUsers.ContainsKey('userType') ) {
-                    Write-Verbose "Setting userType to Admin for $($TmpUsers.Count) users that are member of $($EntraIDRole.displayName)."
+                    Write-Verbose "Setting userType to Admin for $(($TmpUsers | Measure-Object).count) users that are member of $($EntraIDRole.displayName)."
                     $TmpUsers | ForEach-Object {
                         $_.userType = "Admin"
                         $Users.Add($_) | Out-Null
-                    }
-                    if ($Users.Count -ge $Count) {
-                        Write-Verbose "Found $Count $UserType users."
-                        break
+                        if ($Users.Count -ge $Count) {
+                            Write-Verbose "Found $Count $UserType users."
+                            break
+                        }
                     }
                 }
             }
@@ -111,33 +111,37 @@ function Get-MtUser {
             $EmergencyAccessUsersCount = $CApolicies.conditions.users.excludeUsers | Where-Object { $_ -in $EmergencyAccessUsers } | Measure-Object | Select-Object -ExpandProperty Count
             $EmergencyAccessGroupsCount = $CApolicies.conditions.users.excludeGroups | Where-Object { $_ -in $EmergencyAccessGroups } | Measure-Object | Select-Object -ExpandProperty Count
             if ( $EmergencyAccessUsersCount -gt $EmergencyAccessGroupsCount ) {
+                # Handling Emergency Access Users
                 foreach ( $EmergencyAccessUser in $EmergencyAccessUsers ) {
                     $TmpUsers = Invoke-MtGraphRequest -RelativeUri "users/$EmergencyAccessUser" -Select id, userPrincipalName, userType -OutputType Hashtable
                     if ( $TmpUsers.ContainsKey('userType') ) {
-                        Write-Verbose "Setting userType to $UserType for $($TmpUsers.Count) users that are member of EmergencyAccess."
+                        Write-Verbose "Setting userType to $UserType for $(($TmpUsers | Measure-Object).count) users that are member of EmergencyAccess."
                         $TmpUsers | ForEach-Object {
                             $_.userType = "EmergencyAccess"
                             $Users.Add($_) | Out-Null
-                        }
-                        if ($Users.Count -ge $Count) {
-                            Write-Verbose "Found $Count $UserType users."
-                            break
+
+                            if ($Users.Count -ge $Count) {
+                                Write-Verbose "Found $Count $UserType users."
+                                break
+                            }
                         }
                     }
                 }
             } else {
+                # Handling Emergency Access Groups
                 Write-Verbose "Emergency access group: $EmergencyAccessGroups"
                 foreach ( $EmergencyAccessGroup in $EmergencyAccessGroups ) {
                     $TmpUsers = Invoke-MtGraphRequest -RelativeUri "groups/$EmergencyAccessGroup/members" -Select id, userPrincipalName, userType -OutputType Hashtable
                     if ( $TmpUsers.ContainsKey('userType') ) {
-                        Write-Verbose "Setting userType to $UserType for $($TmpUsers.Count) users that are member of EmergencyAccess."
+                        Write-Verbose "Setting userType to $UserType for $(($TmpUsers | Measure-Object).count) users that are member of EmergencyAccess."
                         $TmpUsers | ForEach-Object {
                             $_.userType = "EmergencyAccess"
                             $Users.Add($_) | Out-Null
-                        }
-                        if ($Users.Count -ge $Count) {
-                            Write-Verbose "Found $Count $UserType users."
-                            break
+
+                            if ($Users.Count -ge $Count) {
+                                Write-Verbose "Found $Count $UserType users."
+                                break
+                            }
                         }
                     }
                 }