Merge pull request #32 from crobibero/master

Enable EasyPin login
jellyfin · Apr 25, 2020 · 7ea822e · 7ea822e
2 parents 4241514 + 0609564
commit 7ea822e
Show file tree

Hide file tree

Showing 6 changed files with 290 additions and 195 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@
 /LDAP-Auth.sln.DotSettings.user
 /bin/Debug/netstandard2.0
 /.vs/LDAP-Auth/v15
+.idea
diff --git a/LDAP-Auth/Config/PluginConfiguration.cs b/LDAP-Auth/Config/PluginConfiguration.cs
@@ -13,6 +13,7 @@ public class PluginConfiguration :  MediaBrowser.Model.Plugins.BasePluginConfigu
         public string LdapBindPassword { get; set; }
         public bool CreateUsersFromLdap { get; set; }
         public bool UseSsl { get; set; }
+        public string EasyPasswordField { get; set; }
         public bool UseStartTls { get; set; }
         public bool SkipSslVerify { get; set; }
 
@@ -27,6 +28,7 @@ public PluginConfiguration()
             LdapAdminFilter = "(enabledService=JellyfinAdministrator)";
             LdapBindUser = "CN=BindUser,DC=contoso,DC=com";
             LdapBindPassword = "password";
+            EasyPasswordField = string.Empty;
             CreateUsersFromLdap = true;
             UseSsl = true;
             UseStartTls = false;

diff --git a/LDAP-Auth/Config/configPage.html b/LDAP-Auth/Config/configPage.html
@@ -73,6 +73,10 @@ <h2 class="sectionTitle">LDAP Settings:</h2>
                                 <input is="emby-input" type="password" id="txtLdapBindPassword" label="LDAP Bind User Password:" />
                                 <div class="fieldDescription">The password for the LDAP search query user.</div>
                             </div>
+                            <div class="inputContainer fldExternalAddressFilter">
+                                <input is="emby-input" type="text" id="txtLdapEasyPasswordAttr" label="LDAP Easy Password Attribute:" />
+                                <div class="fieldDescription">The attribute to store the Easy Password in.</div>
+                            </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label>
                                     <input type="checkbox" is="emby-checkbox" id="chkEnableUserCreation" />
@@ -121,6 +125,7 @@ <h2 class="sectionTitle">LDAP Settings:</h2>
                     $('#txtLdapAdminFilter', page).val(config.LdapAdminFilter || "(enabledService=JellyfinAdministrator");
                     $('#txtLdapBindUser', page).val(config.LdapBindUser || "CN=BindUser,DC=contoso,DC=com");
                     $('#txtLdapBindPassword', page).val(config.LdapBindPassword || "");
+                    $('#txtLdapEasyPasswordAttr', page).val(config.EasyPasswordField || "");
                     $("#chkEnableUserCreation", page).checked(config.CreateUsersFromLdap);
                     Dashboard.hideLoadingMsg();
                 });
@@ -144,6 +149,7 @@ <h2 class="sectionTitle">LDAP Settings:</h2>
                     config.LdapAdminFilter = $('#txtLdapAdminFilter', form).val();
                     config.LdapBindUser = $('#txtLdapBindUser', form).val();
                     config.LdapBindPassword = $('#txtLdapBindPassword', form).val();
+                    config.EasyPasswordField = $('#txtLdapEasyPasswordAttr', form).val();
                     config.CreateUsersFromLdap = $("#chkEnableUserCreation", form).checked();
                     config.LdapPort = parseInt($("#txtLdapPort", form).val() || "389");
 

diff --git a/LDAP-Auth/LDAP-Auth.csproj b/LDAP-Auth/LDAP-Auth.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Jellyfin.Plugin.LDAP_Auth</RootNamespace>
-    <AssemblyVersion>6.0.0</AssemblyVersion>
-    <FileVersion>6.0.0</FileVersion>
+    <AssemblyVersion>7.0.0</AssemblyVersion>
+    <FileVersion>7.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Config\configPage.html" />
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jellyfin.Controller" Version="10.4-*" />
-    <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="2.3.8" />
+    <PackageReference Include="Jellyfin.Controller" Version="10.5-*" />
+    <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.0.3" />
   </ItemGroup>
 </Project>