wekan · maximeconnolly · Aug 10, 2018
diff --git a/.meteor/packages b/.meteor/packages
@@ -85,4 +85,5 @@ browser-policy
 eluck:accounts-lockout
 rzymek:fullcalendar
 momentjs:moment@2.22.2
-atoy40:accounts-cas
+atoy40:accounts-cas
+maximestpierre:meteor-ldap
diff --git a/.meteor/versions b/.meteor/versions
@@ -86,6 +86,7 @@ localstorage@1.2.0
 logging@1.1.19
 matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
+maximestpierre:meteor-ldap@0.0.2
 mdg:validation-error@0.5.1
 meteor@1.8.2
 meteor-base@1.2.0
@@ -176,4 +177,5 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp-hashing@1.0.9
+yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
@@ -17,6 +17,9 @@ template(name="userFormsLayout")
       img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
     section.auth-dialog
       +Template.dynamic(template=content)
+      if isLdap
+        .at-form
+        button#ldap(class='at-btn submit') {{ldapSignInLabel}}
       if isCas
         .at-form
           button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}

diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
@@ -45,10 +45,18 @@ Template.userFormsLayout.helpers({
       Meteor.settings.public.cas &&
       Meteor.settings.public.cas.loginUrl;
   },
+  isLdap() {
+    return Meteor.settings.public.ldap;
+  },
+
 
   casSignInLabel() {
     return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en');
   },
+
+  ldapSignInLabel() {
+    return TAPi18n.__('ldapSignIn', {}, T9n.getLanguage() || 'en');
+  },
 });
 
 Template.userFormsLayout.events({
@@ -64,6 +72,21 @@ Template.userFormsLayout.events({
       }
     });
   },
+  'click button#ldap'() {
+    const username = $('#at-field-username_and_email').val() ||
+          $('#at-field-username').val() ||
+          $('#at-field-email').val();
+    const password = $('#at-field-password').val();
+    const options = {};
+    Meteor.loginWithLDAP(username, password, options, function(err) {
+      if (err){
+        console.log(err);
+      }
+      if (FlowRouter.getRouteName() === 'atSignIn') {
+        FlowRouter.go('/');
+      }
+    });
+  },
 });
 
 Template.defaultLayout.events({

diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
     "babel-runtime": "^6.26.0",
     "bson-ext": "^2.0.0",
     "es6-promise": "^4.2.4",
+    "ldapjs": "^1.0.2",
     "meteor-node-stubs": "^0.4.1",
     "os": "^0.1.1",
     "page": "^1.8.6",

diff --git a/server/authentication.js b/server/authentication.js
@@ -63,4 +63,3 @@ Meteor.startup(() => {
   };
 
 });
-