Skip to content

Commit 96872fb

Browse files
pull[bot]pull[bot]
authored
Merge pull request #187 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 8b8525f + 88fa2f4 commit 96872fb

File tree

49 files changed

+654
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+654
-127
lines changed

‎AddChocoApp/IntunePackage/Install.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ param (
1919

2020
try {
2121
if ($Trace) { Start-Transcript -Path (Join-Path $env:windir "\temp\choco-$Packagename-trace.log") }
22-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
22+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
2323

2424
if ($InstallChoco) {
2525
if (-not (Test-Path $chocoPath)) {
2626
try {
2727
Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
28-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
28+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
2929
}
3030
catch {
3131
Write-Host "InstallChoco Error: $($_.Exception.Message)"
@@ -45,7 +45,7 @@ try {
4545
& "$chocoPath" install $Packagename -y $CustomRepoString
4646
}
4747
Write-Host 'Completed.'
48-
}
48+
}
4949
catch {
5050
Write-Host "Install/upgrade error: $($_.Exception.Message)"
5151
}

‎AddChocoApp/IntunePackage/Uninstall.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ param (
44
[string]
55
$Packagename
66
)
7-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
7+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
88
& $Chocopath uninstall $Packagename -y
99

‎Modules/CIPPCore/Public/Add-CIPPApplicationPermission.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Add-CIPPApplicationPermission {
55
$ApplicationId,
66
$Tenantfilter
77
)
8-
if ($ApplicationId -eq $ENV:ApplicationID -and $Tenantfilter -eq $env:TenantID) {
8+
if ($ApplicationId -eq $env:ApplicationID -and $Tenantfilter -eq $env:TenantID) {
99
#return @('Cannot modify application permissions for CIPP-SAM on partner tenant')
1010
$RequiredResourceAccess = 'CIPPDefaults'
1111
}

‎Modules/CIPPCore/Public/Add-CIPPDelegatedPermission.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function Add-CIPPDelegatedPermission {
99
Write-Host 'Adding Delegated Permissions'
1010
Set-Location (Get-Item $PSScriptRoot).FullName
1111

12-
if ($ApplicationId -eq $ENV:ApplicationID -and $Tenantfilter -eq $env:TenantID) {
12+
if ($ApplicationId -eq $env:ApplicationID -and $Tenantfilter -eq $env:TenantID) {
1313
#return @('Cannot modify delgated permissions for CIPP-SAM on partner tenant')
1414
$RequiredResourceAccess = 'CIPPDefaults'
1515
}

‎Modules/CIPPCore/Public/Authentication/Get-CippApiAuth.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ function Get-CippApiAuth {
77
if ($env:MSI_SECRET) {
88
Disable-AzContextAutosave -Scope Process | Out-Null
99
$null = Connect-AzAccount -Identity
10-
$SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
10+
$SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
11+
$Context = Set-AzContext -SubscriptionId $SubscriptionId
1112
} else {
1213
$Context = Get-AzContext
1314
$SubscriptionId = $Context.Subscription.Id

‎Modules/CIPPCore/Public/Authentication/New-CIPPAPIConfig.ps1‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@ function New-CIPPAPIConfig {
5555
enableAccessTokenIssuance = $false
5656
enableIdTokenIssuance = $true
5757
}
58-
redirectUris = @("https://$($ENV:Website_hostname)/.auth/login/aad/callback")
58+
redirectUris = @("https://$($env:WEBSITE_HOSTNAME)/.auth/login/aad/callback")
5959
}
6060
} | ConvertTo-Json -Depth 10 -Compress
6161

6262
if ($PSCmdlet.ShouldProcess($AppName, 'Create API App')) {
6363
Write-Information 'Creating app'
64+
Write-Information $CreateBody
6465
$APIApp = New-GraphPOSTRequest -uri 'https://graph.microsoft.com/v1.0/applications' -AsApp $true -NoAuthCheck $true -type POST -body $CreateBody
6566
Write-Information 'Creating password'
6667
$APIPassword = New-GraphPOSTRequest -uri "https://graph.microsoft.com/v1.0/applications/$($APIApp.id)/addPassword" -AsApp $true -NoAuthCheck $true -type POST -body "{`"passwordCredential`":{`"displayName`":`"Generated by API Setup`"}}"
@@ -118,9 +119,6 @@ function New-CIPPAPIConfig {
118119
$ErrorMessage = Get-CippException -Exception $_
119120
Write-Information ($ErrorMessage | ConvertTo-Json -Depth 10)
120121
Write-LogMessage -headers $Headers -API $APINAME -tenant 'None' -message "Failed to setup CIPP-API Access: $($ErrorMessage.NormalizedError) Linenumber: $($_.InvocationInfo.ScriptLineNumber)" -Sev 'Error' -LogData $ErrorMessage
121-
return @{
122-
Results = "Failed to setup CIPP-API Access: $($ErrorMessage.NormalizedError)"
123-
}
124-
122+
throw "Failed to setup CIPP-API Access: $($ErrorMessage.NormalizedError)"
125123
}
126124
}

‎Modules/CIPPCore/Public/Authentication/Set-CippApiAuth.ps1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function Set-CippApiAuth {
1010
if ($env:MSI_SECRET) {
1111
Disable-AzContextAutosave -Scope Process | Out-Null
1212
$null = Connect-AzAccount -Identity
13-
$SubscriptionId = $ENV:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
13+
$SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
1414
$Context = Set-AzContext -SubscriptionId $SubscriptionId
1515
} else {
1616
$Context = Get-AzContext
@@ -20,6 +20,8 @@ function Set-CippApiAuth {
2020
# Get auth settings
2121
$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
2222

23+
Write-Information "AuthSettings: $($AuthSettings | ConvertTo-Json -Depth 10)"
24+
2325
# Set allowed audiences
2426
$AllowedAudiences = foreach ($ClientId in $ClientIds) {
2527
"api://$ClientId"

‎Modules/CIPPCore/Public/Entrypoints/Activity Triggers/BEC/Push-BECRun.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ function Push-BECRun {
9696
Write-Information 'Getting rules'
9797

9898
try {
99-
$RulesLog = New-ExoRequest -cmdlet 'Get-InboxRule' -tenantid $TenantFilter -cmdParams @{ Mailbox = $Username; IncludeHidden = $true } -Anchor $Username
99+
$RulesLog = New-ExoRequest -cmdlet 'Get-InboxRule' -tenantid $TenantFilter -cmdParams @{ Mailbox = $Username; IncludeHidden = $true } -Anchor $Username |
100+
Where-Object { $_.Name -ne 'Junk E-Mail Rule' -and $_.Name -notlike 'Microsoft.Exchange.OOF.*' }
100101
} catch {
101102
Write-Host 'Failed to get rules: ' + $_.Exception.Message
102103
$RulesLog = @()

‎Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ Function Push-ExecOnboardTenantQueue {
315315
$LastCPVError = ''
316316
do {
317317
try {
318-
Add-CIPPApplicationPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $Relationship.customer.tenantId
319-
Add-CIPPDelegatedPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $Relationship.customer.tenantId
318+
Add-CIPPApplicationPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $env:ApplicationID -tenantfilter $Relationship.customer.tenantId
319+
Add-CIPPDelegatedPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $env:ApplicationID -tenantfilter $Relationship.customer.tenantId
320320
$CPVSuccess = $true
321321
$Refreshing = $false
322322
} catch {

‎Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-UpdatePermissionsQueue.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ function Push-UpdatePermissionsQueue {
1616
$Table = Get-CIPPTable -TableName cpvtenants
1717
$CPVRows = Get-CIPPAzDataTableEntity @Table | Where-Object -Property Tenant -EQ $Item.customerId
1818

19-
if (!$CPVRows -or $ENV:ApplicationID -notin $CPVRows.applicationId) {
19+
if (!$CPVRows -or $env:ApplicationID -notin $CPVRows.applicationId) {
2020
Write-LogMessage -tenant $Item.defaultDomainName -tenantId $Item.customerId -message 'A New tenant has been added, or a new CIPP-SAM Application is in use' -Sev 'Warn' -API 'NewTenant'
2121
Write-Information 'Adding CPV permissions'
2222
Set-CIPPCPVConsent -Tenantfilter $Item.customerId
2323
$DomainRefreshRequired = $true
2424
}
2525
Write-Information 'Updating permissions'
26-
Add-CIPPApplicationPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $Item.customerId
27-
Add-CIPPDelegatedPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $ENV:ApplicationID -tenantfilter $Item.customerId
26+
Add-CIPPApplicationPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $env:ApplicationID -tenantfilter $Item.customerId
27+
Add-CIPPDelegatedPermission -RequiredResourceAccess 'CIPPDefaults' -ApplicationId $env:ApplicationID -tenantfilter $Item.customerId
2828
Write-LogMessage -tenant $Item.defaultDomainName -tenantId $Item.customerId -message "Updated permissions for $($Item.displayName)" -Sev 'Info' -API 'UpdatePermissionsQueue'
2929

3030
if ($Item.defaultDomainName -ne 'PartnerTenant') {
@@ -36,7 +36,7 @@ function Push-UpdatePermissionsQueue {
3636
$unixtime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
3737
$GraphRequest = @{
3838
LastApply = "$unixtime"
39-
applicationId = "$($ENV:ApplicationID)"
39+
applicationId = "$($env:ApplicationID)"
4040
Tenant = "$($Item.customerId)"
4141
PartitionKey = 'Tenant'
4242
RowKey = "$($Item.customerId)"

0 commit comments

Comments
 (0)