From a36890325448c831da8281f63d5e5d8f7de77970 Mon Sep 17 00:00:00 2001
From: freddydk <freddydk@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:19:23 +0100
Subject: [PATCH] revert

---
 Actions/Github-AuthHelper.psm1 | 88 -------------------------------
 Actions/Github-Helper.psm1     | 96 ++++++++++++++++++++++++++++++----
 2 files changed, 87 insertions(+), 97 deletions(-)
 delete mode 100644 Actions/Github-AuthHelper.psm1

diff --git a/Actions/Github-AuthHelper.psm1 b/Actions/Github-AuthHelper.psm1
deleted file mode 100644
index 80e622e19..000000000
--- a/Actions/Github-AuthHelper.psm1
+++ /dev/null
@@ -1,88 +0,0 @@
-<#
- .SYNOPSIS
-  This function will return the Access Token based on the gitHubAppClientId and privateKey
-  This GitHub App must be installed in the repositories for which the access is requested
-  The permissions of the GitHub App must include the permissions requested
- .PARAMETER gitHubAppClientId
-  The GitHub App Client ID
- .Parameter privateKey
-  The GitHub App Private Key
- .PARAMETER api_url
-  The GitHub API URL
- .PARAMETER repository
-  The Current GitHub repository
- .PARAMETER repositories
-  The repositories to request access to
- .PARAMETER permissions
-  The permissions to request for the Access Token
-#>
-function GetGitHubAppAuthToken {
-    Param(
-        [string] $gitHubAppClientId,
-        [string] $privateKey,
-        [string] $api_url = $ENV:GITHUB_API_URL,
-        [string] $repository,
-        [hashtable] $permissions = @{},
-        [string[]] $repositories = @()
-    )
-
-    Write-Host "Using GitHub App with ClientId $gitHubAppClientId for authentication"
-    $jwt = GenerateJwtForTokenRequest -gitHubAppClientId $gitHubAppClientId -privateKey $privateKey
-    $headers = @{
-        "Accept" = "application/vnd.github+json"
-        "Authorization" = "Bearer $jwt"
-        "X-GitHub-Api-Version" = "2022-11-28"
-    }
-    Write-Host "Get App Info $api_url/repos/$repository/installation"
-    $appinfo = Invoke-RestMethod -Method GET -UseBasicParsing -Headers $headers -Uri "$api_url/repos/$repository/installation"
-    $body = @{}
-    # If repositories are provided, limit the requested repositories to those
-    if ($repositories) {
-        $body += @{ "repositories" = @($repositories | ForEach-Object { $_.SubString($_.LastIndexOf('/')+1) } ) }
-    }
-    # If permissions are provided, limit the requested permissions to those
-    if ($permissions) {
-        $body += @{ "permissions" = $permissions }
-    }
-    Write-Host "Get Token Response $($appInfo.access_tokens_url) with $($body | ConvertTo-Json -Compress)"
-    $tokenResponse = Invoke-RestMethod -Method POST -UseBasicParsing -Headers $headers -Body ($body | ConvertTo-Json -Compress) -Uri $appInfo.access_tokens_url
-    Write-Host "return token"
-    return $tokenResponse.token, $tokenResponse.expires_in
-}
-
-<#
- .SYNOPSIS
-  Generate JWT for token request
-  As documented here: https://docs.github.com/en/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-json-web-token-jwt-for-a-github-app
- .PARAMETER gitHubAppClientId
-  The GitHub App Client ID
- .Parameter privateKey
-  The GitHub App Private Key
-#>
-function GenerateJwtForTokenRequest {
-    Param(
-        [string] $gitHubAppClientId,
-        [string] $privateKey
-    )
-
-    $header = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes((ConvertTo-Json -InputObject @{
-        alg = "RS256"
-        typ = "JWT"
-    }))).TrimEnd('=').Replace('+', '-').Replace('/', '_');
-
-    $payload = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes((ConvertTo-Json -InputObject @{
-        iat = [System.DateTimeOffset]::UtcNow.AddSeconds(-10).ToUnixTimeSeconds()
-        exp = [System.DateTimeOffset]::UtcNow.AddMinutes(10).ToUnixTimeSeconds()
-        iss = $gitHubAppClientId
-    }))).TrimEnd('=').Replace('+', '-').Replace('/', '_');
-    $signature = pwsh -command {
-        $rsa = [System.Security.Cryptography.RSA]::Create()
-        $privateKey = "$($args[1])"
-        $rsa.ImportFromPem($privateKey)
-        $signature = [Convert]::ToBase64String($rsa.SignData([System.Text.Encoding]::UTF8.GetBytes($args[0]), [System.Security.Cryptography.HashAlgorithmName]::SHA256, [System.Security.Cryptography.RSASignaturePadding]::Pkcs1)).TrimEnd('=').Replace('+', '-').Replace('/', '_')
-        Write-OutPut $signature
-    } -args "$header.$payload", $privateKey
-    return "$header.$payload.$signature"
-}
-
-Export-ModuleMember -Function GetGitHubAppAuthToken, GenerateJwtForTokenRequest
diff --git a/Actions/Github-Helper.psm1 b/Actions/Github-Helper.psm1
index 8539fe3f0..9e35fc445 100644
--- a/Actions/Github-Helper.psm1
+++ b/Actions/Github-Helper.psm1
@@ -646,15 +646,6 @@ function GetAccessToken {
     }
     else {
         # GitHub App token format: {"GitHubAppClientId":"<client_id>","PrivateKey":"<private_key>"}
-        $GitHubAuthHelperModuleName = "Github-AuthHelper"
-        $GitHubAuthHelperModulePath = Join-Path $PSScriptRoot "$($GitHubAuthHelperModuleName).psm1"
-        Write-Host $GitHubAuthHelperModulePath
-        if (-not (Get-Module $GitHubAuthHelperModuleName)) {
-            if (-not (Test-Path $GitHubAuthHelperModulePath)) {
-                throw "Module $GitHubAuthHelperModuleName not present. GitHub App tokens can only be used inside GitHub workflows."
-            }
-            Import-Module $GitHubAuthHelperModulePath
-        }
         try {
             $json = $token | ConvertFrom-Json
             $realToken, $expiresIn = GetGitHubAppAuthToken -gitHubAppClientId $json.GitHubAppClientId -privateKey $json.PrivateKey -api_url $api_url -repository $repository -repositories $repositories -permissions $permissions
@@ -1199,3 +1190,90 @@ function DownloadArtifact {
         return $filename
     }
 }
+
+<#
+ .SYNOPSIS
+  This function will return the Access Token based on the gitHubAppClientId and privateKey
+  This GitHub App must be installed in the repositories for which the access is requested
+  The permissions of the GitHub App must include the permissions requested
+ .PARAMETER gitHubAppClientId
+  The GitHub App Client ID
+ .Parameter privateKey
+  The GitHub App Private Key
+ .PARAMETER api_url
+  The GitHub API URL
+ .PARAMETER repository
+  The Current GitHub repository
+ .PARAMETER repositories
+  The repositories to request access to
+ .PARAMETER permissions
+  The permissions to request for the Access Token
+#>
+function GetGitHubAppAuthToken {
+    Param(
+        [string] $gitHubAppClientId,
+        [string] $privateKey,
+        [string] $api_url = $ENV:GITHUB_API_URL,
+        [string] $repository,
+        [hashtable] $permissions = @{},
+        [string[]] $repositories = @()
+    )
+
+    Write-Host "Using GitHub App with ClientId $gitHubAppClientId for authentication"
+    $jwt = GenerateJwtForTokenRequest -gitHubAppClientId $gitHubAppClientId -privateKey $privateKey
+    $headers = @{
+        "Accept" = "application/vnd.github+json"
+        "Authorization" = "Bearer $jwt"
+        "X-GitHub-Api-Version" = "2022-11-28"
+    }
+    Write-Host "Get App Info $api_url/repos/$repository/installation"
+    $appinfo = Invoke-RestMethod -Method GET -UseBasicParsing -Headers $headers -Uri "$api_url/repos/$repository/installation"
+    $body = @{}
+    # If repositories are provided, limit the requested repositories to those
+    if ($repositories) {
+        $body += @{ "repositories" = @($repositories | ForEach-Object { $_.SubString($_.LastIndexOf('/')+1) } ) }
+    }
+    # If permissions are provided, limit the requested permissions to those
+    if ($permissions) {
+        $body += @{ "permissions" = $permissions }
+    }
+    Write-Host "Get Token Response $($appInfo.access_tokens_url) with $($body | ConvertTo-Json -Compress)"
+    $tokenResponse = Invoke-RestMethod -Method POST -UseBasicParsing -Headers $headers -Body ($body | ConvertTo-Json -Compress) -Uri $appInfo.access_tokens_url
+    Write-Host "return token"
+    return $tokenResponse.token, $tokenResponse.expires_in
+}
+
+<#
+ .SYNOPSIS
+  Generate JWT for token request
+  As documented here: https://docs.github.com/en/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-json-web-token-jwt-for-a-github-app
+ .PARAMETER gitHubAppClientId
+  The GitHub App Client ID
+ .Parameter privateKey
+  The GitHub App Private Key
+#>
+function GenerateJwtForTokenRequest {
+    Param(
+        [string] $gitHubAppClientId,
+        [string] $privateKey
+    )
+
+    $header = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes((ConvertTo-Json -InputObject @{
+        alg = "RS256"
+        typ = "JWT"
+    }))).TrimEnd('=').Replace('+', '-').Replace('/', '_');
+
+    $payload = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes((ConvertTo-Json -InputObject @{
+        iat = [System.DateTimeOffset]::UtcNow.AddSeconds(-10).ToUnixTimeSeconds()
+        exp = [System.DateTimeOffset]::UtcNow.AddMinutes(10).ToUnixTimeSeconds()
+        iss = $gitHubAppClientId
+    }))).TrimEnd('=').Replace('+', '-').Replace('/', '_');
+    $signature = pwsh -command {
+        $rsa = [System.Security.Cryptography.RSA]::Create()
+        $privateKey = "$($args[1])"
+        $rsa.ImportFromPem($privateKey)
+        $signature = [Convert]::ToBase64String($rsa.SignData([System.Text.Encoding]::UTF8.GetBytes($args[0]), [System.Security.Cryptography.HashAlgorithmName]::SHA256, [System.Security.Cryptography.RSASignaturePadding]::Pkcs1)).TrimEnd('=').Replace('+', '-').Replace('/', '_')
+        Write-OutPut $signature
+    } -args "$header.$payload", $privateKey
+    return "$header.$payload.$signature"
+}