Merge pull request #400 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Invoke-ListExternalTenantInfo.ps1

@@ -14,67 +14,36 @@ Function Invoke-ListExternalTenantInfo {
     $Headers = $Request.Headers
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
-
-
-    # Interact with query parameters or the body of the request.
-    $Tenant = $Request.Query.tenant
-    $TenantFilter = $Request.Query.tenantFilter
-
-    # Normalize to tenantid and determine if tenant exists
-    $TenantId = (Invoke-RestMethod -Method GET "https://login.windows.net/$Tenant/.well-known/openid-configuration").token_endpoint.Split('/')[3]
-
-    if ($TenantId) {
-        $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/findTenantInformationByTenantId(tenantId='$TenantId')" -NoAuthCheck $true -tenantid $TenantFilter
-        $StatusCode = [HttpStatusCode]::OK
+    $HttpResponse = [HttpResponseContext]@{
+        StatusCode = [HttpStatusCode]::OK
+        Body       = "Default response, you should never see this"
     }
 
-    if ($GraphRequest) {
-
-        $TenantDefaultDomain = $GraphRequest.defaultDomainName
-
-        $body = @"
-<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:exm="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:ext="http://schemas.microsoft.com/exchange/services/2006/types" xmlns:a="http://www.w3.org/2005/08/addressing" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <soap:Header>
-        <a:Action soap:mustUnderstand="1">http://schemas.microsoft.com/exchange/2010/Autodiscover/Autodiscover/GetFederationInformation</a:Action>
-        <a:To soap:mustUnderstand="1">https://autodiscover-s.outlook.com/autodiscover/autodiscover.svc</a:To>
-        <a:ReplyTo>
-            <a:Address>http://www.w3.org/2005/08/addressing/anonymous</a:Address>
-        </a:ReplyTo>
-    </soap:Header>
-    <soap:Body>
-        <GetFederationInformationRequestMessage xmlns="http://schemas.microsoft.com/exchange/2010/Autodiscover">
-            <Request>
-                <Domain>$TenantDefaultDomain</Domain>
-            </Request>
-        </GetFederationInformationRequestMessage>
-    </soap:Body>
-</soap:Envelope>
-"@
-
-        # Create the headers
-        $AutoDiscoverHeaders = @{
-            'Content-Type' = 'text/xml; charset=utf-8'
-            'SOAPAction'   = '"http://schemas.microsoft.com/exchange/2010/Autodiscover/Autodiscover/GetFederationInformation"'
-            'User-Agent'   = 'AutodiscoverClient'
+    try {
+        if ($Request.Query.tenant) {
+            $Tenant = $Request.Query.tenant
+
+            # Normalize to tenantid and determine if tenant exists
+            $TenantId = (Invoke-RestMethod -Method GET "https://login.windows.net/$Tenant/.well-known/openid-configuration").token_endpoint.Split('/')[3]
+
+            if ($TenantId) {
+                $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/tenantRelationships/findTenantInformationByTenantId(tenantId='$TenantId')" -NoAuthCheck $true -tenantid $env:TenantID
+                $StatusCode = [HttpStatusCode]::OK
+                $HttpResponse.Body = [PSCustomObject]@{
+                    GraphRequest = $GraphRequest
+                }
+            } else {
+                $HttpResponse.StatusCode = [HttpStatusCode]::BadRequest
+                $HttpResponse.Body = "Tenant $($Tenant) not found"
+            }
+        } else {
+            $HttpResponse.StatusCode = [HttpStatusCode]::BadRequest
+            $HttpResponse.Body = "Tenant parameter is required"
         }
-
-        # Invoke
-        $Response = Invoke-RestMethod -UseBasicParsing -Method Post -Uri 'https://autodiscover-s.outlook.com/autodiscover/autodiscover.svc' -Body $body -Headers $AutoDiscoverHeaders
-
-        # Return
-        $TenantDomains = $Response.Envelope.body.GetFederationInformationResponseMessage.response.Domains.Domain | Sort-Object
+    } catch {
+        $HttpResponse.StatusCode = [HttpStatusCode]::InternalServerError
+        $HttpResponse.Body = "Something went wrong while trying to get tenant info for tenant $($Tenant): $($_.Exception.Message)"
     }
 
-    $results = [PSCustomObject]@{
-        GraphRequest = $GraphRequest
-        Domains      = @($TenantDomains)
-    }
-
-    # Associate values to output bindings by calling 'Push-OutputBinding'.
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-            StatusCode = $StatusCode
-            Body       = $results
-        })
-
+    Push-OutputBinding -Name Response -Value $HttpResponse
 }