updated AD-Connector with imported TeamViewerPS module functions

Author: radu-cristea-15

CHANGELOG.md

@@ -1,11 +1,16 @@
 # Change Log
 
+## [2.0.0]
+
+- imported TeamViewePS module for API calls
+
 ## [1.5.0]
 
 - Removed company permissions
 - Removed Conditional Access synchronization support (access groups)
 - Harmonize code format
 - Updated year in copyright
+- Removed Conditional Access synchronization support.
 
 ## [1.4.1]
 

Configure TeamViewer AD Connector.bat

@@ -2,4 +2,5 @@
 SETLOCAL
 
 CD /D "%~dp0"
-POWERSHELL -NonInteractive -NoProfile -ExecutionPolicy Bypass -Command "& {.\TeamViewerADConnector\Invoke-Configuration.ps1 ; exit $LastExitCode }"
+POWERSHELL -ExecutionPolicy Bypass -Command  "& { .\TeamViewerADConnector\Invoke-ImportedTeamViewerPSModule.ps1 -Verbose ; exit $LastExitCode }"
+

TeamViewerADConnector/Internal/Forms/MainWindow.xaml

@@ -149,7 +149,7 @@ function Invoke-GraphicalUserInterfaceConfiguration($configuration, [string] $cu
             } })
 
 
-    $scheduledSyncIntervalsData = (Get-SupportedScheduledSyncIntervals | ForEach-Object {
+            $scheduledSyncIntervalsData = (Get-SupportedScheduledSyncIntervals | ForEach-Object {
             New-Object PSObject -Prop @{
                 Tag     = "$_"
                 Content = $_
@@ -222,7 +222,7 @@ function Invoke-GraphicalUserInterfaceConfiguration($configuration, [string] $cu
     # Click Handler Button "Test Token"
     $mainWindow.FindName('BtnTestToken').Add_Click( {
             try {
-                $tokenValid = (Invoke-TeamViewerPing $mainWindow.DataContext.ConfigurationData.ApiToken)
+                $tokenValid = (Invoke-TeamViewerPing -ApiToken (ConvertTo-SecureString $mainWindow.DataContext.ConfigurationData.ApiToken -AsPlainText -Force))
             }
             catch {
                 Write-Error "Token test failed: $_"

TeamViewerADConnector/Internal/GraphicalUserInterface.ps1

@@ -1,7 +1,7 @@
 {
-    "AccountTypeDefaultPassword": "Vorgegebenes Passwort:",
-    "AccountTypeGeneratedPassword": "Zufällig generiertes Passwort",
-    "AccountTypeSso": "Single Sign-On(SSO):",
+    "AccountTypeDefaultPassword": "Konten mit vorgegebenem Passwort erstellen:",
+    "AccountTypeGeneratedPassword": "Konten mit generiertem Passwort erstellen",
+    "AccountTypeSso": "Single Sign-On verwenden (benötigt Tensor Lizenz)",
     "Add": "Hinzufügen",
     "Apply": "Übernehmen",
     "Cancel": "Abbrechen",
@@ -12,27 +12,18 @@
     "InstallError": "Geplante Aufgabe konnte nicht eingerichtet werden!",
     "IntervalUnit": "Stunden",
     "LabelADGroups": "AD Gruppen:",
-    "LabelADHeader": "Active Directory Gruppen:",
-    "LabelAccountType": "Anmeldeverfahren:",
-    "LabelADConnectorSettings": "Einstellungen des Active Directory Connectors",
+    "LabelAccountType": "Kontotyp:",
     "LabelApiToken": "API Token:",
-    "LabelAuthentication": "Authentifizierung:",
     "LabelCustomerId": "Customer ID:",
     "LabelDefaultPassword": "Init. Passwort:",
     "LabelInterval": "Intervall:",
     "LabelLanguage": "Sprache:",
     "LabelLogDirectory": "Logverzeichnis:",
-    "LabelLogDirectoryHeader": "Definieren Sie den Ordner, in dem Protokolle gespeichert werden.",
-    "LabelLogging": "Protokollierung:",
-    "LabelOptions": "Synchronisierungseinstellungen:",
-    "LabelOtherUserSettings": "Andere:",
-    "LabelScheduledTaskHeader": "Fügt eine geplante Aufgabe hinzu, die den Active Directory Connector regelmäßig mit der gespeicherten Konfiguration ausführt.",
+    "LabelOptions": "Optionen:",
     "LabelSelectedADGroups": "Ausgewählte AD Gruppen:",
     "LabelStatus": "Status:",
-    "LabelSyncHeader": "Synchronisierungseinstellungen festlegen",
-    "LabelUserSettingsHeader": "Die Einstellungen definieren, die für alle exportierten Benutzer innerhalb von TeamViewer vorgegeben werden.",
     "LoadingADGroups": "Lade Active Directory Gruppen ...",
-    "LogDirectoryWarning": "Der angegebene Ordner existiert nicht. Bitte erstellen Sie den Ordner.",
+    "LogDirectoryWarning": "Der angegebene Ordner existiert nicht. Bitte erstellen sie den Ordner.",
     "OK": "OK",
     "RecursiveGroups": "Benutzer verschachtelter AD Gruppen einschließen",
     "Remove": "Entfernen",
@@ -41,26 +32,24 @@
     "ScheduledSyncDisabled": "Geplante Aufgabe ist nicht konfiguriert",
     "ScheduledSyncEnabled": "Geplante Aufgabe ist konfiguriert",
     "SectionConfiguration": "Konfiguration",
-    "SectionScheduledSync": "Geplante Aufgabe:",
-    "SyncCompleted": "Abgeschlossen",
-    "SyncCreateUpdateUser": "Benutzer erstellen/aktualisieren",
-    "SyncDeactivateUser": "Benutzer deaktivieren",
-    "SyncError": "Benutzersynchronisierung war nicht erfolgreich!",
+    "SectionScheduledSync": "Geplante Aufgabe",
+    "SyncCompleted": "Fertig",
+    "SyncCreateUpdateUser": "Erstelle/aktualisiere Benutzer",
+    "SyncDeactivateUser": "Deaktiviere Benutzer",
+    "SyncError": "Synchronisierung der Benutzer fehlgeschlagen!",
     "SyncGetActiveDirectoryGroupMembers": "Mitglieder der Active Directory Gruppen werden abgerufen",
-    "SyncGetTeamViewerUserGroups": "TeamViewer-Benutzergruppen werden abgerufen",
-    "SyncGetTeamViewerUsers": "Benutzer der TeamViewer-Firma werden abgerufen",
-    "SyncUserGroups": "Synchronisiere TeamViewer-Benutzergruppen",
+    "SyncGetTeamViewerUserGroups": "TeamViewer User Gruppen werden abgerufen",
+    "SyncGetTeamViewerUsers": "Benutzer der TeamViewer Company werden abgerufen",
+    "SyncUserGroups": "Synchronisiere TeamViewer User Gruppen",
     "TabHeaderAccounts": "TeamViewer Konten",
     "TabHeaderGroups": "Gruppen",
-    "TabHeaderUserSettings": "Benutzereinstellungen",
-    "TabHeaderSettings": "Einstellungen",
     "TabHeaderSynchronization": "Synchronisierung",
     "TestRun": "Testlauf",
     "TestToken": "Token prüfen",
     "TestTokenFailure": "Das Token ist ungültig!",
-    "TestTokenSuccess": "Token erfolgreich geprüft!",
+    "TestTokenSuccess": "Token erfolgreicht geprüft!",
     "Title": "TeamViewer AD Connector",
-    "Uninstall": "Deinstallieren",
+    "Uninstall": "Entfernen",
     "UninstallError": "Geplante Aufgabe konnte nicht entfernt werden!",
     "UseSecondaryEmails": "Sekundäre E-Mail-Adressen ebenfalls berücksichtigen",
     "UserLanguage_bg": "Bulgarisch (bg)",
@@ -73,7 +62,7 @@
     "UserLanguage_fi": "Finnisch (fi)",
     "UserLanguage_fr": "Französisch (fr)",
     "UserLanguage_hr": "Kroatisch (hr)",
-    "UserLanguage_hu": "Ungarisch (hu)",
+    "UserLanguage_hu": "Ungarsich (hu)",
     "UserLanguage_id": "Indonesisch (id)",
     "UserLanguage_it": "Italienisch (it)",
     "UserLanguage_ja": "Japanisch (ja)",

TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.de.json

@@ -91,4 +91,4 @@
     "UserLanguage_vi": "Vietnamese (vi)",
     "UserLanguage_zh_CN": "Simple Chinese (zh_CN)",
     "UserLanguage_zh_TW": "Traditional Chinese (zh_TW)"
-}
+}

TeamViewerADConnector/Internal/Localization/GraphicalUserInterface.en.json

@@ -136,23 +136,26 @@ function Invoke-SyncPrework($syncContext, $configuration, $progressHandler) {
     # Users are mapped to their email addresses.
     Write-SyncProgress -Handler $progressHandler -PercentComplete 10 'GetTeamViewerUsers'
     Write-SyncLog 'Fetching TeamViewer company users'
-
-    $usersTVByEmail = (Get-TeamViewerUser $configuration.ApiToken)
+    $usersTVByEmail = (Get-TeamViewerUser -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force))
     Write-SyncLog "Retrieved $($usersTVByEmail.Count) TeamViewer company users"
 
     if ($configuration.EnableUserGroupsSync) {
         # Fetch all available user groups
         Write-SyncProgress -Handler $progressHandler -PercentComplete 20 'GetTeamViewerUserGroups'
         Write-SyncLog 'Fetching list of TeamViewer user groups.'
-        $userGroups = @(Get-TeamViewerUserGroup $configuration.ApiToken)
+        $userGroups = @(Get-TeamViewerUserGroup -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force))
         Write-SyncLog "Retrieved $($userGroups.Count) TeamViewer user groups."
 
         # Fetch user group members
         $userGroupMembersByGroup = @{}
 
         foreach ($userGroup in $userGroups) {
             Write-SyncLog "Fetching members of TeamViewer user group '$($userGroup.name)'"
-            $userGroupMembers = @(Get-TeamViewerUserGroupMember $configuration.ApiToken $userGroup.id)
+            if ($null -eq $userGroup) {
+                Write-Host 'UserGroup is null'
+                break
+            }
+            $userGroupMembers = @(Get-TeamViewerUserGroupMember -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force) -Id $userGroup.id)
             Write-SyncLog "Retrieved $($userGroupMembers.Count) members of TeamViewer user group '$($userGroup.name)'"
             $userGroupMembersByGroup[$userGroup.id] = $userGroupMembers
         }
@@ -194,7 +197,7 @@ function Invoke-SyncUser($syncContext, $configuration, $progressHandler) {
                 $updatedUser.active = $true
 
                 try {
-                    Edit-TeamViewerUser $configuration.ApiToken $userTv.id $updatedUser | Out-Null
+                    Set-TeamViewerUser -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force) $userTv.id $updatedUser | Out-Null
                     $statistics.Updated++
                 }
                 catch {
@@ -230,7 +233,7 @@ function Invoke-SyncUser($syncContext, $configuration, $progressHandler) {
                 }
 
                 try {
-                    $addedUser = (Add-TeamViewerUser $configuration.ApiToken $newUser)
+                    $addedUser = (Add-TeamViewerUser -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force) $newUser)
                     $newUser.id = $addedUser.id
                     $syncContext.UsersTeamViewerByEmail[$newUser.email] = $newUser
                     $statistics.Created++
@@ -254,7 +257,7 @@ function Invoke-SyncUser($syncContext, $configuration, $progressHandler) {
         # This information is used to not accidentially deactivate the token owner,
         # which would block further processing of the script.
         Write-SyncLog 'Trying to fetch account information of configured TeamViewer API token'
-        $currentAccount = Get-TeamViewerAccount $configuration.ApiToken -NoThrow
+        $currentAccount = Get-TeamViewerAccount -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force) -NoThrow
 
         if (!$currentAccount) {
             Write-SyncLog 'Unable to determine token account information. Please check API token permissions.'
@@ -271,7 +274,7 @@ function Invoke-SyncUser($syncContext, $configuration, $progressHandler) {
             Write-SyncLog "Deactivating TeamViewer user $($user.email)"
             if (!$configuration.TestRun) {
                 try {
-                    Disable-TeamViewerUser $configuration.ApiToken $user.id | Out-Null
+                    Set-TeamViewerUser -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force) $user.id | Out-Null
                     $statistics.Deactivated++
                 }
                 catch {
@@ -316,7 +319,7 @@ function Invoke-SyncUserGroups($syncContext, $configuration, $progressHandler) {
             Write-SyncLog "Creating user group '$adGroupName'"
             if (!$configuration.TestRun) {
                 try {
-                    $userGroup = (Add-TeamViewerUserGroup $configuration.ApiToken $adGroupName)
+                    $userGroup = (Add-TeamViewerUserGroup -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force) $adGroupName)
                     $statistics.CreatedGroups++
                 }
                 catch {
@@ -359,7 +362,7 @@ function Invoke-SyncUserGroups($syncContext, $configuration, $progressHandler) {
                 $currentMembersToAdd = $_
 
                 try {
-                    (Add-TeamViewerUserGroupMember $configuration.ApiToken $userGroup.id $currentMembersToAdd) | Out-Null
+                    (Add-TeamViewerUserGroupMember -ApiToken (ConvertTo-SecureString $configuration.ApiToken) $userGroup.id $currentMembersToAdd -AsPlainText -Force) | Out-Null
                     $statistics.AddedMembers += $currentMembersToAdd.Count
                 }
                 catch {
@@ -376,20 +379,20 @@ function Invoke-SyncUserGroups($syncContext, $configuration, $progressHandler) {
         $membersToRemove = @()
 
         foreach ($userGroupMember in $userGroupMembers) {
-            $userTv = ($usersTv | Where-Object { $_.id.Trim('u') -Eq $userGroupMember.accountId })
+            $userTv = ($usersTv | Where-Object { $_.id.Trim('u') -eq $userGroupMember.accountId })
 
             if (!$userTv) {
                 Write-SyncLog "User '$($userGroupMember.name)' will be removed from user group '$($userGroup.name)'"
                 $membersToRemove += $userGroupMember.accountId
             }
         }
         Write-SyncLog "Removing $($membersToRemove.Count) members from user group '$($userGroup.name)'"
-        if (!$configuration.TestRun -And $membersToRemove.Count -Gt 0) {
+        if (!$configuration.TestRun -and $membersToRemove.Count -gt 0) {
             $membersToRemove | Split-Bulk -Size 100 | ForEach-Object {
                 $currentMembersToRemove = $_
 
                 try {
-                    (Remove-TeamViewerUserGroupMember $configuration.ApiToken $userGroup.id $currentMembersToRemove) | Out-Null
+                    (Remove-TeamViewerUserGroupMember -ApiToken (ConvertTo-SecureString $configuration.ApiToken -AsPlainText -Force) $userGroup.id $currentMembersToRemove) | Out-Null
                     $statistics.RemovedMembers += $currentMembersToRemove.Count
                 }
                 catch {