changes for kv

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecUpdateRefreshToken.ps1

@@ -33,7 +33,7 @@ Function Invoke-ExecUpdateRefreshToken {
                 Set-AzKeyVaultSecret -VaultName $kv -Name 'RefreshToken' -SecretValue (ConvertTo-SecureString -String $Request.body.refreshtoken -AsPlainText -Force)
             } else {
                 Write-Host "$($env:TenantID) does not match $($Request.body.tenantId) - we're adding a new secret for the tenant."
-                $name = $Request.body.tenantId -replace '-', '_'
+                $name = $Request.body.tenantId
                 try {
                     Set-AzKeyVaultSecret -VaultName $kv -Name $name -SecretValue (ConvertTo-SecureString -String $Request.body.refreshtoken -AsPlainText -Force)
                 } catch {

Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1

@@ -57,10 +57,9 @@ function Get-CIPPAuthentication {
             $tenants = Get-CIPPAzDataTableEntity @TenantsTable -Filter $Filter
             if ($tenants) {
                 $tenants | ForEach-Object {
-                    $name = $_.tenantId -replace '-', '_'
+                    $name = $_.tenantId
                     $secret = Get-AzKeyVaultSecret -VaultName $keyvaultname -Name $name -AsPlainText -ErrorAction Stop
                     if ($secret) {
-                        #set the name back to the original tenantId
                         $name = $_.customerId
                         Set-Item -Path env:$name -Value $secret -Force
                     }

Modules/CIPPCore/Public/GraphHelper/Get-GraphToken.ps1

@@ -10,12 +10,10 @@ function Get-GraphToken($tenantid, $scope, $AsApp, $AppID, $AppSecret, $refreshT
     $Filter = "PartitionKey eq 'AppCache' and RowKey eq 'AppCache'"
     $AppCache = Get-CIPPAzDataTableEntity @ConfigTable -Filter $Filter
     #force auth update is appId is not the same as the one in the environment variable.
-    Write-Host "My appId pre-launch is $($env:ApplicationID) and the one in the cache is $($AppCache.ApplicationId)"
     if ($AppCache.ApplicationId -and $env:ApplicationID -ne $AppCache.ApplicationId) {
         Write-Host "Setting environment variable ApplicationID to $($AppCache.ApplicationId)"
         $CIPPAuth = Get-CIPPAuthentication
     }
-    Write-Host "My appId post-launch is $($env:ApplicationID) and the one in the cache is $($AppCache.ApplicationId)"
     $refreshToken = $env:RefreshToken
     if (!$tenantid) { $tenantid = $env:TenantID }
     #Get list of tenants that have 'directTenant' set to true