Merge pull request #1 from KelvinTegelaar/master

[pull] master from KelvinTegelaar:master
KelvinTegelaar · Jul 22, 2023 · db7b75f · db7b75f
2 parents e8f7d1e + bfa3321
commit db7b75f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/ListLicenses/run.ps1 b/ListLicenses/run.ps1
@@ -20,9 +20,9 @@ else {
     $Rows = Get-AzDataTableEntity @Table | Where-Object -Property Timestamp -GT (Get-Date).AddHours(-1)
     if (!$Rows) {
         Push-OutputBinding -Name Msg -Value (Get-Date).ToString()
-        [PSCustomObject]@{
-            Tenant   = 'Loading data for all tenants. Please check back in 1 minute'
-            Licenses = 'Loading data for all tenants. Please check back in 1 minute'
+        $GraphRequest = [PSCustomObject]@{
+            Tenant  = 'Loading data for all tenants. Please check back in 1 minute'
+            License = 'Loading data for all tenants. Please check back in 1 minute'
         }
     }         
     else {

diff --git a/Modules/CIPPCore/Public/New-CIPPAPIConfig.ps1 b/Modules/CIPPCore/Public/New-CIPPAPIConfig.ps1
@@ -42,7 +42,8 @@ function New-CIPPAPIConfig {
         if ($resetpassword) {
             Write-Host "Removing all old passwords"
             $RemovePasswords = New-GraphPOSTRequest -type Patch -uri "https://graph.microsoft.com/v1.0/applications/$($APIApp.id)/" -body '{"passwordCredentials":[]}' -NoAuthCheck $true
-            $APIPassword = New-GraphPOSTRequest -uri "https://graph.microsoft.com/v1.0/applications/$($APIApp.id)/addPassword"  -NoAuthCheck $true -type POST -body "{`"passwordCredential`":{`"displayName`":`"Generated by API Setup`",`"startDateTime`":`"2023-07-20T12:47:59.217Z`",`"endDateTime`":`"2033-07-20T12:47:59.217Z`"}}"
+            $passwordDate = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
+            $APIPassword = New-GraphPOSTRequest -uri "https://graph.microsoft.com/v1.0/applications/$($APIApp.id)/addPassword"  -NoAuthCheck $true -type POST -body "{`"passwordCredential`":{`"displayName`":`"Generated by API Setup`",`"startDateTime`":`"$passwordDate`",`"endDateTime`":`"2033-07-20T12:47:59.217Z`"}}"
             Write-LogMessage -user $ExecutingUser -API $APINAME -tenant 'None '-message "Reset CIPP API Password." -Sev "info"
         }
         else {

diff --git a/Scheduler_Alert/run.ps1 b/Scheduler_Alert/run.ps1
@@ -91,7 +91,7 @@ try {
                     }
                 }
                 else {
-                    Write-LogMessage -message "Potentially using Duo for MFA, could not check MFA status for Admins with 100% accuracy" -API 'Alerts' -tenant $tenant.tenant -sev Info
+                    Write-LogMessage -message "Potentially using Duo for MFA, could not check MFA status for Admins with 100% accuracy" -API 'MFA Alerts - Informational' -tenant $tenant.tenant -sev Info
 
                 }
             }

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-3.8.0
+3.8.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,7 @@ try { @@
                         }
                     }
                     else {
-                        Write-LogMessage -message "Potentially using Duo for MFA, could not check MFA status for Admins with 100% accuracy" -API 'Alerts' -tenant $tenant.tenant -sev Info
+                        Write-LogMessage -message "Potentially using Duo for MFA, could not check MFA status for Admins with 100% accuracy" -API 'MFA Alerts - Informational' -tenant $tenant.tenant -sev Info
                     }
                 }
@@ Expand Down @@