update msgraph api wrapper

silverhack · silverhack · commit 641f22fd1889 · 2025-07-11T18:39:49.000+02:00
diff --git a/core/api/entraid/msgraph/api/Get-MonkeyMSGraphObject.ps1 b/core/api/entraid/msgraph/api/Get-MonkeyMSGraphObject.ps1
@@ -9,7 +9,7 @@
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
+# See the License for the specIfic language governing permissions and
 # limitations under the License.
 
 Function Get-MonkeyMSGraphObject{
@@ -84,121 +84,124 @@ Function Get-MonkeyMSGraphObject{
         [parameter(Mandatory=$False, HelpMessage='POST Data object')]
         [Object]$Data,
 
+        [parameter(Mandatory=$False, HelpMessage='Return raw response')]
+        [Switch]$RawResponse,
+
         [parameter(Mandatory=$False, HelpMessage='API Version')]
         [String]$APIVersion = "v1.0"
     )
     Begin{
         $Verbose = $Debug = $False;
         $InformationAction = 'SilentlyContinue'
-        if($PSBoundParameters.ContainsKey('Verbose') -and $PSBoundParameters.Verbose){
+        If($PSBoundParameters.ContainsKey('Verbose') -and $PSBoundParameters.Verbose){
             $Verbose = $True
         }
-        if($PSBoundParameters.ContainsKey('Debug') -and $PSBoundParameters.Debug){
+        If($PSBoundParameters.ContainsKey('Debug') -and $PSBoundParameters.Debug){
             $Debug = $True
         }
-        if($PSBoundParameters.ContainsKey('InformationAction')){
+        If($PSBoundParameters.ContainsKey('InformationAction')){
             $InformationAction = $PSBoundParameters['InformationAction']
         }
-        if($null -eq $Authentication){
+        If($null -eq $Authentication){
              Write-Warning -Message ($message.NullAuthenticationDetected -f "Microsoft Graph API")
              break
         }
         #Get Authorization Header
         $methods = $Authentication | Get-Member | Where-Object {$_.MemberType -eq 'Method'} | Select-Object -ExpandProperty Name
         #Get Authorization Header
-        if($null -ne $methods -and $methods.Contains('CreateAuthorizationHeader')){
+        If($null -ne $methods -and $methods.Contains('CreateAuthorizationHeader')){
             $AuthHeader = $Authentication.CreateAuthorizationHeader()
         }
-        else{
+        Else{
             $AuthHeader = ("Bearer {0}" -f $Authentication.AccessToken)
         }
         #$AuthHeader = ("Bearer {0}" -f $Authentication.AccessToken)
         #set msgraph uri
         $base_uri = ("/{0}" -f $APIVersion)
         $my_filter = $null
         #construct query
-        if($Expand){
-            if($null -ne $my_filter){
+        If($Expand){
+            If($null -ne $my_filter){
                 $my_filter = ('{0}&$expand={1}' -f $my_filter, $Expand)
             }
-            else{
+            Else{
                 $my_filter = ('?$expand={0}' -f $Expand)
             }
         }
-        if($Filter){
-            if($null -ne $my_filter){
+        If($Filter){
+            If($null -ne $my_filter){
                 $my_filter = ('{0}&$filter={1}' -f $my_filter, [uri]::EscapeDataString($Filter))
             }
-            else{
+            Else{
                 $my_filter = ('?$filter={0}' -f [uri]::EscapeDataString($Filter))
             }
         }
-        if($Select){
-            if($null -ne $my_filter){
+        If($Select){
+            If($null -ne $my_filter){
                 $my_filter = ('{0}&$select={1}' -f $my_filter, (@($Select) -join ','))
             }
-            else{
+            Else{
                 $my_filter = ('?$select={0}' -f (@($Select) -join ','))
             }
         }
-        if($orderBy){
-            if($null -ne $my_filter){
+        If($orderBy){
+            If($null -ne $my_filter){
                 $my_filter = ('{0}&$orderby={1}' -f $my_filter, $orderBy)
             }
-            else{
+            Else{
                 $my_filter = ('?$orderby={0}' -f $orderBy)
             }
         }
-        if($Top){
-            if($null -ne $my_filter){
+        If($Top){
+            If($null -ne $my_filter){
                 $my_filter = ('{0}&$top={1}' -f $my_filter, $Top)
             }
-            else{
+            Else{
                 $my_filter = ('?$top={0}' -f $Top)
             }
         }
-        if($Count){
-            if($null -ne $my_filter){
+        If($Count){
+            If($null -ne $my_filter){
                 $my_filter = ('{0}&$count=true' -f $my_filter)
             }
-            else{
+            Else{
                 $my_filter = ('?$count=true' -f $Top)
             }
         }
-        if($me){
+        If($me){
             $base_uri = ("{0}/me" -f $base_uri)
         }
-        if($ObjectType){
+        If($ObjectType){
             $base_uri = ("{0}/{1}" -f $base_uri, $ObjectType)
         }
-        if($ObjectId){
+        If($ObjectId){
             $base_uri = ("{0}/{1}" -f $base_uri, $ObjectId)
         }
         #Append filter to query
-        if($my_filter){
+        If($my_filter){
             $base_uri = ("{0}{1}" -f $base_uri,$my_filter)
         }
         #Construct final URI
         $Server = ("{0}" -f $Environment.Graphv2.Replace('https://',''))
         $final_uri = ("{0}{1}" -f $Server,$base_uri)
         $final_uri = [regex]::Replace($final_uri,"/+","/")
         $final_uri = ("https://{0}" -f $final_uri.ToString())
-        if($RawQuery){
-            if($my_filter){
+        If($RawQuery){
+            If($my_filter){
                 $final_uri = ("{0}{1}" -f $RawQuery,$my_filter)
             }
-            else{
+            Else{
                 $final_uri = ("{0}" -f $RawQuery)
             }
         }
     }
     Process{
-        if($final_uri){
+        If($final_uri){
             #Create Request Header
             $requestHeader = @{
                 Authorization = $AuthHeader
             }
-            if($PSBoundParameters.ContainsKey('AddConsistencyLevelHeader') -and $PSBoundParameters['AddConsistencyLevelHeader'].IsPresent){
+            If($PSBoundParameters.ContainsKey('AddConsistencyLevelHeader') -and $PSBoundParameters['AddConsistencyLevelHeader'].IsPresent){
                 [void]$requestHeader.Add('ConsistencyLevel','eventual')
             }
             #set count
@@ -218,11 +221,15 @@ Function Get-MonkeyMSGraphObject{
                             Debug = $Debug;
                             InformationAction = $InformationAction;
                         }
+                        If($PSBoundParameters.ContainsKey('RawResponse') -and $PSBoundParameters['RawResponse'].IsPresent){
+                            [void]$param.Add('RawResponse',$true)
+                        }
+                        #Execute query
                         $Objects = Invoke-MonkeyWebRequest @param
                     }
                     'POST'
                     {
-                        if($Data){
+                        If($Data){
                             $param = @{
                                 Url = $final_uri;
                                 Headers = $requestHeader;
@@ -235,7 +242,7 @@ Function Get-MonkeyMSGraphObject{
                                 InformationAction = $InformationAction;
                             }
                         }
-                        else{
+                        Else{
                             $param = @{
                                 Url = $final_uri;
                                 Headers = $requestHeader;
@@ -251,32 +258,33 @@ Function Get-MonkeyMSGraphObject{
                         $Objects = Invoke-MonkeyWebRequest @param
                     }
                 }
-                if($ObjectType){
-                    Write-Verbose ("Getting {0} from microsoft graph" -f $ObjectType)
-                }
-                else{
-                    Write-Verbose $final_uri
+                #Writes URL to verbose stream
+                Write-Verbose $final_uri
+                #Check objects
+                If($null -ne $Objects -and $Objects -is [System.Net.Http.HttpResponseMessage]){
+                    $Objects
+                    return
                 }
-                if($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and @($Objects.value).Count -gt 0){
+                ElseIf($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and @($Objects.value).Count -gt 0){
                     #Count objects
                     $countObjects += @($Objects.value).Count
                     #return Value
                     $Objects.value
                 }
-                elseif($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and $Objects.value.Count -eq 0){
+                ElseIf($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and $Objects.value.Count -eq 0){
                     #empty response
                     $Objects.value
                 }
-                else{
+                Else{
                     #Count objects
                     $countObjects += @($Objects).Count
                     $Objects
                 }
-                if($Top -and $Top -ge $countObjects){
+                If($Top -and $Top -ge $countObjects){
                     return
                 }
                 #Search for paging objects
-                if ($Objects.PsObject.Properties.Item('@odata.nextLink')){
+                If ($Objects.PsObject.Properties.Item('@odata.nextLink')){
                     $nextLink = $Objects.'@odata.nextLink'
                     while ($null -ne $nextLink){
                         #Make RestAPI call
diff --git a/core/api/entraid/msgraph/helpers/directoryrole/Get-MonkeyMSGraphEntraRoleAssignment.ps1 b/core/api/entraid/msgraph/helpers/directoryrole/Get-MonkeyMSGraphEntraRoleAssignment.ps1
@@ -195,6 +195,7 @@ Function Get-MonkeyMSGraphEntraRoleAssignment {
             Write-Output $allEntraIDRoleAssignment -NoEnumerate
         }
         Catch{
+            write-host $_
             Write-Error $_
             return , $allEntraIDRoleAssignment
         }
diff --git a/core/api/entraid/msgraph/helpers/general/Get-MonkeyMSGraphProfilePhoto.ps1 b/core/api/entraid/msgraph/helpers/general/Get-MonkeyMSGraphProfilePhoto.ps1
@@ -71,9 +71,10 @@ Function Get-MonkeyMSGraphProfilePhoto {
                 ObjectType = 'users';
                 ObjectId = $ObjectId;
                 Environment = $Environment;
-                ContentType = 'application/json';
+                ContentType = 'image/jpg';
                 Method = "GET";
                 APIVersion = $APIVersion;
+                RawResponse = $True;
                 InformationAction = $O365Object.InformationAction;
                 Verbose = $O365Object.verbose;
                 Debug = $O365Object.debug;
@@ -101,6 +102,7 @@ Function Get-MonkeyMSGraphProfilePhoto {
                     Url = $logoUrl;
                     ContentType = 'image/jpg';
                     Method = "GET";
+                    RawResponse = $True;
                     InformationAction = $O365Object.InformationAction;
                     Verbose = $O365Object.verbose;
                     Debug = $O365Object.debug;
@@ -128,6 +130,7 @@ Function Get-MonkeyMSGraphProfilePhoto {
                         Url = $logoUrl;
                         ContentType = 'image/jpg';
                         Method = "GET";
+                        RawResponse = $True;
                         InformationAction = $O365Object.InformationAction;
                         Verbose = $O365Object.verbose;
                         Debug = $O365Object.debug;
@@ -139,8 +142,15 @@ Function Get-MonkeyMSGraphProfilePhoto {
         }
     }
     End{
-        if($null -ne $profilePhoto){
-            return [Convert]::ToBase64String($profilePhoto)
+        If($null -ne $profilePhoto -and $profilePhoto -is [System.Net.Http.HttpResponseMessage]){
+            Try{
+                $stream = $profilePhoto.Content.ReadAsStreamAsync()
+                $memoryStream = $stream.GetAwaiter().GetResult()
+                return [Convert]::ToBase64String($memoryStream.ToArray())
+            }
+            Catch{
+                Write-Error $_
+            }
         }
     }
 }
diff --git a/core/api/entraid/msgraph/helpers/users/Get-MonkeyMSGraphUser.ps1 b/core/api/entraid/msgraph/helpers/users/Get-MonkeyMSGraphUser.ps1
@@ -69,6 +69,8 @@ Function Get-MonkeyMSGraphUser {
         $graphAuth = $O365Object.auth_tokens.MSGraph
     }
     Process{
+        Write-Host ($PSBoundParameters | Out-String) -ForegroundColor Yellow
+        Write-Host ($PSCmdlet.ParameterSetName) -ForegroundColor Magenta
         if($PSCmdlet.ParameterSetName -eq 'UserId'){
             $params = @{
                 Authentication = $graphAuth;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# Unless required by applicable law or agreed to in writing, software`
`10`	`10`	`# distributed under the License is distributed on an "AS IS" BASIS,`
`11`	`11`	`# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`
`12`		`-# See the License for the specific language governing permissions and`
	`12`	`+# See the License for the specIfic language governing permissions and`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`Function Get-MonkeyMSGraphObject{`
`@@ -84,121 +84,124 @@ Function Get-MonkeyMSGraphObject{`
`84`	`84`	`[parameter(Mandatory=$False, HelpMessage='POST Data object')]`
`85`	`85`	`[Object]$Data,`
`86`	`86`
	`87`	`+ [parameter(Mandatory=$False, HelpMessage='Return raw response')]`
	`88`	`+ [Switch]$RawResponse,`
	`89`	`+`
`87`	`90`	`[parameter(Mandatory=$False, HelpMessage='API Version')]`
`88`	`91`	`[String]$APIVersion = "v1.0"`
`89`	`92`	`)`
`90`	`93`	`Begin{`
`91`	`94`	`$Verbose = $Debug = $False;`
`92`	`95`	`$InformationAction = 'SilentlyContinue'`
`93`		`- if($PSBoundParameters.ContainsKey('Verbose') -and $PSBoundParameters.Verbose){`
	`96`	`+ If($PSBoundParameters.ContainsKey('Verbose') -and $PSBoundParameters.Verbose){`
`94`	`97`	`$Verbose = $True`
`95`	`98`	`}`
`96`		`- if($PSBoundParameters.ContainsKey('Debug') -and $PSBoundParameters.Debug){`
	`99`	`+ If($PSBoundParameters.ContainsKey('Debug') -and $PSBoundParameters.Debug){`
`97`	`100`	`$Debug = $True`
`98`	`101`	`}`
`99`		`- if($PSBoundParameters.ContainsKey('InformationAction')){`
	`102`	`+ If($PSBoundParameters.ContainsKey('InformationAction')){`
`100`	`103`	`$InformationAction = $PSBoundParameters['InformationAction']`
`101`	`104`	`}`
`102`		`- if($null -eq $Authentication){`
	`105`	`+ If($null -eq $Authentication){`
`103`	`106`	`Write-Warning -Message ($message.NullAuthenticationDetected -f "Microsoft Graph API")`
`104`	`107`	`break`
`105`	`108`	`}`
`106`	`109`	`#Get Authorization Header`
`107`	`110`	`$methods = $Authentication \| Get-Member \| Where-Object {$_.MemberType -eq 'Method'} \| Select-Object -ExpandProperty Name`
`108`	`111`	`#Get Authorization Header`
`109`		`- if($null -ne $methods -and $methods.Contains('CreateAuthorizationHeader')){`
	`112`	`+ If($null -ne $methods -and $methods.Contains('CreateAuthorizationHeader')){`
`110`	`113`	`$AuthHeader = $Authentication.CreateAuthorizationHeader()`
`111`	`114`	`}`
`112`		`- else{`
	`115`	`+ Else{`
`113`	`116`	`$AuthHeader = ("Bearer {0}" -f $Authentication.AccessToken)`
`114`	`117`	`}`
`115`	`118`	`#$AuthHeader = ("Bearer {0}" -f $Authentication.AccessToken)`
`116`	`119`	`#set msgraph uri`
`117`	`120`	`$base_uri = ("/{0}" -f $APIVersion)`
`118`	`121`	`$my_filter = $null`
`119`	`122`	`#construct query`
`120`		`- if($Expand){`
`121`		`- if($null -ne $my_filter){`
	`123`	`+ If($Expand){`
	`124`	`+ If($null -ne $my_filter){`
`122`	`125`	`$my_filter = ('{0}&$expand={1}' -f $my_filter, $Expand)`
`123`	`126`	`}`
`124`		`- else{`
	`127`	`+ Else{`
`125`	`128`	`$my_filter = ('?$expand={0}' -f $Expand)`
`126`	`129`	`}`
`127`	`130`	`}`
`128`		`- if($Filter){`
`129`		`- if($null -ne $my_filter){`
	`131`	`+ If($Filter){`
	`132`	`+ If($null -ne $my_filter){`
`130`	`133`	`$my_filter = ('{0}&$filter={1}' -f $my_filter, [uri]::EscapeDataString($Filter))`
`131`	`134`	`}`
`132`		`- else{`
	`135`	`+ Else{`
`133`	`136`	`$my_filter = ('?$filter={0}' -f [uri]::EscapeDataString($Filter))`
`134`	`137`	`}`
`135`	`138`	`}`
`136`		`- if($Select){`
`137`		`- if($null -ne $my_filter){`
	`139`	`+ If($Select){`
	`140`	`+ If($null -ne $my_filter){`
`138`	`141`	`$my_filter = ('{0}&$select={1}' -f $my_filter, (@($Select) -join ','))`
`139`	`142`	`}`
`140`		`- else{`
	`143`	`+ Else{`
`141`	`144`	`$my_filter = ('?$select={0}' -f (@($Select) -join ','))`
`142`	`145`	`}`
`143`	`146`	`}`
`144`		`- if($orderBy){`
`145`		`- if($null -ne $my_filter){`
	`147`	`+ If($orderBy){`
	`148`	`+ If($null -ne $my_filter){`
`146`	`149`	`$my_filter = ('{0}&$orderby={1}' -f $my_filter, $orderBy)`
`147`	`150`	`}`
`148`		`- else{`
	`151`	`+ Else{`
`149`	`152`	`$my_filter = ('?$orderby={0}' -f $orderBy)`
`150`	`153`	`}`
`151`	`154`	`}`
`152`		`- if($Top){`
`153`		`- if($null -ne $my_filter){`
	`155`	`+ If($Top){`
	`156`	`+ If($null -ne $my_filter){`
`154`	`157`	`$my_filter = ('{0}&$top={1}' -f $my_filter, $Top)`
`155`	`158`	`}`
`156`		`- else{`
	`159`	`+ Else{`
`157`	`160`	`$my_filter = ('?$top={0}' -f $Top)`
`158`	`161`	`}`
`159`	`162`	`}`
`160`		`- if($Count){`
`161`		`- if($null -ne $my_filter){`
	`163`	`+ If($Count){`
	`164`	`+ If($null -ne $my_filter){`
`162`	`165`	`$my_filter = ('{0}&$count=true' -f $my_filter)`
`163`	`166`	`}`
`164`		`- else{`
	`167`	`+ Else{`
`165`	`168`	`$my_filter = ('?$count=true' -f $Top)`
`166`	`169`	`}`
`167`	`170`	`}`
`168`		`- if($me){`
	`171`	`+ If($me){`
`169`	`172`	`$base_uri = ("{0}/me" -f $base_uri)`
`170`	`173`	`}`
`171`		`- if($ObjectType){`
	`174`	`+ If($ObjectType){`
`172`	`175`	`$base_uri = ("{0}/{1}" -f $base_uri, $ObjectType)`
`173`	`176`	`}`
`174`		`- if($ObjectId){`
	`177`	`+ If($ObjectId){`
`175`	`178`	`$base_uri = ("{0}/{1}" -f $base_uri, $ObjectId)`
`176`	`179`	`}`
`177`	`180`	`#Append filter to query`
`178`		`- if($my_filter){`
	`181`	`+ If($my_filter){`
`179`	`182`	`$base_uri = ("{0}{1}" -f $base_uri,$my_filter)`
`180`	`183`	`}`
`181`	`184`	`#Construct final URI`
`182`	`185`	`$Server = ("{0}" -f $Environment.Graphv2.Replace('https://',''))`
`183`	`186`	`$final_uri = ("{0}{1}" -f $Server,$base_uri)`
`184`	`187`	`$final_uri = [regex]::Replace($final_uri,"/+","/")`
`185`	`188`	`$final_uri = ("https://{0}" -f $final_uri.ToString())`
`186`		`- if($RawQuery){`
`187`		`- if($my_filter){`
	`189`	`+ If($RawQuery){`
	`190`	`+ If($my_filter){`
`188`	`191`	`$final_uri = ("{0}{1}" -f $RawQuery,$my_filter)`
`189`	`192`	`}`
`190`		`- else{`
	`193`	`+ Else{`
`191`	`194`	`$final_uri = ("{0}" -f $RawQuery)`
`192`	`195`	`}`
`193`	`196`	`}`
`194`	`197`	`}`
`195`	`198`	`Process{`
`196`		`- if($final_uri){`
	`199`	`+ If($final_uri){`
`197`	`200`	`#Create Request Header`
`198`	`201`	`$requestHeader = @{`
`199`	`202`	`Authorization = $AuthHeader`
`200`	`203`	`}`
`201`		`- if($PSBoundParameters.ContainsKey('AddConsistencyLevelHeader') -and $PSBoundParameters['AddConsistencyLevelHeader'].IsPresent){`
	`204`	`+ If($PSBoundParameters.ContainsKey('AddConsistencyLevelHeader') -and $PSBoundParameters['AddConsistencyLevelHeader'].IsPresent){`
`202`	`205`	`[void]$requestHeader.Add('ConsistencyLevel','eventual')`
`203`	`206`	`}`
`204`	`207`	`#set count`
`@@ -218,11 +221,15 @@ Function Get-MonkeyMSGraphObject{`
`218`	`221`	`Debug = $Debug;`
`219`	`222`	`InformationAction = $InformationAction;`
`220`	`223`	`}`
	`224`	`+ If($PSBoundParameters.ContainsKey('RawResponse') -and $PSBoundParameters['RawResponse'].IsPresent){`
	`225`	`+ [void]$param.Add('RawResponse',$true)`
	`226`	`+ }`
	`227`	`+ #Execute query`
`221`	`228`	`$Objects = Invoke-MonkeyWebRequest @param`
`222`	`229`	`}`
`223`	`230`	`'POST'`
`224`	`231`	`{`
`225`		`- if($Data){`
	`232`	`+ If($Data){`
`226`	`233`	`$param = @{`
`227`	`234`	`Url = $final_uri;`
`228`	`235`	`Headers = $requestHeader;`
`@@ -235,7 +242,7 @@ Function Get-MonkeyMSGraphObject{`
`235`	`242`	`InformationAction = $InformationAction;`
`236`	`243`	`}`
`237`	`244`	`}`
`238`		`- else{`
	`245`	`+ Else{`
`239`	`246`	`$param = @{`
`240`	`247`	`Url = $final_uri;`
`241`	`248`	`Headers = $requestHeader;`
`@@ -251,32 +258,33 @@ Function Get-MonkeyMSGraphObject{`
`251`	`258`	`$Objects = Invoke-MonkeyWebRequest @param`
`252`	`259`	`}`
`253`	`260`	`}`
`254`		`- if($ObjectType){`
`255`		`- Write-Verbose ("Getting {0} from microsoft graph" -f $ObjectType)`
`256`		`- }`
`257`		`- else{`
`258`		`- Write-Verbose $final_uri`
	`261`	`+ #Writes URL to verbose stream`
	`262`	`+ Write-Verbose $final_uri`
	`263`	`+ #Check objects`
	`264`	`+ If($null -ne $Objects -and $Objects -is [System.Net.Http.HttpResponseMessage]){`
	`265`	`+ $Objects`
	`266`	`+ return`
`259`	`267`	`}`
`260`		`- if($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and @($Objects.value).Count -gt 0){`
	`268`	`+ ElseIf($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and @($Objects.value).Count -gt 0){`
`261`	`269`	`#Count objects`
`262`	`270`	`$countObjects += @($Objects.value).Count`
`263`	`271`	`#return Value`
`264`	`272`	`$Objects.value`
`265`	`273`	`}`
`266`		`- elseif($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and $Objects.value.Count -eq 0){`
	`274`	`+ ElseIf($null -ne $Objects -and $null -ne $Objects.PSObject.Properties.Item('value') -and $Objects.value.Count -eq 0){`
`267`	`275`	`#empty response`
`268`	`276`	`$Objects.value`
`269`	`277`	`}`
`270`		`- else{`
	`278`	`+ Else{`
`271`	`279`	`#Count objects`
`272`	`280`	`$countObjects += @($Objects).Count`
`273`	`281`	`$Objects`
`274`	`282`	`}`
`275`		`- if($Top -and $Top -ge $countObjects){`
	`283`	`+ If($Top -and $Top -ge $countObjects){`
`276`	`284`	`return`
`277`	`285`	`}`
`278`	`286`	`#Search for paging objects`
`279`		`- if ($Objects.PsObject.Properties.Item('@odata.nextLink')){`
	`287`	`+ If ($Objects.PsObject.Properties.Item('@odata.nextLink')){`
`280`	`288`	`$nextLink = $Objects.'@odata.nextLink'`
`281`	`289`	`while ($null -ne $nextLink){`
`282`	`290`	`#Make RestAPI call`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ Function Get-MonkeyMSGraphEntraRoleAssignment {`
`195`	`195`	`Write-Output $allEntraIDRoleAssignment -NoEnumerate`
`196`	`196`	`}`
`197`	`197`	`Catch{`
	`198`	`+ write-host $_`
`198`	`199`	`Write-Error $_`
`199`	`200`	`return , $allEntraIDRoleAssignment`
`200`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ Function Get-MonkeyMSGraphUser {`
`69`	`69`	`$graphAuth = $O365Object.auth_tokens.MSGraph`
`70`	`70`	`}`
`71`	`71`	`Process{`
	`72`	`+ Write-Host ($PSBoundParameters \| Out-String) -ForegroundColor Yellow`
	`73`	`+ Write-Host ($PSCmdlet.ParameterSetName) -ForegroundColor Magenta`
`72`	`74`	`if($PSCmdlet.ParameterSetName -eq 'UserId'){`
`73`	`75`	`$params = @{`
`74`	`76`	`Authentication = $graphAuth;`