Merge pull request KelvinTegelaar#1437 from Zacgoose/TAP-copy-username

Add username to TAP response

Author: JohnDuprey

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

@@ -19,17 +19,28 @@ Function Invoke-ExecCreateTAP {
     $UserID = $Request.Query.ID ?? $Request.Body.ID
 
     try {
-        $Result = New-CIPPTAP -userid $UserID -TenantFilter $TenantFilter -APIName $APIName -Headers $Headers
+        $TAPResult = New-CIPPTAP -userid $UserID -TenantFilter $TenantFilter -APIName $APIName -Headers $Headers
+
+        # Create results array with both TAP and UserID as separate items
+        $Results = @(
+            $TAPResult,
+            @{
+                resultText = "User ID: $UserID"
+                copyField = $UserID
+                state = 'success'
+            }
+        )
+
         $StatusCode = [HttpStatusCode]::OK
     } catch {
-        $Result = Get-NormalizedError -message $($_.Exception.Message)
+        $Results = Get-NormalizedError -message $($_.Exception.Message)
         $StatusCode = [HttpStatusCode]::InternalServerError
     }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = $StatusCode
-            Body       = @{'Results' = $Result }
+            Body       = @{'Results' = $Results }
         })
 
 }

Modules/CIPPCore/Public/New-CIPPTAP.ps1

@@ -11,7 +11,8 @@ function New-CIPPTAP {
         $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
         return @{
-            resultText          = "The TAP for this user is $($GraphRequest.temporaryAccessPass) - This TAP is usable for the next $($GraphRequest.LifetimeInMinutes) minutes"
+            resultText          = "The TAP for $userid is $($GraphRequest.temporaryAccessPass) - This TAP is usable for the next $($GraphRequest.LifetimeInMinutes) minutes"
+            userid              = $userid
             copyField           = $GraphRequest.temporaryAccessPass
             temporaryAccessPass = $GraphRequest.temporaryAccessPass
             lifetimeInMinutes   = $GraphRequest.LifetimeInMinutes