Skip to content

Commit 365aa68

Browse files
JohnDupreyJohnDuprey
committed
more casing
1 parent c6fe54a commit 365aa68

37 files changed

+92
-92
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/New-CIPPAPIConfig.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ 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

‎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)"

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-GetCippAlerts.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Function Invoke-GetCippAlerts {
4343
Write-LogMessage -message 'Your CIPP API is out of date. Please update to the latest version' -API 'Updates' -tenant 'All Tenants' -sev Alert
4444
}
4545

46-
if ($env:ApplicationID -eq 'LongApplicationID' -or $null -eq $ENV:ApplicationID) {
46+
if ($env:ApplicationID -eq 'LongApplicationID' -or $null -eq $env:ApplicationID) {
4747
$Alerts.Add(@{
4848
title = 'SAM Setup Incomplete'
4949
Alert = 'You have not yet completed your setup. Please go to the Setup Wizard in Application Settings to connect CIPP to your tenants.'

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionsConfig.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Function Invoke-ExecExtensionsConfig {
3838
Write-Information 'Not sending to keyvault. Key previously set or left blank.'
3939
} else {
4040
Write-Information 'writing API Key to keyvault, and clearing.'
41-
Write-Information "$ENV:WEBSITE_DEPLOYMENT_ID"
41+
Write-Information "$env:WEBSITE_DEPLOYMENT_ID"
4242
if ($Body.$APIKey.APIKey) {
4343
Set-ExtensionAPIKey -Extension $APIKey -APIKey $Body.$APIKey.APIKey
4444
}

‎Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecAccessChecks.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Function Invoke-ExecAccessChecks {
2929
$Results = $null
3030
}
3131
if (!$Results) {
32-
$Results = Test-CIPPAccessPermissions -tenantfilter $ENV:TenantID -APIName $APINAME -Headers $Request.Headers
32+
$Results = Test-CIPPAccessPermissions -tenantfilter $env:TenantID -APIName $APINAME -Headers $Request.Headers
3333
} else {
3434
try {
3535
$LastRun = [DateTime]::SpecifyKind($Cache.Timestamp.DateTime, [DateTimeKind]::Utc)
@@ -38,14 +38,14 @@ Function Invoke-ExecAccessChecks {
3838
}
3939
}
4040
} else {
41-
$Results = Test-CIPPAccessPermissions -tenantfilter $ENV:TenantID -APIName $APINAME -Headers $Request.Headers
41+
$Results = Test-CIPPAccessPermissions -tenantfilter $env:TenantID -APIName $APINAME -Headers $Request.Headers
4242
}
4343
}
4444
'Tenants' {
4545
$AccessChecks = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'TenantAccessChecks'"
4646
if (!$Request.Body.TenantId) {
4747
try {
48-
$Tenants = Get-Tenants -IncludeErrors | Where-Object { $_.customerId -ne $ENV:TenantID }
48+
$Tenants = Get-Tenants -IncludeErrors | Where-Object { $_.customerId -ne $env:TenantID }
4949
$Results = foreach ($Tenant in $Tenants) {
5050
$TenantCheck = $AccessChecks | Where-Object -Property RowKey -EQ $Tenant.customerId | Select-Object -Property Data
5151
$TenantResult = [PSCustomObject]@{

0 commit comments

Comments
 (0)