Merge pull request #35 from Techary/revert-34-feature/itglue

Revert "Feature/itglue"

Author: TecharyJames

.github/workflows/master_cippuznn2.yml

@@ -31,12 +31,6 @@ Function Invoke-ExecExtensionMapping {
       'HuduFields' {
         $Result = Get-HuduFieldMapping -CIPPMapping $Table
       }
-      'ITGlue' {
-        $Result = Get-ITGlueMapping -CIPPMapping $Table
-      }
-      'ITGlueFields' {
-        $Result = Get-ITGlueFieldMapping -CIPPMapping $Table
-      }
       'Sherweb' {
         $Result = Get-SherwebMapping -CIPPMapping $Table
       }
@@ -82,14 +76,6 @@ Function Invoke-ExecExtensionMapping {
           $Result = Set-ExtensionFieldMapping -CIPPMapping $Table -APIName $APIName -Request $Request -Extension 'Hudu'
           Register-CIPPExtensionScheduledTasks
         }
-        'ITGlue' {
-          $Result = Set-ITGlueMapping -CIPPMapping $Table -APIName $APIName -Request $Request
-          Register-CIPPExtensionScheduledTasks
-        }
-        'ITGlueFields' {
-          $Result = Set-ExtensionFieldMapping -CIPPMapping $Table -APIName $APIName -Request $Request -Extension 'ITGlue'
-          Register-CIPPExtensionScheduledTasks
-        }
       }
     }
     $StatusCode = [HttpStatusCode]::OK
@@ -130,23 +116,6 @@ Function Invoke-ExecExtensionMapping {
     $StatusCode = [HttpStatusCode]::InternalServerError
   }
 
-  try {
-    if ($Request.Query.CreateCAType) {
-      switch ($Request.Query.CreateCAType) {
-        'ITGlue' {
-          $Result = New-ITGlueCAPolicyAssetType
-        }
-      }
-    }
-    $StatusCode = [HttpStatusCode]::OK
-  }
-  catch {
-    $ErrorMessage = Get-CippException -Exception $_
-    $Result = "Create CA Type API failed. $($ErrorMessage.NormalizedError)"
-    Write-LogMessage -API $APIName -headers $Headers -message $Result -Sev 'Error' -LogData $ErrorMessage
-    $StatusCode = [HttpStatusCode]::InternalServerError
-  }
-
   return ([HttpResponseContext]@{
       StatusCode = $StatusCode
       Body       = $Result

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionMapping.ps1

@@ -84,10 +84,6 @@ Function Invoke-ExecExtensionSync {
             Register-CIPPExtensionScheduledTasks -Reschedule -Extensions 'Hudu'
             $Results = [pscustomobject]@{'Results' = 'Extension sync tasks have been rescheduled and will start within 15 minutes' }
         }
-        'ITGlue' {
-            Register-CIPPExtensionScheduledTasks -Reschedule -Extensions 'ITGlue'
-            $Results = [pscustomobject]@{'Results' = 'ITGlue extension sync tasks have been rescheduled and will start within 15 minutes' }
-        }
 
     }
 

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionSync.ps1

@@ -65,15 +65,6 @@ Function Invoke-ExecExtensionTest {
                     $Results = [pscustomobject]@{'Results' = 'Failed to connect to Hudu, check your API credentials and try again.' }
                 }
             }
-            'ITGlue' {
-                $Conn = Connect-ITGlueAPI -Configuration $Configuration
-                $Orgs = Invoke-ITGlueRequest -Method GET -Endpoint '/organizations' -Headers $Conn.Headers -BaseUrl $Conn.BaseUrl -PageSize 1 -FirstPageOnly
-                if ($Orgs) {
-                    $Results = [pscustomobject]@{'Results' = "Successfully connected to ITGlue. Found $($Orgs.Count) organisation(s) on first page." }
-                } else {
-                    $Results = [pscustomobject]@{'Results' = 'Failed to connect to ITGlue. Check your API key and region setting.' }
-                }
-            }
             'Sherweb' {
                 $token = Get-SherwebAuthentication
                 if ($token) {

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionTest.ps1

@@ -35,14 +35,6 @@ function Invoke-ExecExtensionsConfig {
             $Body.Hudu.NextSync = ''
         }
 
-        if ($Body.ITGlue.NextSync) {
-            #parse unixtime for addedtext
-            $Timestamp = [datetime]::UnixEpoch.AddSeconds([int]$Body.ITGlue.NextSync).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
-            Register-CIPPExtensionScheduledTasks -Reschedule -NextSync $Body.ITGlue.NextSync -Extensions 'ITGlue'
-            $AddedText = " Next sync will be at $Timestamp."
-            $Body.ITGlue.NextSync = ''
-        }
-
         $Table = Get-CIPPTable -TableName Extensionsconfig
         foreach ($APIKey in $Body.PSObject.Properties.Name) {
             Write-Information "Working on $apikey"

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Extensions/Invoke-ExecExtensionsConfig.ps1

@@ -50,9 +50,8 @@ function Invoke-ListMailboxForwarding {
                 continue
             }
 
-            $ForwardingType = if ($HasExternalForwarding -and $HasInternalForwarding) {
-                'Both'
-            } elseif ($HasExternalForwarding) {
+            # External takes precedence when both are configured
+            $ForwardingType = if ($HasExternalForwarding) {
                 'External'
             } else {
                 'Internal'