Merge pull request #1146 from JohnDuprey/dev

Fix LAPS & error msgs

Author: JohnDuprey

Modules/CIPPCore/Public/Get-CIPPBitlockerKey.ps1

@@ -15,7 +15,7 @@ function Get-CIPPBitlockerKey {
         return $GraphRequest
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not add OOO for $($userid)" -Sev 'Error' -tenant $TenantFilter -LogData (Get-CippException -Exception $_)
-        return "Could not add out of office message for $($userid). Error: $ErrorMessage"
+        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not retrieve bitlocker recovery key for $($device)" -Sev 'Error' -tenant $TenantFilter -LogData (Get-CippException -Exception $_)
+        return "Could not retrieve bitlocker recovery key for $($device). Error: $ErrorMessage"
     }
 }

Modules/CIPPCore/Public/Get-CIPPLAPSPassword.ps1

@@ -9,16 +9,16 @@ function Get-CIPPLapsPassword {
     )
 
     try {
-        $GraphRequest = (New-GraphGetRequest -noauthcheck $true -uri "https://graph.microsoft.com/beta/deviceLocalCredentials/$($device)?`$select=credentials" -tenantid $TenantFilter).credentials | Select-Object -First 1 | ForEach-Object {
+        $GraphRequest = (New-GraphGetRequest -noauthcheck $true -uri "https://graph.microsoft.com/beta/directory/deviceLocalCredentials/$($device)?`$select=credentials" -tenantid $TenantFilter).credentials | Select-Object -First 1 | ForEach-Object {
             $PlainText = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($_.passwordBase64))
             $date = $_.BackupDateTime
             "The password for $($_.AccountName) is $($PlainText) generated at $($date)"
         }
         if ($GraphRequest) { return $GraphRequest } else { return "No LAPS password found for $device" }
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not add OOO for $($userid). Error: $($ErrorMessage.NormalizedError)" -Sev 'Error' -tenant $TenantFilter -LogData $ErrorMessage
-        return "Could not add out of office message for $($userid). Error: $($ErrorMessage.NormalizedError)"
+        Write-LogMessage -user $ExecutingUser -API $APIName -message "Could not retrieve LAPS password for $($device). Error: $($ErrorMessage.NormalizedError)" -Sev 'Error' -tenant $TenantFilter -LogData $ErrorMessage
+        return "Could not retrieve LAPS password for $($device). Error: $($ErrorMessage.NormalizedError)"
     }
 }