Skip to content

[pull] dev from KelvinTegelaar:dev #178

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 1 commit into from
Mar 28, 2025
+5 −6
Merged

[pull] dev from KelvinTegelaar:dev #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Modules/CIPPCore/Public/Authentication/Get-CippApiAuth.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
function Get-CippApiAuth {
Param(
param(
[string]$RGName,
[string]$FunctionAppName
)

if ($env:MSI_SECRET) {
Disable-AzContextAutosave -Scope Process | Out-Null
$Context = (Connect-AzAccount -Identity).Context
$null = Connect-AzAccount -Identity
$SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
} else {
$Context = Get-AzContext
$SubscriptionId = $Context.Subscription.Id
}
# Get subscription id
$SubscriptionId = $Context.Subscription.Id

# Get auth settings
$AuthSettings = Invoke-AzRestMethod -Uri "https://management.azure.com/subscriptions/$SubscriptionId/resourceGroups/$RGName/providers/Microsoft.Web/sites/$($FunctionAppName)/config/authsettingsV2/list?api-version=2020-06-01" -ErrorAction Stop | Select-Object -ExpandProperty Content | ConvertFrom-Json
Expand Down
3 changes: 1 addition & 2 deletions Modules/CIPPCore/Public/Authentication/Set-CippApiAuth.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ function Set-CippApiAuth {
$Context = Set-AzContext -SubscriptionId $SubscriptionId
} else {
$Context = Get-AzContext
$SubscriptionId = $Context.Subscription.Id
}
# Get subscription id
$SubscriptionId = $Context.Subscription.Id

# Get auth settings
$AuthSettings = Invoke-AzRestMethod -Uri "https://management.azure.com/subscriptions/$SubscriptionId/resourceGroups/$RGName/providers/Microsoft.Web/sites/$($FunctionAppName)/config/authsettingsV2/list?api-version=2020-06-01" | Select-Object -ExpandProperty Content | ConvertFrom-Json
Expand Down