X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=pkgs%2Fwebapps%2Fetherpad-lite%2Fmodules%2Fep_mypads%2Ffix_ldap.patch;fp=pkgs%2Fwebapps%2Fetherpad-lite%2Fmodules%2Fep_mypads%2Ffix_ldap.patch;h=0000000000000000000000000000000000000000;hp=6ade6cb505beca3b2d1a86b7904eca5c688e2f7f;hb=1a64deeb894dc95e2645a75771732c6cc53a79ad;hpb=fa25ffd4583cc362075cd5e1b4130f33306103f0

diff --git a/pkgs/webapps/etherpad-lite/modules/ep_mypads/fix_ldap.patch b/pkgs/webapps/etherpad-lite/modules/ep_mypads/fix_ldap.patch
deleted file mode 100644
index 6ade6cb..0000000
--- a/pkgs/webapps/etherpad-lite/modules/ep_mypads/fix_ldap.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/auth.js b/auth.js
-index ce77ee4..235d8e6 100644
---- a/auth.js
-+++ b/auth.js
-@@ -91,6 +91,7 @@ var cuid        = require('cuid');
- var common = require('./model/common.js');
- var user   = require('./model/user.js');
- var conf   = require('./configuration.js');
-+var utils  = require('./utils.js');
- 
- var NOT_INTERNAL_AUTH_PWD = 'soooooo_useless';
- 
-@@ -232,21 +233,21 @@ module.exports = (function () {
-               // We have to create the user in mypads database
-               ldapConf  = conf.get('authLdapSettings');
-               user.set({
--                  login: ldapuser[props.login],
-+                  login: utils.getSingleton(ldapuser[props.login]),
-                   password: NOT_INTERNAL_AUTH_PWD,
--                  firstname: ldapuser[props.firstname],
--                  lastname: ldapuser[props.lastname],
-+                  firstname: utils.getSingleton(ldapuser[props.firstname]),
-+                  lastname: utils.getSingleton(ldapuser[props.lastname]),
-                   email: mail,
-                   lang: ldapConf.defaultLang || 'en'
-                 }, callback);
-             } else if (u.email     !== mail                      ||
--                       u.firstname !== ldapuser[props.firstname] ||
--                       u.lastname  !== ldapuser[props.lastname]) {
-+                       u.firstname !== utils.getSingleton(ldapuser[props.firstname]) ||
-+                       u.lastname  !== utils.getSingleton(ldapuser[props.lastname])) {
-                 // Update database and cache informations if needed
-                 // (i.e. update from LDAP)
-                 u.email     = mail;
--                u.firstname = ldapuser[props.firstname];
--                u.lastname  = ldapuser[props.lastname];
-+                u.firstname = utils.getSingleton(ldapuser[props.firstname]);
-+                u.lastname  = utils.getSingleton(ldapuser[props.lastname]);
-                 u.password  = NOT_INTERNAL_AUTH_PWD;
-                 user.set(u, callback);
-             } else {
-diff --git a/utils.js b/utils.js
-index 32c2727..d381d06 100644
---- a/utils.js
-+++ b/utils.js
-@@ -14,3 +14,13 @@ exports.callbackify2 = function (fun) {
-     return wrapPromise(fun(arg1, arg2), cb);
-   };
- };
-+
-+exports.getSingleton = function (stringOrArray) {
-+  if (Array.isArray(stringOrArray)) {
-+    if (stringOrArray.length > 0) {
-+      return stringOrArray[0];
-+    }
-+  } else if (stringOrArray) {
-+    return stringOrArray;
-+  }
-+}