Skip to content

[pull] master from KelvinTegelaar:master #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 12, 2025
Merged

[pull] master from KelvinTegelaar:master #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c82ca67
fix combined setup
JohnDuprey Sep 12, 2025
567c049
Merge pull request #1612 from KelvinTegelaar/dev
JohnDuprey Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCombinedSetup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ function Invoke-ExecCombinedSetup {
if ($Request.Body.tenantId) { $Secret.TenantId = $Request.Body.tenantid }
if ($Request.Body.applicationId) { $Secret.ApplicationId = $Request.Body.applicationId }
if ($Request.Body.ApplicationSecret) { $Secret.ApplicationSecret = $Request.Body.ApplicationSecret }
if ($Request.Body.RefreshToken) { $Secret.RefreshToken = $Request.Body.RefreshToken }
Add-CIPPAzDataTableEntity @DevSecretsTable -Entity $Secret -Force
$Results.add('Manual credentials have been set in the DevSecrets table.')
} else {
Expand All @@ -100,6 +101,10 @@ function Invoke-ExecCombinedSetup {
Set-AzKeyVaultSecret -VaultName $kv -Name 'applicationsecret' -SecretValue (ConvertTo-SecureString -String $Request.Body.applicationSecret -AsPlainText -Force)
$Results.add('Set application secret in Key Vault.')
}
if ($Request.Body.RefreshToken) {
Set-AzKeyVaultSecret -VaultName $kv -Name 'refreshtoken' -SecretValue (ConvertTo-SecureString -String $Request.Body.RefreshToken -AsPlainText -Force)
$Results.add('Set refresh token in Key Vault.')
}
}

$Results.add('Manual credentials setup has been completed.')
Expand Down