jj: remove obsolete tableadapters from import forms
This commit is contained in:
Jonathan Jenne
parent
5effb536fe
commit
1540389fbb
@ -92,35 +92,6 @@ Public Class ClassActiveDirectory
|
||||
Return groups
|
||||
End Function
|
||||
|
||||
'Public Shared Function GetActiveDirectoryGroups(samAccountName As String) As List(Of String)
|
||||
' Dim groups As New List(Of String)
|
||||
' Dim adRoot As New DirectoryEntry() With {
|
||||
' .AuthenticationType = AuthenticationTypes.Secure
|
||||
' }
|
||||
' Dim user As DirectoryEntry = FindUser(adRoot, samAccountName)
|
||||
|
||||
' If IsNothing(user) Then
|
||||
' MsgBox($"Benutzer {samAccountName} wurde nicht in der Active Directory gefunden!")
|
||||
' Return groups
|
||||
' End If
|
||||
|
||||
' user.RefreshCache(New String() {"tokenGroups"})
|
||||
|
||||
' For Each tokenGroup As Byte() In user.Properties("tokenGroups")
|
||||
' Dim groupName As String = GetGroupNameFromTokenGroupEntry(adRoot, tokenGroup)
|
||||
|
||||
' If Not IsNothing(groupName) Then
|
||||
' Dim isValidGroup As Boolean = excludedGroupNames.Where(Function(excludedGroup) Not groupName.StartsWith(excludedGroup)).Any()
|
||||
|
||||
' If isValidGroup Then
|
||||
' groups.Add(groupName)
|
||||
' End If
|
||||
' End If
|
||||
' Next
|
||||
|
||||
' Return groups
|
||||
'End Function
|
||||
|
||||
Public Shared Function GetActiveDirectoryUsersForGroup(groupName As String) As List(Of UserPrincipal)
|
||||
Dim users As New List(Of UserPrincipal)
|
||||
|
||||
|
||||
68
DDUserManager/DDUserManager/ClassData.vb
Normal file
68
DDUserManager/DDUserManager/ClassData.vb
Normal file
@ -0,0 +1,68 @@
|
||||
Imports DD_LIB_Standards
|
||||
|
||||
Public Class ClassData
|
||||
Public Sub New()
|
||||
|
||||
End Sub
|
||||
|
||||
Private Shared Function IntToBool(int As Integer) As Boolean
|
||||
Return int >= 1
|
||||
End Function
|
||||
|
||||
Private Shared Function BoolToInt(bool As Boolean) As Integer
|
||||
Return IIf(bool, 1, 0)
|
||||
End Function
|
||||
|
||||
Public Shared Function GroupExists(groupName As String) As Boolean
|
||||
Try
|
||||
Dim sql As String = $"SELECT COUNT(GUID) FROM TBDD_GROUPS WHERE NAME = '{groupName}'"
|
||||
Dim result = clsDatabase.Execute_Scalar(sql)
|
||||
|
||||
Return IntToBool(result)
|
||||
Catch ex As Exception
|
||||
clsLogger.Add($"Error in GroupExists: {ex.Message}")
|
||||
Return Nothing
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Public Shared Function UserExists(userName As String) As Boolean
|
||||
Try
|
||||
Dim sql As String = $"SELECT COUNT(GUID) FROM TBDD_USER WHERE USERNAME = '{userName}'"
|
||||
Dim result = clsDatabase.Execute_Scalar(sql)
|
||||
|
||||
Return IntToBool(result)
|
||||
Catch ex As Exception
|
||||
clsLogger.Add($"Error in UserExists: {ex.Message}")
|
||||
Return Nothing
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Public Shared Function InsertUser(username As String, prename As String, name As String, email As String)
|
||||
Try
|
||||
Dim addedWho As String = Environment.UserName
|
||||
|
||||
Dim sql As String = $"INSERT INTO TBDD_USER (PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO)
|
||||
VALUES ('{prename}','{name}','{username}','{email}','{addedWho}')"
|
||||
Dim result = clsDatabase.Execute_non_Query(sql)
|
||||
|
||||
Return True
|
||||
Catch ex As Exception
|
||||
clsLogger.Add($"Error in InsertUser: {ex.Message}")
|
||||
Return False
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Public Shared Function InsertGroup(name As String, Optional ECM_FK_ID As Integer = 1, Optional adSync As Boolean = True, Optional internal As Boolean = False, Optional active As Boolean = True)
|
||||
Try
|
||||
Dim addedWho As String = Environment.UserName
|
||||
Dim sql As String = $"INSERT INTO TBDD_GROUPS (NAME, ADDED_WHO, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE)
|
||||
VALUES ('{name}', '{addedWho}', {ECM_FK_ID}, {BoolToInt(adSync)}, {BoolToInt(internal)}, {BoolToInt(active)} )"
|
||||
Dim result = clsDatabase.Execute_non_Query(sql)
|
||||
|
||||
Return True
|
||||
Catch ex As Exception
|
||||
clsLogger.Add($"Error in InsertGroup: {ex.Message}")
|
||||
Return False
|
||||
End Try
|
||||
End Function
|
||||
End Class
|
||||
@ -94,6 +94,7 @@
|
||||
<ItemGroup>
|
||||
<Compile Include="ApplicationEvents.vb" />
|
||||
<Compile Include="ClassActiveDirectory.vb" />
|
||||
<Compile Include="ClassData.vb" />
|
||||
<Compile Include="ClassDragDrop.vb" />
|
||||
<Compile Include="DS_ChangeS.Designer.vb">
|
||||
<AutoGen>True</AutoGen>
|
||||
|
||||
@ -8,10 +8,19 @@
|
||||
<TableUISettings>
|
||||
<TableUISetting Name="TBDD_USER">
|
||||
<ColumnUISettings>
|
||||
<ColumnUISetting Name="DATE_FORMAT">
|
||||
<ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<ColumnUISetting Name="LANGUAGE">
|
||||
<ControlSettings>
|
||||
<ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
|
||||
<BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</ControlSetting></ControlSettings>
|
||||
</ControlSetting>
|
||||
</ControlSettings>
|
||||
</ColumnUISetting>
|
||||
<ColumnUISetting Name="DATE_FORMAT">
|
||||
<ControlSettings>
|
||||
<ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
|
||||
<BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</ControlSetting>
|
||||
</ControlSettings>
|
||||
</ColumnUISetting>
|
||||
</ColumnUISettings>
|
||||
</TableUISetting>
|
||||
|
||||
@ -31,15 +31,11 @@ Partial Class frmADImport_Groups
|
||||
Me.colGROUPNAME = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.btnImport = New System.Windows.Forms.Button()
|
||||
Me.DS_ChangeS = New DDUserManager.DS_ChangeS()
|
||||
Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.TBDD_GROUPSTableAdapter = New DDUserManager.DS_ChangeSTableAdapters.TBDD_GROUPSTableAdapter()
|
||||
Me.TableAdapterManager = New DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager()
|
||||
CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.TBLOCAL_ADGROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'gridAD_Groups
|
||||
@ -99,21 +95,6 @@ Partial Class frmADImport_Groups
|
||||
Me.DS_ChangeS.DataSetName = "DS_ChangeS"
|
||||
Me.DS_ChangeS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
|
||||
'
|
||||
'TBDD_GROUPSBindingSource
|
||||
'
|
||||
Me.TBDD_GROUPSBindingSource.DataMember = "TBDD_GROUPS"
|
||||
Me.TBDD_GROUPSBindingSource.DataSource = Me.DS_ChangeS
|
||||
'
|
||||
'TBDD_GROUPSTableAdapter
|
||||
'
|
||||
Me.TBDD_GROUPSTableAdapter.ClearBeforeFill = True
|
||||
'
|
||||
'TableAdapterManager
|
||||
'
|
||||
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
|
||||
Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Me.TBDD_GROUPSTableAdapter
|
||||
Me.TableAdapterManager.UpdateOrder = DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
|
||||
'
|
||||
'frmADImport_Groups
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@ -129,7 +110,6 @@ Partial Class frmADImport_Groups
|
||||
CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
End Sub
|
||||
@ -141,7 +121,4 @@ Partial Class frmADImport_Groups
|
||||
Friend WithEvents colGROUPNAME As DevExpress.XtraGrid.Columns.GridColumn
|
||||
Friend WithEvents btnImport As Button
|
||||
Friend WithEvents DS_ChangeS As DS_ChangeS
|
||||
Friend WithEvents TBDD_GROUPSBindingSource As BindingSource
|
||||
Friend WithEvents TBDD_GROUPSTableAdapter As DS_ChangeSTableAdapters.TBDD_GROUPSTableAdapter
|
||||
Friend WithEvents TableAdapterManager As DS_ChangeSTableAdapters.TableAdapterManager
|
||||
End Class
|
||||
|
||||
@ -126,15 +126,6 @@
|
||||
<metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>626, 17</value>
|
||||
</metadata>
|
||||
<metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>746, 17</value>
|
||||
</metadata>
|
||||
<metadata name="TBDD_GROUPSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>960, 17</value>
|
||||
</metadata>
|
||||
<metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1168, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
||||
@ -4,8 +4,8 @@ Public Class frmADImport_Groups
|
||||
Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
|
||||
Try
|
||||
TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString
|
||||
TBDD_GROUPSTableAdapter.Fill(DS_ChangeS.TBDD_GROUPS)
|
||||
'TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString
|
||||
'TBDD_GROUPSTableAdapter.Fill(DS_ChangeS.TBDD_GROUPS)
|
||||
|
||||
Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups()
|
||||
|
||||
@ -33,10 +33,8 @@ Public Class frmADImport_Groups
|
||||
Dim internal As Boolean = False
|
||||
Dim sync As Boolean = True
|
||||
|
||||
|
||||
|
||||
If IsNothing(TBDD_GROUPSTableAdapter.GroupExists(groupRow.GROUPNAME)) Then
|
||||
TBDD_GROUPSTableAdapter.InsertGroup(name, Environment.UserName, 0, True, False, True)
|
||||
If Not ClassData.GroupExists(groupRow.GROUPNAME) Then
|
||||
ClassData.InsertGroup(groupRow.GROUPNAME)
|
||||
importedGroups = importedGroups + 1
|
||||
End If
|
||||
Next
|
||||
|
||||
@ -37,8 +37,6 @@ Partial Class frmADImport_Users
|
||||
Me.colEMAIL = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.Panel1 = New System.Windows.Forms.Panel()
|
||||
Me.btnImport = New System.Windows.Forms.Button()
|
||||
Me.TBDD_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USERTableAdapter()
|
||||
Me.TableAdapterManager = New DDUserManager.UserDataSetTableAdapters.TableAdapterManager()
|
||||
CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.gridAD_Users, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@ -161,24 +159,6 @@ Partial Class frmADImport_Users
|
||||
Me.btnImport.Text = "Import starten"
|
||||
Me.btnImport.UseVisualStyleBackColor = True
|
||||
'
|
||||
'TBDD_USERTableAdapter
|
||||
'
|
||||
Me.TBDD_USERTableAdapter.ClearBeforeFill = True
|
||||
'
|
||||
'TableAdapterManager
|
||||
'
|
||||
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
|
||||
Me.TableAdapterManager.TBDD_CLIENT_USERTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_GROUPS_CLIENTTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_GROUPS_MODULESTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_MODULESTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_USER_MODULESTableAdapter = Nothing
|
||||
Me.TableAdapterManager.TBDD_USERTableAdapter = Me.TBDD_USERTableAdapter
|
||||
Me.TableAdapterManager.UpdateOrder = DDUserManager.UserDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
|
||||
'
|
||||
'frmADImport_Users
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@ -213,7 +193,5 @@ Partial Class frmADImport_Users
|
||||
Friend WithEvents colEMAIL As DevExpress.XtraGrid.Columns.GridColumn
|
||||
Friend WithEvents colSELECTED As DevExpress.XtraGrid.Columns.GridColumn
|
||||
Friend WithEvents btnImport As Button
|
||||
Friend WithEvents TBDD_USERTableAdapter As UserDataSetTableAdapters.TBDD_USERTableAdapter
|
||||
Friend WithEvents TableAdapterManager As UserDataSetTableAdapters.TableAdapterManager
|
||||
Friend WithEvents Panel1 As Panel
|
||||
End Class
|
||||
|
||||
@ -123,12 +123,6 @@
|
||||
<metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="TBDD_USERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>569, 17</value>
|
||||
</metadata>
|
||||
<metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>758, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
|
||||
@ -7,9 +7,6 @@ Public Class frmADImport_Users
|
||||
|
||||
Private Sub frmADImport_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
Try
|
||||
TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString
|
||||
|
||||
' Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(Environment.UserName)
|
||||
Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups()
|
||||
|
||||
gridAD_Groups.DataSource = groups
|
||||
@ -58,8 +55,8 @@ Public Class frmADImport_Users
|
||||
Dim Email As String = IIf(IsDBNull(userRow.EMAIL), Nothing, userRow.EMAIL)
|
||||
|
||||
|
||||
If IsNothing(TBDD_USERTableAdapter.UserExists(userRow.USERNAME)) Then
|
||||
TBDD_USERTableAdapter.InsertUser(Prename, Name, Username, Email, Environment.UserName)
|
||||
If Not ClassData.UserExists(userRow.USERNAME) Then
|
||||
ClassData.InsertUser(Username, Prename, Name, Email)
|
||||
importedUsers = importedUsers + 1
|
||||
End If
|
||||
Next
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user