Add Get/Read operations, better credential refreshing

ABMPS.psd1

@@ -12,7 +12,7 @@
     RootModule        = 'AppleBusinessManager.psm1'
 
     # Version number of this module.
-ModuleVersion     = '1.1'
+    ModuleVersion     = '1.2'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

AppleBusinessManager.psm1

@@ -7,6 +7,12 @@ function Connect-AppleBusinessManager {
         [string][Parameter(ParameterSetName = 'PrivateKeyAsString', Mandatory)]$PrivateKey,
         [string][Parameter(ParameterSetName = 'PrivateKeyAsString', Mandatory)]$PrivateKeyId
     )
+
+    if ($PSBoundParameters.Count -eq 0) {
+        # Parameters were not bound, check to see if they're already set before attempting to authenticate
+        Write-Verbose "Checking to see if existing credentials were set at a script scope that can be re-used"
+        if (-not $Script:ClientId -or -not $Script:PrivateKey -or -not $Script:PrivateKeyId) {
+            Write-Verbose "Existing credentials not loaded, checking for environment variables"
             if ($PSCmdlet.ParameterSetName -eq 'EnvironmentVariable') {
                 if (-not $Env:AppleBusinessManagerClientId -or -not $Env:AppleBusinessManagerPrivateKeyId -or -not $Env:AppleBusinessManagerPrivateKey) {
                     throw "Client ID, Private Key ID and Private Key environment variables were not set for Apple Business Manager"
@@ -15,6 +21,16 @@ function Connect-AppleBusinessManager {
                 $Script:PrivateKey = $Env:AppleBusinessManagerPrivateKey
                 $Script:PrivateKeyId = $Env:AppleBusinessManagerPrivateKeyId
             }
+        }
+    }
+    
+    if ($PSCmdlet.ParameterSetName -eq 'PrivateKeyAsString') {
+        # Assign the parameters to script scope so we can reuse them later
+        $Script:ClientId = $ClientId
+        $Script:PrivateKey = $PrivateKey
+        $Script:PrivateKeyId = $PrivateKeyId
+    }
+
     $Header = @{
         'kid' = $Script:PrivateKeyId
     }
@@ -72,17 +88,93 @@ function Invoke-AppleBusinessManagerPagedApiRequest {
     )
     $Results = New-Object System.Collections.ArrayList
     while ($Uri) {
+        Write-Verbose "Making request to $Uri"
         $Result = Invoke-RestMethod $Uri -Authentication Bearer -Token (Get-AppleBusinessManagerBearerToken) -ErrorAction Stop
         $Uri = $Result.links.next
-        $Results.AddRange($Result.data) | Out-Null
+        $Results.AddRange(@($Result.data)) | Out-Null
     }
     return $Results
 }
 
-function Get-AppleBusinessManagerOrgDevices {
+function Get-AppleBusinessManagerOrgDevice {
-    return Invoke-AppleBusinessManagerPagedApiRequest -Uri "https://api-business.apple.com/v1/orgDevices"
+    [Alias('Get-AppleBusinessManagerOrgDevices')]
+    param (
+        [Parameter(Mandatory, ParameterSetName = 'Read')][string] $OrgDeviceId,
+        [Parameter(ParameterSetName = 'Read')]
+        [Parameter(ParameterSetName = 'List')]
+        [string[]] $Fields,
+        [Parameter( ParameterSetName = 'Read')]
+        [Parameter(ParameterSetName = 'List')]
+        [int] $Limit
+    )
+    $Uri = switch ($PSCmdlet.ParameterSetName) {
+        'Read' { "https://api-business.apple.com/v1/orgDevices/$([System.Web.HttpUtility]::UrlEncode($OrgDeviceId))" }
+        Default { "https://api-business.apple.com/v1/orgDevices" }
+    }
+    $UriBuilder = [System.UriBuilder]::new($Uri)
+    $QueryString = [System.Web.HttpUtility]::ParseQueryString($UriBuilder.Query)
+    if ($PSBoundParameters.ContainsKey('Fields')) {
+        $QueryString.Set('fields[orgDevices]', $Fields -join ',')
+    }
+    if ($PSBoundParameters.ContainsKey('Limit')) {
+        $QueryString.Set('limit', $Limit)
+    }
+    $UriBuilder.Query = $QueryString.ToString()
+    return Invoke-AppleBusinessManagerPagedApiRequest -Uri $UriBuilder.Uri
 }
 
-function Get-AppleBusinessManagerMdmServers {
+function Get-AppleBusinessManagerOrgDeviceMdmServerId {
-    return Invoke-AppleBusinessManagerPagedApiRequest -Uri "https://api-business.apple.com/v1/mdmServers"
+    param (
+        [Parameter(Mandatory)]
+        [string] $OrgDeviceId
+    )
+    return Invoke-AppleBusinessManagerPagedApiRequest -Uri "https://api-business.apple.com/v1/orgDevices/$([System.Web.HttpUtility]::UrlEncode($OrgDeviceId))/relationships/assignedServer"
+}
+
+function Get-AppleBusinessManagerOrgDeviceMdmServer {
+    param (
+        [Parameter(Mandatory)]
+        [string] $OrgDeviceId,
+        [string[]] $Fields
+    )
+    $UriBuilder = [System.UriBuilder]::new("https://api-business.apple.com/v1/orgDevices/$([System.Web.HttpUtility]::UrlEncode($OrgDeviceId))/assignedServer")
+    $QueryString = [System.Web.HttpUtility]::ParseQueryString($UriBuilder.Query)
+    if ($PSBoundParameters.ContainsKey('Fields')) {
+        $QueryString.Set('fields[mdmServers]', $Fields -join ',')
+    }
+    $UriBuilder.Query = $QueryString.ToString()
+    return Invoke-AppleBusinessManagerPagedApiRequest -Uri $UriBuilder.Uri
+}
+
+function Get-AppleBusinessManagerMdmServer {
+    [Alias('Get-AppleBusinessManagerMdmServers')]
+    param (
+        [string[]] $Fields,
+        [int] $Limit
+    )
+    $UriBuilder = [System.UriBuilder]::new("https://api-business.apple.com/v1/mdmServers")
+    $QueryString = [System.Web.HttpUtility]::ParseQueryString($UriBuilder.Query)
+    if ($PSBoundParameters.ContainsKey('Fields')) {
+        $QueryString.Set('fields[mdmServers]', $Fields -join ',')
+    }
+    if ($PSBoundParameters.ContainsKey('Limit')) {
+        $QueryString.Set('limit', $Limit)
+    }
+    $UriBuilder.Query = $QueryString.ToString()
+    return Invoke-AppleBusinessManagerPagedApiRequest -Uri $UriBuilder.Uri
+}
+
+function Get-AppleBusinessManagerMdmServerDevice {
+    param (
+        [Parameter(Mandatory)]
+        [string] $MdmServerId,
+        [int] $Limit
+    )
+    $UriBuilder = [System.UriBuilder]::new("https://api-business.apple.com/v1/mdmServers/$([System.Web.HttpUtility]::UrlEncode($MdmServerId))/relationships/devices")
+    $QueryString = [System.Web.HttpUtility]::ParseQueryString($UriBuilder.Query)
+    if ($PSBoundParameters.ContainsKey('Limit')) {
+        $QueryString.Set('limit', $Limit)
+    }
+    $UriBuilder.Query = $QueryString.ToString()
+    return Invoke-AppleBusinessManagerPagedApiRequest -Uri $UriBuilder.Uri
 }