Merge pull request KelvinTegelaar#1419 from kris6673/feat-cleaner-TAP-copy

Fix: Prettier TAP copy action

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ExecJITAdmin.ps1

@@ -121,11 +121,8 @@ function Invoke-ExecJITAdmin {
                 $PasswordExpiration = $TapRequest.LifetimeInMinutes
 
                 $PasswordLink = New-PwPushLink -Payload $TempPass
-                if ($PasswordLink) {
-                    $Password = $PasswordLink
-                } else {
-                    $Password = $TempPass
-                }
+                $Password = $PasswordLink ? $PasswordLink : $TempPass
+
                 $Results.Add("Temporary Access Pass: $Password")
                 $Results.Add("This TAP is usable starting at $($TapRequest.startDateTime) UTC for the next $PasswordExpiration minutes")
             } catch {

Modules/CIPPCore/Public/New-CIPPTAP.ps1

@@ -10,19 +10,20 @@ function New-CIPPTAP {
     try {
         $GraphRequest = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$($userid)/authentication/temporaryAccessPassMethods" -tenantid $TenantFilter -type POST -body '{}' -verbose
         Write-LogMessage -headers $Headers -API $APIName -message "Created Temporary Access Password (TAP) for $userid" -Sev 'Info' -tenant $TenantFilter
-        $Results = [System.Collections.Generic.List[string]]::new()
-        $Results.Add("The TAP for this user is $($GraphRequest.temporaryAccessPass) - This TAP is usable for the next $($GraphRequest.LifetimeInMinutes) minutes")
-        $Results.Add("$($GraphRequest.temporaryAccessPass)")
-        return $Results
+        return @{
+            resultText          = "The TAP for this user is $($GraphRequest.temporaryAccessPass) - This TAP is usable for the next $($GraphRequest.LifetimeInMinutes) minutes"
+            copyField           = $GraphRequest.temporaryAccessPass
+            temporaryAccessPass = $GraphRequest.temporaryAccessPass
+            lifetimeInMinutes   = $GraphRequest.LifetimeInMinutes
+            startDateTime       = $GraphRequest.startDateTime
+            state               = 'success'
+        }
 
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
         $Result = "Failed to create Temporary Access Password (TAP) for $($userid): $($ErrorMessage.NormalizedError)"
         Write-LogMessage -headers $Headers -API $APIName -message $Result -Sev 'Error' -tenant $TenantFilter -LogData $ErrorMessage
-        throw @{ Results = $Result }
-
-
+        throw $Result
     }
-
 }