Skip to content

Commit

Permalink
Added the code, examples and UTs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kajalp1079
Kajalp1079 committed Oct 27, 2024
1 parent b183e2b commit 95df2ff
Show file tree
Hide file tree
Showing 13 changed files with 567 additions and 340 deletions.
32 changes: 0 additions & 32 deletions Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppleMDMPushCertificate/settings.json
View file

This file was deleted.

193 changes: 146 additions & 47 deletions ...e/MSFT_IntuneAppleMDMPushCertificate.psm1 → ...eAppleMDMPushNotificationCertificate.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,35 @@ function Get-TargetResource

[Parameter(Mandatory = $true)]
[System.String]
$DisplayName,
$AppleIdentifier,

[Parameter()]
[System.String]
$Certificate,

[Parameter()]
[System.String]
$TopicIdentifier,

[Parameter()]
[System.String]
$CertificateSerialNumber,

[Parameter()]
[System.DateTime]
$LastModifiedDateTime,

[Parameter()]
[System.DateTime]
$ExpirationDateTime,

[Parameter()]
[System.String]
$CertificateUploadStatus,

[Parameter()]
[System.String]
$CertificateUploadFailureReason,

#endregion Intune params

Expand Down Expand Up @@ -78,39 +106,37 @@ function Get-TargetResource

if ($null -eq $instance)
{
$instance = Get-MgBetaDeviceAppManagementMobileAppCategory -MobileAppCategoryId $Id -ErrorAction SilentlyContinue

if ($null -eq $instance)
{
Write-Verbose -Message "Could not find MobileAppCategory by Id {$Id}."

if (-Not [string]::IsNullOrEmpty($DisplayName))
{
$instance = Get-MgBetaDeviceAppManagementMobileAppCategory `
-Filter "DisplayName eq '$DisplayName'" `
-ErrorAction SilentlyContinue
}
}
# There is only one Apple push notification certificate per tenant so no need to filter by Id
$instance = Get-MgBetaDeviceManagementApplePushNotificationCertificate -ErrorAction Stop

if ($null -eq $instance)
{
Write-Verbose -Message "Could not find MobileAppCategory by DisplayName {$DisplayName}."
Write-Verbose -Message "Apple push notification certificate."
return $nullResult
}
}

$results = @{
Id = $instance.Id
DisplayName = $instance.DisplayName
Ensure = 'Present'
Credential = $Credential
ApplicationId = $ApplicationId
TenantId = $TenantId
CertificateThumbprint = $CertificateThumbprint
ApplicationSecret = $ApplicationSecret
ManagedIdentity = $ManagedIdentity.IsPresent
AccessTokens = $AccessTokens
Id = $instance.Id
AppleIdentifier = $instance.AppleIdentifier
Certificate = $instance.Certificate
TopicIdentifier = $instance.TopicIdentifier
CertificateSerialNumber = $instance.CertificateSerialNumber
LastModifiedDateTime = $instance.LastModifiedDateTime
ExpirationDateTime = $instance.ExpirationDateTime
CertificateUploadStatus = $instance.CertificateUploadStatus
CertificateUploadFailureReason = $instance.CertificateUploadFailureReason

Ensure = 'Present'
Credential = $Credential
ApplicationId = $ApplicationId
TenantId = $TenantId
CertificateThumbprint = $CertificateThumbprint
ApplicationSecret = $ApplicationSecret
ManagedIdentity = $ManagedIdentity.IsPresent
AccessTokens = $AccessTokens
}

return [System.Collections.Hashtable] $results
}
catch
Expand Down Expand Up @@ -139,7 +165,35 @@ function Set-TargetResource

[Parameter(Mandatory = $true)]
[System.String]
$DisplayName,
$AppleIdentifier,

[Parameter()]
[System.String]
$Certificate,

[Parameter()]
[System.String]
$TopicIdentifier,

[Parameter()]
[System.String]
$CertificateSerialNumber,

[Parameter()]
[System.DateTime]
$LastModifiedDateTime,

[Parameter()]
[System.DateTime]
$ExpirationDateTime,

[Parameter()]
[System.String]
$CertificateUploadStatus,

[Parameter()]
[System.String]
$CertificateUploadFailureReason,

#endregion Intune params

Expand Down Expand Up @@ -191,29 +245,37 @@ function Set-TargetResource

$currentInstance = Get-TargetResource @PSBoundParameters

$setParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters
$setParameters.Remove('Id') | Out-Null
$SetParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters
$SetParameters.Remove('Id') | Out-Null
$SetParameters.Remove('TopicIdentifier') | Out-Null
$SetParameters.Remove('LastModifiedDateTime') | Out-Null
$SetParameters.Remove('ExpirationDateTime') | Out-Null
$SetParameters.Remove('CertificateUploadStatus') | Out-Null
$SetParameters.Remove('CertificateUploadFailureReason') | Out-Null
$SetParameters.Remove('CertificateSerialNumber') | Out-Null

# CREATE
if ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Absent')
{
Write-Verbose -Message "Creating an Intune App Category with DisplayName {$DisplayName}"
Write-Verbose -Message "Creating an Intune Apple Push Notification Certificate with Apple ID: '$AppleIdentifier'."

New-MgBetaDeviceAppManagementMobileAppCategory @SetParameters
# There is only PATCH request hence using Update cmdlet to post the certificate
Update-MgBetaDeviceManagementApplePushNotificationCertificate @SetParameters
}
# UPDATE
elseif ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Present')
{
Write-Verbose -Message "Updating the Intune App Category with DisplayName {$DisplayName}"

Update-MgBetaDeviceAppManagementMobileAppCategory -MobileAppCategoryId $currentInstance.Id @SetParameters
Write-Verbose -Message "Updating the Intune Apple Push Notification Certificate with Apple ID: '$AppleIdentifier'."
Update-MgBetaDeviceManagementApplePushNotificationCertificate @SetParameters
}
# REMOVE
elseif ($Ensure -eq 'Absent' -and $currentInstance.Ensure -eq 'Present')
{
Write-Verbose -Message "Removing the Intune App Category with DisplayName {$DisplayName}"
Write-Verbose -Message "Removing the Intune Apple Push Notification Certificate with Apple ID: '$AppleIdentifier' by patching with empty certificate."

Remove-MgBetaDeviceAppManagementMobileAppCategory -MobileAppCategoryId $currentInstance.Id -Confirm:$false
# There is only PATCH request hence using Update cmdlet to remove the certificate by passing empty certificate as param.
$params = @{}
Update-MgBetaDeviceManagementApplePushNotificationCertificate $params
}
}

Expand All @@ -231,7 +293,35 @@ function Test-TargetResource

[Parameter(Mandatory = $true)]
[System.String]
$DisplayName,
$AppleIdentifier,

[Parameter()]
[System.String]
$Certificate,

[Parameter()]
[System.String]
$TopicIdentifier,

[Parameter()]
[System.String]
$CertificateSerialNumber,

[Parameter()]
[System.DateTime]
$LastModifiedDateTime,

[Parameter()]
[System.DateTime]
$ExpirationDateTime,

[Parameter()]
[System.String]
$CertificateUploadStatus,

[Parameter()]
[System.String]
$CertificateUploadFailureReason,

#endregion Intune params

Expand Down Expand Up @@ -363,7 +453,7 @@ function Export-TargetResource
try
{
$Script:ExportMode = $true
[array] $Script:exportedInstances = Get-MgBetaDeviceAppManagementMobileAppCategory -ErrorAction Stop
[array] $Script:exportedInstances = Get-MgBetaDeviceManagementApplePushNotificationCertificate -ErrorAction Stop

$i = 1
$dscContent = ''
Expand All @@ -379,17 +469,26 @@ function Export-TargetResource
{
$displayedKey = $config.Id
Write-Host " |---[$i/$($Script:exportedInstances.Count)] $displayedKey" -NoNewline

$params = @{
Id = $config.Id
DisplayName = $config.DisplayName
Ensure = 'Present'
Credential = $Credential
ApplicationId = $ApplicationId
TenantId = $TenantId
CertificateThumbprint = $CertificateThumbprint
ApplicationSecret = $ApplicationSecret
ManagedIdentity = $ManagedIdentity.IsPresent
AccessTokens = $AccessTokens
Id = $config.Id
AppleIdentifier = $config.AppleIdentifier
Certificate = $config.Certificate
TopicIdentifier = $config.TopicIdentifier
CertificateSerialNumber = $config.CertificateSerialNumber
LastModifiedDateTime = $config.LastModifiedDateTime
ExpirationDateTime = $config.ExpirationDateTime
CertificateUploadStatus = $config.CertificateUploadStatus
CertificateUploadFailureReason = $config.CertificateUploadFailureReason

Ensure = 'Present'
Credential = $Credential
ApplicationId = $ApplicationId
TenantId = $TenantId
CertificateThumbprint = $CertificateThumbprint
ApplicationSecret = $ApplicationSecret
ManagedIdentity = $ManagedIdentity.IsPresent
AccessTokens = $AccessTokens
}

$Results = Get-TargetResource @Params
Expand Down
16 changes: 13 additions & 3 deletions ..._IntuneAppleMDMPushCertificate.schema.mof → ...MDMPushNotificationCertificate.schema.mof
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
[ClassVersion("1.0.0.0"), FriendlyName("IntuneAppleMDMPushCertificate")]
class MSFT_IntuneAppleMDMPushCertificate : OMI_BaseResource
[ClassVersion("1.0.0.0"), FriendlyName("IntuneAppleMDMPushNotificationCertificate")]
class MSFT_IntuneAppleMDMPushNotificationCertificate : OMI_BaseResource
{
[Key, Description("The name of the app.")] String DisplayName;
[Key, Description("The name of the Apple Identifier.")] String AppleIdentifier;
[Write, Description("The Apple Push notification certificate.")] String Certificate;

[Write, Description("The unique identifier for an entity. Read-only.")] String Id;
[Write, Description("The Topic Identifier. Also known as Subject Id.")] String TopicIdentifier;
[Write, Description("The upload status of the Apple Push notification certificate.")] String CertificateSerialNumber;

[Write, Description("The last modified DateTime of the Apple Push notification certificate.")] DateTime LastModifiedDateTime;
[Write, Description("The expiration DateTime of the Apple Push notification certificate.")] DateTime ExpirationDateTime;

[Write, Description("The upload status of the Apple Push notification certificate.")] String CertificateUploadStatus;
[Write, Description("The failure reason of upload of the Apple Push notification certificate.")] String CertificateUploadFailureReason;

[Write, Description("Present ensures the instance exists, absent ensures it is removed."), ValueMap{"Present", "Absent"}, Values{"Present", "Absent"}] string Ensure;
[Write, Description("Credentials of the workload's Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;
Expand Down
2 changes: 1 addition & 1 deletion ...T_IntuneAppleMDMPushCertificate/readme.md → ...eMDMPushNotificationCertificate/readme.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# IntuneAppleMDMPushCertificate
# IntuneAppleMDMPushNotificationCertificate

## Description

Expand Down
44 changes: 44 additions & 0 deletions ...Microsoft365DSC/DSCResources/MSFT_IntuneAppleMDMPushNotificationCertificate/settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"resourceName": "IntuneAppleMDMPushCertificate",
"description": "Configures a resource for Apple MDM Push notification certificate used for device enrollment.",
"permissions": {
"graph": {
"delegated": {
"read": [
{
"name": "DeviceManagementManagedDevices.Read.All"
},
{
"name": "DeviceManagementConfiguration.Read.All"
}
],
"update": [
{
"name": "DeviceManagementManagedDevices.ReadWrite.All"
},
{
"name": "DeviceManagementConfiguration.ReadWrite.All"
}
]
},
"application": {
"read": [
{
"name": "DeviceManagementManagedDevices.Read.All"
},
{
"name": "DeviceManagementConfiguration.Read.All"
}
],
"update": [
{
"name": "DeviceManagementManagedDevices.ReadWrite.All"
},
{
"name": "DeviceManagementConfiguration.ReadWrite.All"
}
]
}
}
}
}
Loading

0 comments on commit 95df2ff

Please sign in to comment.