Merge pull request KelvinTegelaar#1324 from kris6673/more-cleanup-of-endpoints

Few more endpoints and license update

Author: JohnDuprey

ConversionTable.csv

@@ -12,21 +12,23 @@ Function Invoke-AddConnectionFilter {
 
 
     $APIName = $Request.Params.CIPPEndpoint
-    Write-LogMessage -headers $Request.Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+    $Headers = $Request.Headers
+    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
     $RequestParams = $Request.Body.PowerShellCommand |
-    ConvertFrom-Json |
-    Select-Object -Property *, @{Name='identity'; Expression={$_.name}} -ExcludeProperty GUID, comments, name
+        ConvertFrom-Json |
+        Select-Object -Property *, @{Name = 'identity'; Expression = { $_.name } } -ExcludeProperty GUID, comments, name
 
     $Tenants = ($Request.body.selectedTenants).value
-    $Result = foreach ($Tenantfilter in $tenants) {
+    $Result = foreach ($TenantFilter in $Tenants) {
         try {
-            $GraphRequest = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Set-HostedConnectionFilterPolicy' -cmdParams $RequestParams
-            "Successfully created Connectionfilter for $tenantfilter."
-            Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $tenantfilter -message "Updated Connection filter rule for $($tenantfilter)" -sev Info
+            $null = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Set-HostedConnectionFilterPolicy' -cmdParams $RequestParams
+            "Successfully created Connection filter for $TenantFilter."
+            Write-LogMessage -headers $Headers -API $APIName -tenant $TenantFilter -message "Updated Connection filter rule for $($TenantFilter)" -sev Info
         } catch {
-            "Could not create create Connection Filter rule for $($tenantfilter): $($_.Exception.message)"
-            Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $tenantfilter -message "Could not create create connection filter rule for $($tenantfilter): $($_.Exception.message)" -sev Error
+            $ErrorMessage = Get-CippException -Exception $_
+            "Failed to create Connection Filter rule for $($TenantFilter): $($ErrorMessage.NormalizedError)"
+            Write-LogMessage -headers $Headers -API $APIName -tenant $TenantFilter -message "Failed to create connection filter rule for $($TenantFilter): $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
         }
     }
 

Modules/CIPPCore/Public/ConversionTable.csv

@@ -11,47 +11,51 @@ Function Invoke-AddGuest {
     param($Request, $TriggerMetadata)
 
     $APIName = $Request.Params.CIPPEndpoint
-    Write-LogMessage -headers $Request.Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+    $Headers = $Request.Headers
+    Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
+
+    $TenantFilter = $Request.Body.tenantFilter
 
     $Results = [System.Collections.ArrayList]@()
-    $userobj = $Request.body
-    # Write to the Azure Functions log stream.
-    Write-Host 'PowerShell HTTP trigger function processed a request.'
+    $UserObject = $Request.Body
     try {
-        if ($userobj.RedirectURL) {
+        if ($UserObject.RedirectURL) {
             $BodyToship = [pscustomobject] @{
-                'InvitedUserDisplayName'  = $userobj.Displayname
-                'InvitedUserEmailAddress' = $($userobj.mail)
-                'inviteRedirectUrl'       = $($userobj.RedirectURL)
-                'sendInvitationMessage'   = [boolean]$userobj.SendInvite
+                'InvitedUserDisplayName'  = $UserObject.DisplayName
+                'InvitedUserEmailAddress' = $($UserObject.mail)
+                'inviteRedirectUrl'       = $($UserObject.RedirectURL)
+                'sendInvitationMessage'   = [bool]$UserObject.SendInvite
             }
         } else {
             $BodyToship = [pscustomobject] @{
-                'InvitedUserDisplayName'  = $userobj.Displayname
-                'InvitedUserEmailAddress' = $($userobj.mail)
-                'sendInvitationMessage'   = [boolean]$userobj.SendInvite
+                'InvitedUserDisplayName'  = $UserObject.DisplayName
+                'InvitedUserEmailAddress' = $($UserObject.mail)
+                'sendInvitationMessage'   = [bool]$UserObject.SendInvite
                 'inviteRedirectUrl'       = 'https://myapps.microsoft.com'
             }
         }
         $bodyToShip = ConvertTo-Json -Depth 10 -InputObject $BodyToship -Compress
-        $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/invitations' -tenantid $Userobj.tenantFilter -type POST -body $BodyToship -verbose
-        if ($Userobj.sendInvite -eq 'true') {
-            $results.add('Invited Guest. Invite Email sent')
-            Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $($userobj.tenantFilter) -message "Invited Guest $($userobj.displayname) with Email Invite " -Sev 'Info'
+        $null = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/invitations' -tenantid $TenantFilter -type POST -body $BodyToship -verbose
+        if ($UserObject.SendInvite -eq $true) {
+            $Results.Add('Invited Guest. Invite Email sent')
+            Write-LogMessage -headers $Headers -API $APIName -tenant $($TenantFilter) -message "Invited Guest $($UserObject.DisplayName) with Email Invite " -Sev 'Info'
         } else {
-            $results.add('Invited Guest. No Invite Email was sent')
-            Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $($userobj.tenantFilter) -message "Invited Guest $($userobj.displayname) with no Email Invite " -Sev 'Info'
+            $Results.Add('Invited Guest. No Invite Email was sent')
+            Write-LogMessage -headers $Headers -API $APIName -tenant $($TenantFilter) -message "Invited Guest $($UserObject.DisplayName) with no Email Invite " -Sev 'Info'
         }
+        $StatusCode = [HttpStatusCode]::OK
     } catch {
-        Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $($userobj.tenantFilter) -message "Guest Invite API failed. $($_.Exception.Message)" -Sev 'Error'
-        $body = $results.add("Failed to Invite Guest. $($_.Exception.Message)" )
+        $ErrorMessage = Get-CippException -Exception $_
+        $Result = "Failed to Invite Guest. $($ErrorMessage.NormalizedError)"
+        Write-LogMessage -headers $Headers -API $APIName -tenant $($TenantFilter) -message $Result -Sev 'Error' -LogData $ErrorMessage
+        $Results.Add($Result)
+        $StatusCode = [HttpStatusCode]::BadRequest
     }
 
-    $body = @{'Results' = @($results) }
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-            StatusCode = [HttpStatusCode]::OK
-            Body       = $Body
+            StatusCode = $StatusCode
+            Body       = @{Results = @($Results) }
         })
 
 }