Merge pull request #1114 from JohnDuprey/dev

Bugfixes
KelvinTegelaar · Sep 7, 2024 · 9d489ed · 9d489ed
2 parents 5f35efe + 577e7b4
commit 9d489ed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CIPPTimers.json b/CIPPTimers.json
@@ -59,9 +59,10 @@
   {
     "Command": "Start-CIPPGraphSubscriptionRenewalTimer",
     "Description": "Orchestrator to renew Graph subscriptions",
-    "Cron": "0 10 * * * *",
+    "Cron": "0 15 * * * *",
     "Priority": 8,
-    "RunOnProcessor": true
+    "RunOnProcessor": true,
+    "IsSystem": true
   },
   {
     "Command": "Start-DomainOrchestrator",

diff --git a/Modules/CippExtensions/Public/Gradient/Get-GradientToken.ps1 b/Modules/CippExtensions/Public/Gradient/Get-GradientToken.ps1
@@ -4,7 +4,8 @@ function Get-GradientToken {
     )
     if ($Configuration.vendorKey) {
         $null = Connect-AzAccount -Identity
-        $partnerApiKey = (Get-AzKeyVaultSecret -VaultName $ENV:WEBSITE_DEPLOYMENT_ID -Name 'Gradient' -AsPlainText)
+        $keyvaultname = $ENV:WEBSITE_DEPLOYMENT_ID -replace '-proc$', ''
+        $partnerApiKey = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name 'Gradient' -AsPlainText)
         $authorizationToken = [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes("$($configuration.vendorKey):$($partnerApiKey)"))
 
         $headers = [hashtable]@{

diff --git a/Modules/CippExtensions/Public/Hudu/Connect-HuduAPI.ps1 b/Modules/CippExtensions/Public/Hudu/Connect-HuduAPI.ps1
@@ -8,9 +8,10 @@ function Connect-HuduAPI {
         $DevSecretsTable = Get-CIPPTable -tablename 'DevSecrets'
         $APIKey = (Get-CIPPAzDataTableEntity @DevSecretsTable -Filter "PartitionKey eq 'Hudu' and RowKey eq 'Hudu'").APIKey
     } else {
+        $keyvaultname = $ENV:WEBSITE_DEPLOYMENT_ID -replace '-proc$', ''
         $null = Connect-AzAccount -Identity
-        $APIKey = (Get-AzKeyVaultSecret -VaultName $ENV:WEBSITE_DEPLOYMENT_ID -Name 'Hudu' -AsPlainText)
+        $APIKey = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name 'Hudu' -AsPlainText)
     }
     New-HuduBaseURL -BaseURL $Configuration.BaseURL
     New-HuduAPIKey -ApiKey $APIKey
-}
+}
diff --git a/Modules/CippExtensions/Public/NinjaOne/Get-NinjaOneToken.ps1 b/Modules/CippExtensions/Public/NinjaOne/Get-NinjaOneToken.ps1
@@ -11,7 +11,8 @@ function Get-NinjaOneToken {
             $ClientSecret = (Get-CIPPAzDataTableEntity @DevSecretsTable -Filter "PartitionKey eq 'NinjaOne' and RowKey eq 'NinjaOne'").APIKey
         } else {
             $null = Connect-AzAccount -Identity
-            $ClientSecret = (Get-AzKeyVaultSecret -VaultName $ENV:WEBSITE_DEPLOYMENT_ID -Name 'NinjaOne' -AsPlainText)
+            $keyvaultname = $ENV:WEBSITE_DEPLOYMENT_ID -replace '-proc$', ''
+            $ClientSecret = (Get-AzKeyVaultSecret -VaultName $keyvaultname -Name 'NinjaOne' -AsPlainText)
         }
     } else {
         $ClientSecret = $ENV:NinjaClientSecret
@@ -37,4 +38,4 @@ function Get-NinjaOneToken {
     }
     return $token
 
-}
+}