update collector logic

Author: silverhack

core/collector/Select-MonkeyCollector.ps1

@@ -44,6 +44,8 @@ Function Select-MonkeyCollector{
         [String[]]$Service
     )
     Begin{
+        #Set empty arrays
+        $allCollectors = [System.Collections.Generic.List[System.Management.Automation.PSObject]]::new()
         $collectors = [System.Collections.Generic.List[System.Management.Automation.PSObject]]::new()
         Try{
             $services = $null;
@@ -54,12 +56,17 @@ Function Select-MonkeyCollector{
             }
             #Set params
             $p = @{
-                Service = $services;
                 InformationAction = $O365Object.InformationAction;
                 Verbose = $O365Object.verbose;
                 Debug = $O365Object.debug;
             }
+            IF($null -ne $services){
+                [void]$p.Add('Service',$services);
+            }
             IF($PSBoundParameters.ContainsKey('Provider') -and $PSBoundParameters['Provider']){
+                If($PSBoundParameters['Provider'].ToLower() -eq 'entraid'){
+                    return
+                }
                 [void]$p.Add('Provider',$PSBoundParameters['Provider']);
             }
             $allCollectors = Get-MetadataFromCollector @p
@@ -80,17 +87,6 @@ Function Select-MonkeyCollector{
                 Tags = @('Monkey365ConnectorError');
             }
             Write-Error @msg
-            #Set empty array
-            $allCollectors = [System.Collections.Generic.List[System.Management.Automation.PSObject]]::new()
-        }
-        #Get Api Type
-        Try{
-            $useMsGraph = [System.Convert]::ToBoolean($O365Object.internal_config.entraId.useMsGraph)
-            $useAADOldAPIForUsers = [System.Convert]::ToBoolean($O365Object.internal_config.entraId.getUsersWithAADInternalAPI)
-        }
-        Catch{
-            $useMsGraph = $true;
-            $useAADOldAPIForUsers = $false;
         }
     }
     Process{
@@ -115,15 +111,14 @@ Function Select-MonkeyCollector{
         #Check if EntraID collectors should be added
         If($O365Object.IncludeEntraID -eq $true -and $O365Object.onlineServices.EntraID -eq $true){
             $entraIdCollectors = [System.Collections.Generic.List[System.Object]]::new()
-            $graphCollectors = Get-MetadataFromCollector -Provider EntraID -ApiType graphlegacy
             $msGraphCollectors = Get-MetadataFromCollector -Provider EntraID -ApiType MSGraph
             $apiPortalCollectors = Get-MetadataFromCollector -Provider EntraID -ApiType EntraIDPortal
             #Add Azure collector to get Diagnostic settings for Entra ID
             $eidCollector = Get-MetadataFromCollector -Provider Azure -Service General | Where-Object {$_.Id -eq "az00150"}
             If($null -ne $eidCollector){
                 [void]$entraIdCollectors.Add($eidCollector);
             }
-            If($O365Object.isConfidentialApp -eq $true){
+            If($O365Object.isConfidentialApp){
                 #Only MSGraph is supported for confidential apps
                 If ($msGraphCollectors -is [System.Collections.IEnumerable] -and $msGraphCollectors -isnot [string]){
                     [void]$entraIdCollectors.AddRange($msGraphCollectors)
@@ -132,26 +127,7 @@ Function Select-MonkeyCollector{
                     [void]$entraIdCollectors.Add($msGraphCollectors)
                 }
             }
-            ElseIf($useMsGraph -eq $false -and $O365Object.isConfidentialApp -eq $false){
-                #Load Old Graph collectors
-                If ($graphCollectors -is [System.Collections.IEnumerable] -and $graphCollectors -isnot [string]){
-                    [void]$entraIdCollectors.AddRange($graphCollectors)
-                }
-                ElseIf ($graphCollectors.GetType() -eq [System.Management.Automation.PSCustomObject] -or $graphCollectors.GetType() -eq [System.Management.Automation.PSObject]) {
-                    [void]$entraIdCollectors.Add($graphCollectors)
-                }
-                #Load Entra ID internal API collectors
-                If ($apiPortalCollectors -is [System.Collections.IEnumerable] -and $apiPortalCollectors -isnot [string]){
-                    [void]$entraIdCollectors.AddRange($apiPortalCollectors)
-                }
-                ElseIf ($apiPortalCollectors.GetType() -eq [System.Management.Automation.PSCustomObject] -or $apiPortalCollectors.GetType() -eq [System.Management.Automation.PSObject]) {
-                    [void]$entraIdCollectors.Add($apiPortalCollectors)
-                }
-            }
-            ElseIf($useMsGraph -and $O365Object.isConfidentialApp -eq $false){
-                Foreach($_collector in $entraIdCollectors.GetEnumerator()){
-                    [void]$collectors.Add($eidCollector);
-                }
+            Else{
                 #Load MSGraph collectors
                 If ($msGraphCollectors -is [System.Collections.IEnumerable] -and $msGraphCollectors -isnot [string]){
                     [void]$entraIdCollectors.AddRange($msGraphCollectors)
@@ -166,34 +142,6 @@ Function Select-MonkeyCollector{
                 ElseIf ($apiPortalCollectors.GetType() -eq [System.Management.Automation.PSCustomObject] -or $apiPortalCollectors.GetType() -eq [System.Management.Automation.PSObject]) {
                     [void]$entraIdCollectors.Add($apiPortalCollectors)
                 }
-                #Check if should load old AAD collector for users
-                If($useAADOldAPIForUsers){
-                    #Remove MSGraph user collector
-                    $entraIdCollectors = $entraIdCollectors.Where({$_.collectorName -ne "Get-MonkeyAADUser"});
-                    #Add graph users collector
-                    $OlduserCollector = @($graphCollectors).Where({$_.collectorName -eq "Get-MonkeyADUser"});
-                    If($OlduserCollector.Count -gt 0){
-                        Foreach($_collector in $OlduserCollector){
-                            [void]$entraIdCollectors.Add($_collector)
-                        }
-                    }
-                    #Add policies
-                    $policiesCollector = @($graphCollectors).Where({$_.collectorName -eq "Get-MonkeyADPolicy"});
-                    If($policiesCollector.Count -gt 0){
-                        Foreach($_collector in $policiesCollector){
-                            [void]$entraIdCollectors.Add($_collector)
-                        }
-                    }
-                }
-            }
-            Else{
-                #Load MSGraph collectors
-                If ($msGraphCollectors -is [System.Collections.IEnumerable] -and $msGraphCollectors -isnot [string]){
-                    [void]$entraIdCollectors.AddRange($msGraphCollectors)
-                }
-                ElseIf ($msGraphCollectors.GetType() -eq [System.Management.Automation.PSCustomObject] -or $msGraphCollectors.GetType() -eq [System.Management.Automation.PSObject]) {
-                    [void]$entraIdCollectors.Add($msGraphCollectors)
-                }
             }
             #Add discovered collectors
             Foreach($eidCollector in $entraIdCollectors.GetEnumerator()){