From b7e2ec64a2e7bf13c701d7782aaf0ad04fe45d50 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 15 Oct 2019 14:19:39 +0300
Subject: [PATCH] LdapOptions to AbpLdapOptions

---
 framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs    | 2 +-
 .../Volo/Abp/Ldap/{LdapOptions.cs => AbpLdapOptions.cs}       | 4 ++--
 framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs      | 4 ++--
 .../Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs   | 2 +-
 .../Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/{LdapOptions.cs => AbpLdapOptions.cs} (87%)

diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs
index 22b9ca7a76..b35e1b1d59 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.Ldap
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var configuration = context.Services.GetConfiguration();
-            Configure<LdapOptions>(configuration.GetSection("LDAP"));
+            Configure<AbpLdapOptions>(configuration.GetSection("LDAP"));
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapOptions.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs
similarity index 87%
rename from framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapOptions.cs
rename to framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs
index 7e4aacfa0e..671d623ff7 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapOptions.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs
@@ -1,6 +1,6 @@
 namespace Volo.Abp.Ldap
 {
-    public class LdapOptions
+    public class AbpLdapOptions
     {
         public string ServerHost { get; set; }
 
@@ -16,7 +16,7 @@
 
         public LdapCredentials Credentials { get; set; }
 
-        public LdapOptions()
+        public AbpLdapOptions()
         {
             Credentials = new LdapCredentials();
         }
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs
index 615b22d70e..d54e7d82d0 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.Ldap
     public class LdapManager : ILdapManager, ITransientDependency
     {
         private readonly string _searchBase;
-        private readonly LdapOptions _ldapOptions;
+        private readonly AbpLdapOptions _ldapOptions;
 
         private readonly string[] _attributes =
         {
@@ -21,7 +21,7 @@ namespace Volo.Abp.Ldap
             "sAMAccountName", "userPrincipalName", "telephoneNumber", "mail"
         };
 
-        public LdapManager(IOptions<LdapOptions> ldapSettingsOptions)
+        public LdapManager(IOptions<AbpLdapOptions> ldapSettingsOptions)
         {
             _ldapOptions = ldapSettingsOptions.Value;
             _searchBase = _ldapOptions.SearchBase;
diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs
index 35f631b8d2..c59dc0d9e1 100644
--- a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs
+++ b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs
@@ -57,7 +57,7 @@ namespace Volo.Abp.Ldap
                 //     "ServerPort": 636,
                 //     "UseSSL": true
                 // }
-                Configure<LdapOptions>(settings =>
+                Configure<AbpLdapOptions>(settings =>
                 {
                     settings.ServerHost = "192.168.101.54";
                     settings.ServerPort = 636;
diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs
index 00d9287c4f..01906c8f18 100644
--- a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs
+++ b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs
@@ -227,7 +227,7 @@ namespace Volo.Abp.Ldap
                 //     "DomainName": "yourdomain.com.cn",
                 //     "DomainDistinguishedName": "DC=yourdomain,DC=com,DC=cn"
                 // }
-                Configure<LdapOptions>(settings =>
+                Configure<AbpLdapOptions>(settings =>
                 {
                     settings.ServerHost = "192.168.101.54";
                     settings.ServerPort = 636;