Revert forking ldapjs.

Thanks to xet7 !

package-lock.json

@@ -39,6 +39,85 @@
         "lodash.uniq": "^4.5.0"
       }
     },
+    "@ldapjs/asn1": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@ldapjs/asn1/-/asn1-2.0.0.tgz",
+      "integrity": "sha512-G9+DkEOirNgdPmD0I8nu57ygQJKOOgFEMKknEuQvIHbGLwP3ny1mY+OTUYLCbCaGJP4sox5eYgBJRuSUpnAddA=="
+    },
+    "@ldapjs/attribute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@ldapjs/attribute/-/attribute-1.0.0.tgz",
+      "integrity": "sha512-ptMl2d/5xJ0q+RgmnqOi3Zgwk/TMJYG7dYMC0Keko+yZU6n+oFM59MjQOUht5pxJeS4FWrImhu/LebX24vJNRQ==",
+      "requires": {
+        "@ldapjs/asn1": "2.0.0",
+        "@ldapjs/protocol": "^1.2.1",
+        "process-warning": "^2.1.0"
+      }
+    },
+    "@ldapjs/change": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@ldapjs/change/-/change-1.0.0.tgz",
+      "integrity": "sha512-EOQNFH1RIku3M1s0OAJOzGfAohuFYXFY4s73wOhRm4KFGhmQQ7MChOh2YtYu9Kwgvuq1B0xKciXVzHCGkB5V+Q==",
+      "requires": {
+        "@ldapjs/asn1": "2.0.0",
+        "@ldapjs/attribute": "1.0.0"
+      }
+    },
+    "@ldapjs/controls": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@ldapjs/controls/-/controls-2.1.0.tgz",
+      "integrity": "sha512-2pFdD1yRC9V9hXfAWvCCO2RRWK9OdIEcJIos/9cCVP9O4k72BY1bLDQQ4KpUoJnl4y/JoD4iFgM+YWT3IfITWw==",
+      "requires": {
+        "@ldapjs/asn1": "^1.2.0",
+        "@ldapjs/protocol": "^1.2.1"
+      },
+      "dependencies": {
+        "@ldapjs/asn1": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/@ldapjs/asn1/-/asn1-1.2.0.tgz",
+          "integrity": "sha512-KX/qQJ2xxzvO2/WOvr1UdQ+8P5dVvuOLk/C9b1bIkXxZss8BaR28njXdPgFCpj5aHaf1t8PmuVnea+N9YG9YMw=="
+        }
+      }
+    },
+    "@ldapjs/dn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@ldapjs/dn/-/dn-1.1.0.tgz",
+      "integrity": "sha512-R72zH5ZeBj/Fujf/yBu78YzpJjJXG46YHFo5E4W1EqfNpo1UsVPqdLrRMXeKIsJT3x9dJVIfR6OpzgINlKpi0A==",
+      "requires": {
+        "@ldapjs/asn1": "2.0.0",
+        "process-warning": "^2.1.0"
+      }
+    },
+    "@ldapjs/filter": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@ldapjs/filter/-/filter-2.1.1.tgz",
+      "integrity": "sha512-TwPK5eEgNdUO1ABPBUQabcZ+h9heDORE4V9WNZqCtYLKc06+6+UAJ3IAbr0L0bYTnkkWC/JEQD2F+zAFsuikNw==",
+      "requires": {
+        "@ldapjs/asn1": "2.0.0",
+        "@ldapjs/protocol": "^1.2.1",
+        "process-warning": "^2.1.0"
+      }
+    },
+    "@ldapjs/messages": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ldapjs/messages/-/messages-1.3.0.tgz",
+      "integrity": "sha512-K7xZpXJ21bj92jS35wtRbdcNrwmxAtPwy4myeh9duy/eR3xQKvikVycbdWVzkYEAVE5Ce520VXNOwCHjomjCZw==",
+      "requires": {
+        "@ldapjs/asn1": "^2.0.0",
+        "@ldapjs/attribute": "^1.0.0",
+        "@ldapjs/change": "^1.0.0",
+        "@ldapjs/controls": "^2.1.0",
+        "@ldapjs/dn": "^1.1.0",
+        "@ldapjs/filter": "^2.1.1",
+        "@ldapjs/protocol": "^1.2.1",
+        "process-warning": "^2.2.0"
+      }
+    },
+    "@ldapjs/protocol": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@ldapjs/protocol/-/protocol-1.2.1.tgz",
+      "integrity": "sha512-O89xFDLW2gBoZWNXuXpBSM32/KealKCTb3JGtJdtUQc7RjAk8XzrRgyz02cPAwGKwKPxy0ivuC7UP9bmN87egQ=="
+    },
     "@mapbox/node-pre-gyp": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
@@ -108,43 +187,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
       "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="
     },
-    "@wekanteam/asn1": {
-      "version": "github:wekan/asn1#5afa10711f3d59d39412ca30f8d27d4010aea2ab",
-      "from": "github:wekan/asn1"
-    },
-    "@wekanteam/attribute": {
-      "version": "github:wekan/attribute#16b53c09c8b321187a2c9d1394abd2efaa3e0e1e",
-      "from": "github:wekan/attribute",
-      "requires": {
-        "@wekanteam/asn1": "github:wekan/asn1",
-        "@wekanteam/protocol": "github:wekan/protocol",
-        "process-warning": "^2.1.0"
-      }
-    },
-    "@wekanteam/change": {
-      "version": "github:wekan/change#0edd63e0da9bd7fb6de8983d13982b5479d5ba61",
-      "from": "github:wekan/change",
-      "requires": {
-        "@wekanteam/asn1": "github:wekan/asn1",
-        "@wekanteam/attribute": "github:wekan/attribute"
-      }
-    },
-    "@wekanteam/controls": {
-      "version": "github:wekan/controls#1b2dd5c0a9179e0cccf96e40049793a584e29a32",
-      "from": "github:wekan/controls",
-      "requires": {
-        "@wekanteam/asn1": "github:wekan/asn1",
-        "@wekanteam/protocol": "github:wekan/protocol"
-      }
-    },
-    "@wekanteam/dn": {
-      "version": "github:wekan/dn#89d02a4e67dc115f2026e68f4fbd9eede7f2a669",
-      "from": "github:wekan/dn",
-      "requires": {
-        "@wekanteam/asn1": "github:wekan/asn1",
-        "process-warning": "^2.1.0"
-      }
-    },
     "@wekanteam/exceljs": {
       "version": "github:wekan/exceljs#e0229907e7a81bc3fe6daf4e42b1fdfbecdcb7cb",
       "from": "github:wekan/exceljs",
@@ -160,54 +202,11 @@
         "uuid": "^8.3.0"
       }
     },
-    "@wekanteam/filter": {
-      "version": "github:wekan/filter#062de81f55aab95e75f0851b6da4cf3c7a69559c",
-      "from": "github:wekan/filter",
-      "requires": {
-        "@wekanteam/asn1": "github:wekan/asn1",
-        "@wekanteam/protocol": "github:wekan/protocol",
-        "process-warning": "^2.1.0"
-      }
-    },
     "@wekanteam/html-to-markdown": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@wekanteam/html-to-markdown/-/html-to-markdown-1.0.2.tgz",
       "integrity": "sha512-PxeGIu/HMjmL84N2Dj5qp4lFlBP4jV/y6WU/JhDiFPx6gfGEWXgDcc9sShTPNvECtToGAA0SCD6T/k50CMHi8Q=="
     },
-    "@wekanteam/ldapjs": {
-      "version": "github:wekan/node-ldapjs#9500317e0b583f6581bf82b720efdbf287b04e1f",
-      "from": "github:wekan/node-ldapjs",
-      "requires": {
-        "@wekanteam/asn1": "github:wekan/asn1",
-        "@wekanteam/attribute": "github:wekan/attribute",
-        "@wekanteam/change": "github:wekan/change",
-        "@wekanteam/controls": "github:wekan/controls",
-        "@wekanteam/dn": "github:wekan/dn",
-        "@wekanteam/filter": "github:wekan/filter",
-        "@wekanteam/messages": "github:wekan/messages",
-        "@wekanteam/protocol": "github:wekan/protocol",
-        "abstract-logging": "^2.0.1",
-        "assert-plus": "^1.0.0",
-        "backoff": "^2.5.0",
-        "once": "^1.4.0",
-        "vasync": "^2.2.1",
-        "verror": "^1.10.1"
-      }
-    },
-    "@wekanteam/messages": {
-      "version": "github:wekan/messages#fc64622aaa572016140464f16ce08cace1c5e40c",
-      "from": "github:wekan/messages",
-      "requires": {
-        "@wekanteam/asn1": "github:wekan/asn1",
-        "@wekanteam/attribute": "github:wekan/attribute",
-        "@wekanteam/change": "github:wekan/change",
-        "@wekanteam/controls": "github:wekan/controls",
-        "@wekanteam/dn": "github:wekan/dn",
-        "@wekanteam/filter": "github:wekan/filter",
-        "@wekanteam/protocol": "github:wekan/protocol",
-        "process-warning": "^2.2.0"
-      }
-    },
     "@wekanteam/meteor-globals": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@wekanteam/meteor-globals/-/meteor-globals-1.1.4.tgz",
@@ -224,10 +223,6 @@
         "@wekanteam/meteor-globals": "^1.1.4"
       }
     },
-    "@wekanteam/protocol": {
-      "version": "github:wekan/protocol#58ae926cbe694c83b3d000674245b3c0115cfc77",
-      "from": "github:wekan/protocol"
-    },
     "@zxing/text-encoding": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz",
@@ -1249,6 +1244,27 @@
         }
       }
     },
+    "ldapjs": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-3.0.7.tgz",
+      "integrity": "sha512-1ky+WrN+4CFMuoekUOv7Y1037XWdjKpu0xAPwSP+9KdvmV9PG+qOKlssDV6a+U32apwxdD3is/BZcWOYzN30cg==",
+      "requires": {
+        "@ldapjs/asn1": "^2.0.0",
+        "@ldapjs/attribute": "^1.0.0",
+        "@ldapjs/change": "^1.0.0",
+        "@ldapjs/controls": "^2.1.0",
+        "@ldapjs/dn": "^1.1.0",
+        "@ldapjs/filter": "^2.1.1",
+        "@ldapjs/messages": "^1.3.0",
+        "@ldapjs/protocol": "^1.2.1",
+        "abstract-logging": "^2.0.1",
+        "assert-plus": "^1.0.0",
+        "backoff": "^2.5.0",
+        "once": "^1.4.0",
+        "vasync": "^2.2.1",
+        "verror": "^1.10.1"
+      }
+    },
     "lie": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",

package.json

@@ -20,11 +20,10 @@
     "@babel/runtime": "^7.24.7",
     "@mapbox/node-pre-gyp": "^1.0.10",
     "@rwap/jquery-ui-touch-punch": "^1.0.11",
+    "@wekanteam/exceljs": "github:wekan/exceljs",
     "@wekanteam/html-to-markdown": "^1.0.2",
     "@wekanteam/meteor-globals": "^1.1.4",
     "@wekanteam/meteor-reactive-cache": "^1.0.6",
-    "@wekanteam/exceljs": "github:wekan/exceljs",
-    "@wekanteam/ldapjs": "github:wekan/node-ldapjs",
     "ajv": "^6.12.6",
     "bcryptjs": "^2.4.3",
     "bson": "^4.5.2",
@@ -39,6 +38,7 @@
     "jquery": "^3.7.1",
     "jquery-ui": "^1.13.3",
     "jszip": "^3.7.1",
+    "ldapjs": "^3.0.7",
     "markdown-it": "^12.3.2",
     "markdown-it-emoji": "^2.0.0",
     "markdown-it-mathjax3": "^4.3.2",

packages/wekan-ldap/server/ldap.js

@@ -1,4 +1,4 @@
-import ldapjs from '@wekanteam/ldapjs';
+import ldapjs from 'ldapjs';
 import { Log } from 'meteor/logging';
 
 // copied from https://github.com/ldapjs/node-ldapjs/blob/a113953e0d91211eb945d2a3952c84b7af6de41c/lib/filters/index.js#L167