Skip to content

Commit

Permalink
Merge pull request KelvinTegelaar#412 from KelvinTegelaar/dev
Browse files Browse the repository at this point in the history
Dev to hotfix
  • Loading branch information
KelvinTegelaar authored Aug 29, 2023
2 parents 3f5acf2 + e599c66 commit 96ea97a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Modules/CIPPCore/Public/Get-CIPPAuthentication.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ function Get-CIPPAuthentication {
$ENV:tenantid = (Get-AzKeyVaultSecret -VaultName $ENV:WEBSITE_DEPLOYMENT_ID -Name "TenantId" -AsPlainText)
$ENV:refreshtoken = (Get-AzKeyVaultSecret -VaultName $ENV:WEBSITE_DEPLOYMENT_ID -Name "RefreshToken" -AsPlainText)
$ENV:SetFromProfile = $true
Write-LogMessage -message "Reloaded authentication data from KeyVault" -Sev 'info'
Write-LogMessage -message "Reloaded authentication data from KeyVault" -Sev 'info' -API "CIPP Authentication"

return $true
}
catch {
Write-LogMessage -message "Could not retrieve keys from Keyvault: $($_.Exception.Message)" -Sev 'CRITICAL'
Write-LogMessage -message "Could not retrieve keys from Keyvault: $($_.Exception.Message)" -Sev 'CRITICAL' -API "CIPP Authentication"
return $false
}
}
Expand Down
1 change: 0 additions & 1 deletion Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ function New-CIPPCAPolicy {
$JsonObj.grantControls.PSObject.Properties.Remove('authenticationStrength@odata.context')
if ($JSONObj.conditions.users.excludeGuestsOrExternalUsers.externalTenants.Members) {
$JsonObj.conditions.users.excludeGuestsOrExternalUsers.externalTenants.PSObject.Properties.Remove('@odata.context')
$JsonObj.conditions.users.excludeGuestsOrExternalUsers.externalTenants.PSObject.Properties.Remove('@odata.type')
}
if ($State -and $State -ne 'donotchange') {
$Jsonobj.state = $State
Expand Down
2 changes: 1 addition & 1 deletion version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
4.1.1

0 comments on commit 96ea97a

Please sign in to comment.