add scopes to extension test

kris6673 · Feb 12, 2025 · 693f43a · 693f43a
1 parent 2ff87c1
commit 693f43a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...s/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionTest.ps1 b/...s/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionTest.ps1
@@ -83,9 +83,13 @@ Function Invoke-ExecExtensionTest {
                 $Results = [pscustomobject]@{'Results' = 'Successfully Connected to HIBP' }
             }
             'GitHub' {
-                $GitHubResponse = Invoke-GitHubApiRequest -Method 'GET' -Path 'user'
+                $GitHubResponse = Invoke-GitHubApiRequest -Method 'GET' -Path 'user' -ReturnHeaders
                 if ($GitHubResponse.login) {
-                    $Results = [pscustomobject]@{ 'Results' = "Successfully connected to GitHub user: $($GitHubResponse.login)" }
+                    if ($GitHubResponse.Headers.'x-oauth-scopes') {
+                        $Results = [pscustomobject]@{ 'Results' = "Successfully connected to GitHub user: $($GitHubResponse.login) with scopes: $($GitHubResponse.Headers.'x-oauth-scopes')" }
+                    } else {
+                        $Results = [pscustomobject]@{ 'Results' = "Successfully connected to GitHub user: $($GitHubResponse.login) using a Fine Grained PAT" }
+                    }
                 } else {
                     $Results = [pscustomobject]@{ 'Results' = 'Failed to connect to GitHub. Check your API credentials and try again.' }
                 }

diff --git a/Modules/CippExtensions/Public/GitHub/Invoke-GitHubApiRequest.ps1 b/Modules/CippExtensions/Public/GitHub/Invoke-GitHubApiRequest.ps1
@@ -43,9 +43,10 @@ function Invoke-GitHubApiRequest {
         try {
             $Response = Invoke-RestMethod @RestMethod
             if ($ReturnHeaders.IsPresent) {
-                $ResponseHeaders
+                $Response | Add-Member -MemberType NoteProperty -Name Headers -Value $ResponseHeaders
+                return $Response
             } else {
-                $Response
+                return $Response
             }
         } catch {
             throw $_.Exception.Message