Merge pull request #136 from KelvinTegelaar/master

[pull] master from KelvinTegelaar:master

Author: pull[bot]

.github/workflows/publish_release.yml

@@ -95,6 +95,17 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      # Create version.json with version and commit hash
+      - name: Create version.json
+        run: |
+          VERSION=$(cat version_latest.txt | tr -d '[:space:]')
+          SHORT_SHA="${GITHUB_SHA::7}"
+          echo "{\"version\": \"${VERSION}\", \"commit\": \"${SHORT_SHA}\"}" > version.json
+
+      - name: Build and stage modules
+        shell: pwsh
+        run: ./Tools/Build-DevApiModules.ps1
+
       # Create ZIP File in a New Source Directory
       - name: Prepare and Zip Release Files
         if: env.tag_exists == 'false'

.github/workflows/upload_dev.yml

@@ -25,6 +25,10 @@ jobs:
           SHORT_SHA="${GITHUB_SHA::7}"
           echo "{\"version\": \"${VERSION}\", \"commit\": \"${SHORT_SHA}\"}" > version.json
 
+      - name: Build and stage modules
+        shell: pwsh
+        run: ./Tools/Build-DevApiModules.ps1
+
       # Create ZIP File in a New Source Directory
       - name: Prepare and Zip Release Files
         run: |

Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1

@@ -107,7 +107,7 @@ function New-GraphGetRequest {
                     } else {
                         if ($Data.PSObject.Properties.Name -contains 'value') { $data.value } else { $Data }
                         if ($noPagination -eq $true) {
-                            if ($Caller -eq 'Get-GraphRequestList') {
+                            if ($Caller -eq 'Get-GraphRequestList' -and $data.'@odata.nextLink') {
                                 @{ 'nextLink' = $data.'@odata.nextLink' }
                             }
                             $nextURL = $null

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListGraphRequest.ps1

@@ -159,9 +159,13 @@ function Invoke-ListGraphRequest {
             if ($NextLink -and $Request.Query.TenantFilter -ne 'AllTenants') {
                 Write-Host "NextLink: $NextLink"
                 $Metadata['nextLink'] = $NextLink
+            } else {
+                $Metadata.Remove('nextLink')
             }
-            # Remove nextLink trailing object only if it’s the last item
+            # Remove nextLink trailing object only if it's the last item
             $Results = $Results | Where-Object { $_.PSObject.Properties.Name -notcontains 'nextLink' }
+        } else {
+            $Metadata.Remove('nextLink')
         }
         if ($Request.Query.ListProperties) {
             $Columns = ($Results | Select-Object -First 1).PSObject.Properties.Name

Modules/DNSHealth/1.1.5/DNSHealth.psd1 Modules/DNSHealth/1.1.6/DNSHealth.psd1Modules/DNSHealth/1.1.5/DNSHealth.psd1 renamed to Modules/DNSHealth/1.1.6/DNSHealth.psd1

@@ -12,7 +12,7 @@
     RootModule        = 'DNSHealth.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.1.5'
+    ModuleVersion     = '1.1.6'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

Modules/DNSHealth/1.1.5/DNSHealth.psm1 Modules/DNSHealth/1.1.6/DNSHealth.psm1Modules/DNSHealth/1.1.5/DNSHealth.psm1 renamed to Modules/DNSHealth/1.1.6/DNSHealth.psm1

@@ -1398,13 +1398,13 @@ function Read-MXRecord {
         if ($Result.Status -eq 3) {
             $ValidationFails.Add($NoMxValidation) | Out-Null
             $MXResults.MailProvider = Get-Content "$($MyInvocation.MyCommand.Module.ModuleBase)\MailProviders\Null.json" | ConvertFrom-Json
-            $MXResults.Selectors = $MXRecords.MailProvider.Selectors
+            $MXResults.Selectors = $MXResults.MailProvider.Selectors
         }
 
         else {
             $ValidationFails.Add($NoMxValidation) | Out-Null
             $MXResults.MailProvider = Get-Content "$($MyInvocation.MyCommand.Module.ModuleBase)\MailProviders\Null.json" | ConvertFrom-Json
-            $MXResults.Selectors = $MXRecords.MailProvider.Selectors
+            $MXResults.Selectors = $MXResults.MailProvider.Selectors
         }
         $MXRecords = $null
     }
@@ -1439,8 +1439,8 @@ function Read-MXRecord {
                     try { Get-Content $_ | ConvertFrom-Json -ErrorAction Stop }
                     catch { Write-Verbose $_.Exception.Message }
                 }
+                $ProviderMatched = $false
                 foreach ($Record in $MXRecords) {
-                    $ProviderMatched = $false
                     foreach ($Provider in $ProviderList) {
                         try {
                             if ($Record.Hostname -match $Provider.MxMatch) {
@@ -1450,35 +1450,24 @@ function Read-MXRecord {
                                     foreach ($Var in $Provider.SpfReplace) {
                                         if ($ReservedVariables.Keys -contains $Var) {
                                             $ReplaceList.Add($ReservedVariables.$Var) | Out-Null
-                                        }
-
-                                        else {
+                                        } else {
                                             $ReplaceList.Add($Matches.$Var) | Out-Null
                                         }
                                     }
-
-                                    else {
-                                        $ReplaceList.Add($Matches.$Var) | Out-Null
-                                    }
                                 }
 
                                 $ExpectedInclude = $Provider.SpfInclude -f ($ReplaceList -join ', ')
+                                # Set ExpectedInclude and Selector fields based on provider details
+                                $MXResults.ExpectedInclude = $ExpectedInclude
+                                $MXResults.Selectors = $Provider.Selectors
+                                $ProviderMatched = $true
+                                break
                             }
-
-                            else {
-                                $ExpectedInclude = $Provider.SpfInclude
-                            }
-
-                            # Set ExpectedInclude and Selector fields based on provider details
-                            $MXResults.ExpectedInclude = $ExpectedInclude
-                            $MXResults.Selectors = $Provider.Selectors
-                            $ProviderMatched = $true
-                            break
                         } catch { Write-Verbose $_.Exception.Message }
                     }
-                }
-                if ($ProviderMatched) {
-                    break
+                    if ($ProviderMatched) {
+                        break
+                    }
                 }
             }
         }
@@ -1489,7 +1478,7 @@ function Read-MXRecord {
     $MXResults.Records = @($MXResults.Records)
     $MXResults
 }
-#EndRegion './Public/Records/Read-MXRecord.ps1' 155
+#EndRegion './Public/Records/Read-MXRecord.ps1' 144
 #Region './Public/Records/Read-NSRecord.ps1' -1
 
 function Read-NSRecord {