Skip to content

Commit 27c4d18

Browse files
cleaned up standards deployment. New assigns via set-intunepolicy
1 parent 44b3e93 commit 27c4d18

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ function Invoke-CIPPStandardIntuneTemplate {
2222
$RawJSON = $Request.body.RawJSON
2323
$TemplateTypeURL = $Request.body.Type
2424

25-
Set-CIPPIntunePolicy -TemplateType $Request.body.Type -Description $description -DisplayName $displayname -RawJSON $RawJSON -AssignTo $null -tenantFilter $Tenant
25+
Set-CIPPIntunePolicy -TemplateType $Request.body.Type -Description $description -DisplayName $displayname -RawJSON $RawJSON -AssignTo $Template.AssignedTo -tenantFilter $Tenant
2626

27-
#Legacy assign.
27+
#Legacy assign, only required for older templates.
2828
if ($Settings.AssignTo) {
2929
Write-Host "Assigning Policy to $($Settings.AssignTo) the create ID is $($CreateRequest)"
3030
if ($Settings.AssignTo -eq 'customGroup') { $Settings.AssignTo = $Settings.customGroup }
@@ -37,16 +37,6 @@ function Invoke-CIPPStandardIntuneTemplate {
3737
}
3838
}
3939

40-
if ($Template.AssignedTo) {
41-
Write-Host "New: Assigning Policy to $($Template.AssignedTo) the create ID is $($CreateRequest)"
42-
if ($ExistingID) {
43-
Set-CIPPAssignedPolicy -PolicyId $ExistingID.id -TenantFilter $tenant -GroupName $Template.AssignedTo -Type $TemplateTypeURL
44-
Write-LogMessage -API 'Standards' -tenant $tenant -message "Successfully updated Intune Template $PolicyName policy for $($Tenant)" -sev 'Info'
45-
} else {
46-
Set-CIPPAssignedPolicy -PolicyId $CreateRequest.id -TenantFilter $tenant -GroupName $Template.AssignedTo -Type $TemplateTypeURL
47-
Write-LogMessage -API 'Standards' -tenant $tenant -message "Successfully created Intune Template $PolicyName policy for $($Tenant)" -sev 'Info'
48-
}
49-
}
5040
} catch {
5141
$ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
5242
Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update Intune Template $PolicyName, Error: $ErrorMessage" -sev 'Error'

0 commit comments

Comments
 (0)