v2.72

Merge pull request #2401 from guyzyl/devel
Added BIDI support to "Add Card" #884
2019-05-13 10:49:41 +03:00 · 2019-05-13 10:42:42 +03:00 · 2019-05-13 00:37:40 +03:00 · 2019-05-12 20:49:27 +03:00 · 2019-05-12 20:43:23 +03:00 · 2019-05-12 20:40:32 +03:00
26 changed files with 298 additions and 150 deletions
@@ -1,9 +1,61 @@
+# v2.72 2019-05-13 Wekan release
+
+This release adds the following new features:
+
+- [Added BIDI support to "Add Card"](https://github.com/wekan/wekan/pull/2401).
+  Related [#884](https://github.com/wekan/wekan/issues/884).
+  Thanks to guyzyl.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.71 2019-05-12 Wekan release
+
+This release adds the following new features:
+
+- [Add partentId support on card web API](https://github.com/wekan/wekan/pulls/2400).
+  Thanks to atilaromero.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.70 2019-05-11 Wekan release
+
+This release adds the following new features:
+
+- [View markdown on List names, Custom Fields (Text and Dropdown), Label names,
+  All Boards view Board names and Board descriptions](https://github.com/wekan/wekan/commit/b795115042c2eb6bccbf029f21d78849a44128ca).
+  Related [#2334](https://github.com/wekan/wekan/issues/2334).
+  Thanks to shaygover and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.69 2019-05-11 Wekan release
+
+This release fixes the following translation names:
+
+- [Fix translation name in Wekan menu: oc to Occitan](https://github.com/wekan/wekan/commit/db40ca25ac5df17fcc8b7c93f12b7e2bffc349d2).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.68 2019-05-10 Wekan release
+
+This release adds the following new features:
+
+- [Option to login to the LDAP server with the user's own username and password, instead of an administrator
+  key](https://github.com/wekan/wekan/pull/2399). Default: false (use administrator key).
+  With new setting: LDAP_USER_AUTHENTICATION=true.
+  Thanks to thiagofernando.
+- [Added above new LDAP_USER_AUTHENTION=true option to Snap, Docker and Source settings](https://github.com/wekan/wekan/commit/3bbc805ee42e3c1638b50260d3fafc2b5f936923).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.67 2019-05-10 Wekan release

 This release adds the following new features:

 - [Move board to Archive button at each board at All Boards page](https://github.com/wekan/wekan/commit/828f6ea321020eda77fea399df52889e2081dfac).
-  Thanks to xet7. Related #2389
+  Thanks to xet7. Related [#2389](https://github.com/wekan/wekan/issues/2389).
 - [If adding Subtasks does not work on old board, added wiki page how to make it work again](https://github.com/wekan/wekan/wiki/Subtasks).
  Thanks to xet7.

@@ -100,7 +152,7 @@ and adds the following updates:
 and fixes the following bugs:

 - [Fix Full width of lists and space before first list](https://github.com/wekan/wekan/pull/2343).
-  Thanks to hupptehcnologies.
+  Thanks to hupptechnologies.
 - Remove [extra](https://github.com/wekan/wekan/pull/2332) [quotes](https://github.com/wekan/wekan/pull/2333) from docker-compose.yml.
  Thanks to hibare.
 - Fix Docker builds by moving all separately cloned wekan/packages/* repos like ldap, oidc, etc code to wekan repo code,
@@ -61,6 +61,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    LDAP_ENCRYPTION=false \
    LDAP_CA_CERT="" \
    LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_AUTHENTICATION=false \
    LDAP_USER_SEARCH_FILTER="" \
    LDAP_USER_SEARCH_SCOPE="" \
    LDAP_USER_SEARCH_FIELD="" \
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.67.0"
+appVersion: "v2.72.0"
 files:
  userUploads:
    - README.md
@@ -18,11 +18,15 @@ template(name="boardList")
          else
            a.js-open-board.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
              span.details
-                span.board-list-item-name= title
+                span.board-list-item-name
+                  +viewer
+                    = title
                i.fa.js-star-board(
                  class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                  title="{{_ 'star-board-title'}}")
-                p.board-list-item-desc= description
+                p.board-list-item-desc
+                  +viewer
+                    = description
                if hasSpentTimeCards
                  i.fa.js-has-spenttime-cards(
                    class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
@@ -4,9 +4,10 @@ template(name="cardCustomFieldsPopup")
            li.item(class="")
                a.name.js-select-field(href="#")
                    span.full-name
+                      +viewer
                        = name
                    if hasCustomField
-                        i.fa.fa-check
+                      i.fa.fa-check
    hr
    a.quiet-button.full.js-settings
        i.fa.fa-cog
@@ -61,9 +62,13 @@ template(name="cardCustomField-dropdown")
            select.inline
                each items
                    if($eq data.value this._id)
-                        option(value=_id selected="selected") {{name}}
+                        option(value=_id selected="selected")
+                          +viewer
+                            = name
                    else
-                        option(value=_id) {{name}}
+                        option(value=_id)
+                          +viewer
+                            = name
            .edit-controls.clearfix
                button.primary(type="submit") {{_ 'save'}}
                a.fa.fa-times-thin.js-close-inlined-form
@@ -73,4 +78,4 @@ template(name="cardCustomField-dropdown")
                    +viewer
                        = selectedItem
                else
-                    | {{_ 'edit'}}
+                    | {{_ 'edit'}}
@@ -77,7 +77,9 @@ template(name="cardDetails")
        h3.card-details-item-title {{_ 'labels'}}
        a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}")
          each labels
-            span.card-label(class="card-label-{{color}}" title=name)= name
+            span.card-label(class="card-label-{{color}}" title=name)
+              +viewer
+                = name
        if canModifyCard
          a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
            i.fa.fa-plus
@@ -86,7 +88,8 @@ template(name="cardDetails")
      each customFieldsWD
        .card-details-item.card-details-item-customfield
          h3.card-details-item-title
-            = definition.name
+            +viewer
+              = definition.name
          +cardCustomField

    .card-details-items
@@ -31,7 +31,8 @@ template(name="cardLabelsPopup")
        a.card-label-edit-button.fa.fa-pencil.js-edit-label
        span.card-label.card-label-selectable.js-select-label(class="card-label-{{color}}"
          class="{{# if isLabelSelected ../_id }}active{{/if}}")
-            = name
+            +viewer
+              = name
            if(isLabelSelected ../_id)
              i.card-label-selectable-icon.fa.fa-check
  if currentUser.isBoardAdmin
@@ -58,7 +58,8 @@ template(name="minicard")
          .minicard-custom-field
            if definition.showLabelOnMiniCard
              .minicard-custom-field-item
-                = definition.name
+                +viewer
+                  = definition.name
            .minicard-custom-field-item
              +viewer
                = trueValue
@@ -39,7 +39,7 @@ template(name="addCardForm")
      .minicard-labels
        each getLabels
          .minicard-label(class="card-label-{{color}}" title="{{name}}")
-    textarea.minicard-composer-textarea.js-card-title(autofocus)
+    textarea.minicard-composer-textarea.js-card-title(autofocus dir="auto")
    if members.get
      .minicard-members.js-minicard-composer-members
        each members.get
@@ -96,7 +96,7 @@ template(name="searchElementPopup")
  form
    label
      | {{_ 'title'}}
-      input.js-element-title(type="text" placeholder="{{_ 'title'}}" autofocus required)
+      input.js-element-title(type="text" placeholder="{{_ 'title'}}" autofocus required dir="auto")
  unless isTemplateSearch
    label {{_ 'boards'}}:
    .link-board-wrapper
@@ -10,7 +10,8 @@ template(name="listHeader")
          a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
      h2.list-header-name(
        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-        = title
+        +viewer
+          = title
        if wipLimit.enabled
         |&nbsp;(
         span(class="{{#if reachedWipLimit}}highlight{{/if}}") {{cards.count}}
@@ -68,6 +68,8 @@ Template.userFormsLayout.helpers({
        name = 'Brezhoneg';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
+      } else if (lang.name === 'oc') {
+        name = 'Occitan';
      }
      return { tag, name };
    }).sort(function(a, b) {
@@ -189,7 +189,9 @@ template(name="labelsWidget")
      each currentBoard.labels
          a.card-label(class="card-label-{{color}}"
            class="{{#if currentUser.isNotCommentOnly}}js-label{{/if}}")
-            span.card-label-name= name
+            span.card-label-name
+              +viewer
+                = name
      if currentUser.isBoardAdmin
        a.card-label.add-label.js-add-label
          i.fa.fa-plus
@@ -6,7 +6,9 @@ template(name="customFieldsSidebar")
                    div.minicard
                        a.fa.fa-pencil.js-edit-custom-field.minicard-edit-button
                        div.minicard-title
-                            | {{ name }} ({{ type }})
+                          +viewer
+                            =name
+                          | ({{ type }})

    if currentUser.isBoardMember
        hr
@@ -119,6 +119,8 @@ Template.changeLanguagePopup.helpers({
        name = 'Brezhoneg';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
+      } else if (lang.name === 'oc') {
+        name = 'Occitan';
      }
      return { tag, name };
    }).sort(function (a, b) {
@@ -400,6 +400,9 @@ services:
      # Reject Unauthorized Certificate
      #- LDAP_REJECT_UNAUTHORIZED=false
      #
+      # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+      #- LDAP_USER_AUTHENTICATION="true"
+      #
      # Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
      #- LDAP_USER_SEARCH_FILTER=
      #
@@ -23,10 +23,10 @@
    "act-createCustomField": "creó el campo personalizado __customField__ en la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
    "act-createList": "añadida la lista __list__ al tablero __board__",
    "act-addBoardMember": "añadido el mimbro __member__ al tablero __board__",
-    "act-archivedBoard": "El tablero __board__ se ha movido a Archivo",
-    "act-archivedCard": "La tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__ se ha movido a Archivo",
-    "act-archivedList": "La lista __list__ del carril __swimlane__ del tablero __board__ se ha movido a Archivo",
-    "act-archivedSwimlane": "El carril __swimlane__ del tablero __board__ se ha movido a Archivo",
+    "act-archivedBoard": "El tablero __board__ se ha archivado",
+    "act-archivedCard": "La tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__ se ha archivado",
+    "act-archivedList": "La lista __list__ del carril __swimlane__ del tablero __board__ se ha archivado",
+    "act-archivedSwimlane": "El carril __swimlane__ del tablero __board__ se ha archivado",
    "act-importBoard": "importado el tablero __board__",
    "act-importCard": "importada la tarjeta __card__ a la lista __list__ del carrril __swimlane__ del tablero __board__",
    "act-importList": "importada la lista __list__ al carril __swimlane__ del tablero __board__",
@@ -42,7 +42,7 @@
    "activities": "Actividades",
    "activity": "Actividad",
    "activity-added": "ha añadido %s a %s",
-    "activity-archived": "%s movido a Archivo",
+    "activity-archived": "%s se ha archivado",
    "activity-attached": "ha adjuntado %s a %s",
    "activity-created": "ha creado %s",
    "activity-customfield-created": "creó el campo personalizado %s",
@@ -92,19 +92,19 @@
    "and-n-other-card_plural": "y otras __count__ tarjetas",
    "apply": "Aplicar",
    "app-is-offline": "Cargando, espera por favor. Refrescar esta página causará pérdida de datos. Si la carga no funciona, por favor comprueba que el servidor no se ha parado.",
-    "archive": "Mover al Archivo",
-    "archive-all": "Mover todo al Archivo",
-    "archive-board": "Mover Tablero al Archivo",
-    "archive-card": "Mover tarjeta al Archivo",
-    "archive-list": "Mover Lista al Archivo",
-    "archive-swimlane": "Mover carril al Archivo",
-    "archive-selection": "Mover selección al Archivo",
-    "archiveBoardPopup-title": "¿Mover Tablero al Archivo?",
-    "archived-items": "Archivar",
+    "archive": "Archivar",
+    "archive-all": "Archivar todo",
+    "archive-board": "Archivar este tablero",
+    "archive-card": "Archivar esta tarjeta",
+    "archive-list": "Archivar esta lista",
+    "archive-swimlane": "Archivar este carril",
+    "archive-selection": "Archivar esta selección",
+    "archiveBoardPopup-title": "¿Archivar este tablero?",
+    "archived-items": "Archivo",
    "archived-boards": "Tableros en Archivo",
    "restore-board": "Restaurar el tablero",
    "no-archived-boards": "No hay Tableros en el Archivo",
-    "archives": "Archivar",
+    "archives": "Archivo",
    "template": "Plantilla",
    "templates": "Plantillas",
    "assign-member": "Asignar miembros",
@@ -133,8 +133,8 @@
    "board-view-lists": "Listas",
    "bucket-example": "Como “Cosas por hacer” por ejemplo",
    "cancel": "Cancelar",
-    "card-archived": "Esta tarjeta se movió al Archivo",
-    "board-archived": "Este tablero se movió al Archivo",
+    "card-archived": "Se archivó esta tarjeta",
+    "board-archived": "Se archivó este tablero",
    "card-comments-title": "Esta tarjeta tiene %s comentarios.",
    "card-delete-notice": "la eliminación es permanente. Perderás todas las acciones asociadas a esta tarjeta.",
    "card-delete-pop": "Se eliminarán todas las acciones del historial de actividades y no se podrá volver a abrir la tarjeta. Esta acción no puede deshacerse.",
@@ -347,7 +347,7 @@
    "leave-board-pop": "¿Seguro que quieres abandonar __boardTitle__? Serás desvinculado de todas las tarjetas en este tablero.",
    "leaveBoardPopup-title": "¿Abandonar el tablero?",
    "link-card": "Enlazar a esta tarjeta",
-    "list-archive-cards": "Mover todas las tarjetas de la lista al Archivo",
+    "list-archive-cards": "Archivar todas las tarjetas de esta lista",
    "list-archive-cards-pop": "Esto eliminará del tablero todas las tarjetas en esta lista. Para ver las tarjetas en el Archivo y recuperarlas al tablero haga click en \"Menu\" > \"Archivo\"",
    "list-move-cards": "Mover todas las tarjetas de esta lista",
    "list-select-cards": "Seleccionar todas las tarjetas de esta lista",
@@ -514,7 +514,7 @@
    "OS_Loadavg": "Carga media del sistema",
    "OS_Platform": "Plataforma del sistema",
    "OS_Release": "Publicación del sistema",
-    "OS_Totalmem": "Memoria Total del sistema",
+    "OS_Totalmem": "Memoria total del sistema",
    "OS_Type": "Tipo de sistema",
    "OS_Uptime": "Tiempo activo del sistema",
    "days": "días",
@@ -528,8 +528,8 @@
    "no": "No",
    "accounts": "Cuentas",
    "accounts-allowEmailChange": "Permitir cambiar el correo electrónico",
-    "accounts-allowUserNameChange": "Permitir el cambio del nombre de usuario",
-    "createdAt": "Creado en",
+    "accounts-allowUserNameChange": "Permitir cambiar el nombre de usuario",
+    "createdAt": "Fecha de alta",
    "verified": "Verificado",
    "active": "Activo",
    "card-received": "Recibido",
@@ -592,7 +592,7 @@
    "set-filter": "Filtrar",
    "r-moved-to": "Movido a",
    "r-moved-from": "Movido desde",
-    "r-archived": "Movido a Archivo",
+    "r-archived": "Se archivó",
    "r-unarchived": "Restaurado del archivo",
    "r-a-card": "una tarjeta",
    "r-when-a-label-is": "Cuando una etiqueta es",
@@ -610,11 +610,11 @@
    "r-when-the-item": "Cuando el elemento de la lista de verificación es",
    "r-checked": "Marcado",
    "r-unchecked": "Desmarcado",
-    "r-move-card-to": "Mover tarjeta a",
+    "r-move-card-to": "Mover la tarjeta a",
    "r-top-of": "Arriba de",
    "r-bottom-of": "Abajo de",
    "r-its-list": "su lista",
-    "r-archive": "Mover al Archivo",
+    "r-archive": "Archivar",
    "r-unarchive": "Restaurar del Archivo",
    "r-card": "tarjeta",
    "r-add": "Añadir",
@@ -635,15 +635,15 @@
    "r-to": "a",
    "r-subject": "asunto",
    "r-rule-details": "Detalle de la regla",
-    "r-d-move-to-top-gen": "Mover tarjeta arriba de su lista",
-    "r-d-move-to-top-spec": "Mover tarjeta arriba de la lista",
-    "r-d-move-to-bottom-gen": "Mover tarjeta abajo de su lista",
-    "r-d-move-to-bottom-spec": "Mover tarjeta al fondo de la lista",
+    "r-d-move-to-top-gen": "Mover la tarjeta al inicio de su lista",
+    "r-d-move-to-top-spec": "Mover la tarjeta al inicio de la lista",
+    "r-d-move-to-bottom-gen": "Mover la tarjeta al final de su lista",
+    "r-d-move-to-bottom-spec": "Mover la tarjeta al final de la lista",
    "r-d-send-email": "Enviar email",
    "r-d-send-email-to": "a",
    "r-d-send-email-subject": "asunto",
    "r-d-send-email-message": "mensaje",
-    "r-d-archive": "Mover tarjeta al Archivo",
+    "r-d-archive": "Archivar la tarjeta",
    "r-d-unarchive": "Restaurar tarjeta del Archivo",
    "r-d-add-label": "Añadir etiqueta",
    "r-d-remove-label": "Eliminar etiqueta",
@@ -675,7 +675,7 @@
    "authentication-method": "Método de autenticación",
    "authentication-type": "Tipo de autenticación",
    "custom-product-name": "Nombre de producto personalizado",
-    "layout": "Disñeo",
+    "layout": "Diseño",
    "hide-logo": "Ocultar logo",
    "add-custom-html-after-body-start": "Añade HTML personalizado después de <body> ",
    "add-custom-html-before-body-end": "Añade HTML personalizado después de </body>",
@@ -1685,6 +1685,7 @@ if (Meteor.isServer) {
   * @param {string} boardId the board ID of the new card
   * @param {string} listId the list ID of the new card
   * @param {string} authorID the user ID of the person owning the card
+   * @param {string} parentId the parent ID of the new card
   * @param {string} title the title of the new card
   * @param {string} description the description of the new card
   * @param {string} swimlaneId the swimlane ID of the new card
@@ -1695,6 +1696,7 @@ if (Meteor.isServer) {
    Authentication.checkUserId(req.userId);
    const paramBoardId = req.params.boardId;
    const paramListId = req.params.listId;
+    const paramParentId = req.params.parentId;
    const currentCards = Cards.find({
      listId: paramListId,
      archived: false,
@@ -1708,6 +1710,7 @@ if (Meteor.isServer) {
        title: req.body.title,
        boardId: paramBoardId,
        listId: paramListId,
+        parentId: paramParentId,
        description: req.body.description,
        userId: req.body.authorId,
        swimlaneId: req.body.swimlaneId,
@@ -1761,6 +1764,7 @@ if (Meteor.isServer) {
   * @param {string} [listId] the new list ID of the card (move operation)
   * @param {string} [description] the new description of the card
   * @param {string} [authorId] change the owner of the card
+   * @param {string} [parentId] change the parent of the card
   * @param {string} [labelIds] the new list of label IDs attached to the card
   * @param {string} [swimlaneId] the new swimlane ID of the card
   * @param {string} [members] the new list of member IDs attached to the card
@@ -1817,6 +1821,19 @@ if (Meteor.isServer) {
      }, paramListId);

    }
+    if (req.body.hasOwnProperty('parentId')) {
+      const newParentId = req.body.parentId;
+      Cards.direct.update({
+        _id: paramCardId,
+        listId: paramListId,
+        boardId: paramBoardId,
+        archived: false,
+      }, {
+        $set: {
+          parentId: newParentId,
+        },
+      });
+    }
    if (req.body.hasOwnProperty('description')) {
      const newDescription = req.body.description;
      Cards.direct.update({
@@ -1,6 +1,6 @@
 {
  "name": "wekan",
-  "version": "v2.67.0",
+  "version": "v2.72.0",
  "description": "Open-Source kanban",
  "private": true,
  "scripts": {
@@ -1,41 +1,44 @@
 import ldapjs from 'ldapjs';
 import util from 'util';
 import Bunyan from 'bunyan';
-import { log_debug, log_info, log_warn, log_error } from './logger';
+import {log_debug, log_info, log_warn, log_error} from './logger';
+

 export default class LDAP {
-  constructor(){
+  constructor() {
    this.ldapjs = ldapjs;

    this.connected = false;

    this.options = {
-      host: this.constructor.settings_get('LDAP_HOST'),
-      port: this.constructor.settings_get('LDAP_PORT'),
-      Reconnect: this.constructor.settings_get('LDAP_RECONNECT'),
-      timeout: this.constructor.settings_get('LDAP_TIMEOUT'),
-      connect_timeout: this.constructor.settings_get('LDAP_CONNECT_TIMEOUT'),
-      idle_timeout: this.constructor.settings_get('LDAP_IDLE_TIMEOUT'),
-      encryption: this.constructor.settings_get('LDAP_ENCRYPTION'),
-      ca_cert: this.constructor.settings_get('LDAP_CA_CERT'),
-      reject_unauthorized: this.constructor.settings_get('LDAP_REJECT_UNAUTHORIZED') || false,
-      Authentication: this.constructor.settings_get('LDAP_AUTHENTIFICATION'),
-      Authentication_UserDN: this.constructor.settings_get('LDAP_AUTHENTIFICATION_USERDN'),
-      Authentication_Password: this.constructor.settings_get('LDAP_AUTHENTIFICATION_PASSWORD'),
-      Authentication_Fallback: this.constructor.settings_get('LDAP_LOGIN_FALLBACK'),
-      BaseDN: this.constructor.settings_get('LDAP_BASEDN'),
-      Internal_Log_Level: this.constructor.settings_get('INTERNAL_LOG_LEVEL'),
-      User_Search_Filter: this.constructor.settings_get('LDAP_USER_SEARCH_FILTER'),
-      User_Search_Scope: this.constructor.settings_get('LDAP_USER_SEARCH_SCOPE'),
-      User_Search_Field: this.constructor.settings_get('LDAP_USER_SEARCH_FIELD'),
-      Search_Page_Size: this.constructor.settings_get('LDAP_SEARCH_PAGE_SIZE'),
-      Search_Size_Limit: this.constructor.settings_get('LDAP_SEARCH_SIZE_LIMIT'),
-      group_filter_enabled: this.constructor.settings_get('LDAP_GROUP_FILTER_ENABLE'),
-      group_filter_object_class: this.constructor.settings_get('LDAP_GROUP_FILTER_OBJECTCLASS'),
-      group_filter_group_id_attribute: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE'),
+      host                               : this.constructor.settings_get('LDAP_HOST'),
+      port                               : this.constructor.settings_get('LDAP_PORT'),
+      Reconnect                          : this.constructor.settings_get('LDAP_RECONNECT'),
+      timeout                            : this.constructor.settings_get('LDAP_TIMEOUT'),
+      connect_timeout                    : this.constructor.settings_get('LDAP_CONNECT_TIMEOUT'),
+      idle_timeout                       : this.constructor.settings_get('LDAP_IDLE_TIMEOUT'),
+      encryption                         : this.constructor.settings_get('LDAP_ENCRYPTION'),
+      ca_cert                            : this.constructor.settings_get('LDAP_CA_CERT'),
+      reject_unauthorized                : this.constructor.settings_get('LDAP_REJECT_UNAUTHORIZED') || false,
+      Authentication                     : this.constructor.settings_get('LDAP_AUTHENTIFICATION'),
+      Authentication_UserDN              : this.constructor.settings_get('LDAP_AUTHENTIFICATION_USERDN'),
+      Authentication_Password            : this.constructor.settings_get('LDAP_AUTHENTIFICATION_PASSWORD'),
+      Authentication_Fallback            : this.constructor.settings_get('LDAP_LOGIN_FALLBACK'),
+      BaseDN                             : this.constructor.settings_get('LDAP_BASEDN'),
+      Internal_Log_Level                 : this.constructor.settings_get('INTERNAL_LOG_LEVEL'),
+      User_Authentication                : this.constructor.settings_get('LDAP_USER_AUTHENTICATION'),
+      User_Attributes                    : this.constructor.settings_get('LDAP_USER_ATTRIBUTES'),
+      User_Search_Filter                 : this.constructor.settings_get('LDAP_USER_SEARCH_FILTER'),
+      User_Search_Scope                  : this.constructor.settings_get('LDAP_USER_SEARCH_SCOPE'),
+      User_Search_Field                  : this.constructor.settings_get('LDAP_USER_SEARCH_FIELD'),
+      Search_Page_Size                   : this.constructor.settings_get('LDAP_SEARCH_PAGE_SIZE'),
+      Search_Size_Limit                  : this.constructor.settings_get('LDAP_SEARCH_SIZE_LIMIT'),
+      group_filter_enabled               : this.constructor.settings_get('LDAP_GROUP_FILTER_ENABLE'),
+      group_filter_object_class          : this.constructor.settings_get('LDAP_GROUP_FILTER_OBJECTCLASS'),
+      group_filter_group_id_attribute    : this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE'),
      group_filter_group_member_attribute: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE'),
-      group_filter_group_member_format: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT'),
-      group_filter_group_name: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_NAME'),
+      group_filter_group_member_format   : this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT'),
+      group_filter_group_name            : this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_NAME'),
    };
  }

@@ -52,14 +55,16 @@ export default class LDAP {
      log_warn(`Lookup for unset variable: ${name}`);
    }
  }
+
  connectSync(...args) {
-    if (!this._connectSync) {
+     if (!this._connectSync) {
      this._connectSync = Meteor.wrapAsync(this.connectAsync, this);
    }
    return this._connectSync(...args);
  }

  searchAllSync(...args) {
+
    if (!this._searchAllSync) {
      this._searchAllSync = Meteor.wrapAsync(this.searchAllAsync, this);
    }
@@ -72,19 +77,19 @@ export default class LDAP {
    let replied = false;

    const connectionOptions = {
-      url: `${ this.options.host }:${ this.options.port }`,
-      timeout: this.options.timeout,
+      url           : `${this.options.host}:${this.options.port}`,
+      timeout       : this.options.timeout,
      connectTimeout: this.options.connect_timeout,
-      idleTimeout: this.options.idle_timeout,
-      reconnect: this.options.Reconnect,
+      idleTimeout   : this.options.idle_timeout,
+      reconnect     : this.options.Reconnect,
    };

    if (this.options.Internal_Log_Level !== 'disabled') {
      connectionOptions.log = new Bunyan({
-        name: 'ldapjs',
+        name     : 'ldapjs',
        component: 'client',
-        stream: process.stderr,
-        level: this.options.Internal_Log_Level,
+        stream   : process.stderr,
+        level    : this.options.Internal_Log_Level,
      });
    }

@@ -95,8 +100,8 @@ export default class LDAP {
    if (this.options.ca_cert && this.options.ca_cert !== '') {
      // Split CA cert into array of strings
      const chainLines = this.constructor.settings_get('LDAP_CA_CERT').split('\n');
-      let cert = [];
-      const ca = [];
+      let cert         = [];
+      const ca         = [];
      chainLines.forEach((line) => {
        cert.push(line);
        if (line.match(/-END CERTIFICATE-/)) {
@@ -108,14 +113,14 @@ export default class LDAP {
    }

    if (this.options.encryption === 'ssl') {
-      connectionOptions.url = `ldaps://${ connectionOptions.url }`;
+      connectionOptions.url        = `ldaps://${connectionOptions.url}`;
      connectionOptions.tlsOptions = tlsOptions;
    } else {
-      connectionOptions.url = `ldap://${ connectionOptions.url }`;
+      connectionOptions.url = `ldap://${connectionOptions.url}`;
    }

    log_info('Connecting', connectionOptions.url);
-    log_debug(`connectionOptions${  util.inspect(connectionOptions)}`);
+    log_debug(`connectionOptions${util.inspect(connectionOptions)}`);

    this.client = ldapjs.createClient(connectionOptions);

@@ -189,23 +194,42 @@ export default class LDAP {

    if (this.options.User_Search_Filter !== '') {
      if (this.options.User_Search_Filter[0] === '(') {
-        filter.push(`${ this.options.User_Search_Filter }`);
+        filter.push(`${this.options.User_Search_Filter}`);
      } else {
-        filter.push(`(${ this.options.User_Search_Filter })`);
+        filter.push(`(${this.options.User_Search_Filter})`);
      }
    }

-    const usernameFilter = this.options.User_Search_Field.split(',').map((item) => `(${ item }=${ username })`);
+    const usernameFilter = this.options.User_Search_Field.split(',').map((item) => `(${item}=${username})`);

    if (usernameFilter.length === 0) {
      log_error('LDAP_LDAP_User_Search_Field not defined');
    } else if (usernameFilter.length === 1) {
-      filter.push(`${ usernameFilter[0] }`);
+      filter.push(`${usernameFilter[0]}`);
    } else {
-      filter.push(`(|${ usernameFilter.join('') })`);
+      filter.push(`(|${usernameFilter.join('')})`);
    }

-    return `(&${ filter.join('') })`;
+    return `(&${filter.join('')})`;
+  }
+
+  bindUserIfNecessary(username, password) {
+
+    if (this.domainBinded === true) {
+      return;
+    }
+
+    if (!this.options.User_Authentication) {
+      return;
+    }
+
+
+    if (!this.options.BaseDN) throw new Error('BaseDN is not provided');
+
+    const userDn = `uid=${username},${this.options.BaseDN}`;
+
+    this.bindSync(userDn, password);
+    this.domainBinded = true;
  }

  bindIfNecessary() {
@@ -218,22 +242,24 @@ export default class LDAP {
    }

    log_info('Binding UserDN', this.options.Authentication_UserDN);
+
    this.bindSync(this.options.Authentication_UserDN, this.options.Authentication_Password);
    this.domainBinded = true;
  }

  searchUsersSync(username, page) {
    this.bindIfNecessary();
-
    const searchOptions = {
-      filter: this.getUserFilter(username),
-      scope: this.options.User_Search_Scope || 'sub',
+      filter   : this.getUserFilter(username),
+      scope    : this.options.User_Search_Scope || 'sub',
      sizeLimit: this.options.Search_Size_Limit,
    };

+    if (!!this.options.User_Attributes) searchOptions.attributes = this.options.User_Attributes.split(',');
+
    if (this.options.Search_Page_Size > 0) {
      searchOptions.paged = {
-        pageSize: this.options.Search_Page_Size,
+        pageSize : this.options.Search_Page_Size,
        pagePause: !!page,
      };
    }
@@ -266,11 +292,11 @@ export default class LDAP {
      Unique_Identifier_Field.forEach((item) => {
        filters.push(new this.ldapjs.filters.EqualityFilter({
          attribute: item,
-          value: new Buffer(id, 'hex'),
+          value    : new Buffer(id, 'hex'),
        }));
      });

-      filter = new this.ldapjs.filters.OrFilter({filters});
+      filter = new this.ldapjs.filters.OrFilter({ filters });
    }

    const searchOptions = {
@@ -300,7 +326,7 @@ export default class LDAP {

    const searchOptions = {
      filter: this.getUserFilter(username),
-      scope: this.options.User_Search_Scope || 'sub',
+      scope : this.options.User_Search_Scope || 'sub',
    };

    log_info('Searching user', username);
@@ -320,7 +346,7 @@ export default class LDAP {
    return result[0];
  }

-  getUserGroups(username, ldapUser){
+  getUserGroups(username, ldapUser) {
    if (!this.options.group_filter_enabled) {
      return true;
    }
@@ -328,13 +354,13 @@ export default class LDAP {
    const filter = ['(&'];

    if (this.options.group_filter_object_class !== '') {
-      filter.push(`(objectclass=${ this.options.group_filter_object_class })`);
+      filter.push(`(objectclass=${this.options.group_filter_object_class})`);
    }

    if (this.options.group_filter_group_member_attribute !== '') {
      const format_value = ldapUser[this.options.group_filter_group_member_format];
-      if( format_value ) {
-        filter.push(`(${ this.options.group_filter_group_member_attribute }=${ format_value })`);
+      if (format_value) {
+        filter.push(`(${this.options.group_filter_group_member_attribute}=${format_value})`);
      }
    }

@@ -342,7 +368,7 @@ export default class LDAP {

    const searchOptions = {
      filter: filter.join('').replace(/#{username}/g, username),
-      scope: 'sub',
+      scope : 'sub',
    };

    log_debug('Group list filter LDAP:', searchOptions.filter);
@@ -354,11 +380,11 @@ export default class LDAP {
    }

    const grp_identifier = this.options.group_filter_group_id_attribute || 'cn';
-    const groups = [];
+    const groups         = [];
    result.map((item) => {
-      groups.push( item[ grp_identifier ] );
+      groups.push(item[grp_identifier]);
    });
-    log_debug(`Groups: ${  groups.join(', ')}`);
+    log_debug(`Groups: ${groups.join(', ')}`);
    return groups;

  }
@@ -373,24 +399,24 @@ export default class LDAP {
    const filter = ['(&'];

    if (this.options.group_filter_object_class !== '') {
-      filter.push(`(objectclass=${ this.options.group_filter_object_class })`);
+      filter.push(`(objectclass=${this.options.group_filter_object_class})`);
    }

    if (this.options.group_filter_group_member_attribute !== '') {
      const format_value = ldapUser[this.options.group_filter_group_member_format];
-      if( format_value ) {
-        filter.push(`(${ this.options.group_filter_group_member_attribute }=${ format_value })`);
+      if (format_value) {
+        filter.push(`(${this.options.group_filter_group_member_attribute}=${format_value})`);
      }
    }

    if (this.options.group_filter_group_id_attribute !== '') {
-      filter.push(`(${ this.options.group_filter_group_id_attribute }=${ this.options.group_filter_group_name })`);
+      filter.push(`(${this.options.group_filter_group_id_attribute}=${this.options.group_filter_group_name})`);
    }
    filter.push(')');

    const searchOptions = {
      filter: filter.join('').replace(/#{username}/g, username),
-      scope: 'sub',
+      scope : 'sub',
    };

    log_debug('Group filter LDAP:', searchOptions.filter);
@@ -426,15 +452,17 @@ export default class LDAP {
  searchAllPaged(BaseDN, options, page) {
    this.bindIfNecessary();

-    const processPage = ({entries, title, end, next}) => {
+    const processPage = ({ entries, title, end, next }) => {
      log_info(title);
      // Force LDAP idle to wait the record processing
      this.client._updateIdle(true);
-      page(null, entries, {end, next: () => {
-        // Reset idle timer
-        this.client._updateIdle();
-        next && next();
-      }});
+      page(null, entries, {
+        end, next: () => {
+          // Reset idle timer
+          this.client._updateIdle();
+          next && next();
+        }
+      });
    };

    this.client.search(BaseDN, options, (error, res) => {
@@ -461,7 +489,7 @@ export default class LDAP {
          processPage({
            entries,
            title: 'Internal Page',
-            end: false,
+            end  : false,
          });
          entries = [];
        }
@@ -473,14 +501,14 @@ export default class LDAP {
          processPage({
            entries,
            title: 'Final Page',
-            end: true,
+            end  : true,
          });
        } else if (entries.length) {
          log_info('Page');
          processPage({
            entries,
            title: 'Page',
-            end: false,
+            end  : false,
            next,
          });
          entries = [];
@@ -492,7 +520,7 @@ export default class LDAP {
          processPage({
            entries,
            title: 'Final Page',
-            end: true,
+            end  : true,
          });
          entries = [];
        }
@@ -547,7 +575,7 @@ export default class LDAP {
  }

  disconnect() {
-    this.connected = false;
+    this.connected    = false;
    this.domainBinded = false;
    log_info('Disconecting');
    this.client.unbind();
@@ -41,28 +41,38 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
  let ldapUser;

  try {
-    ldap.connectSync();
-    const users = ldap.searchUsersSync(loginRequest.username);

-    if (users.length !== 1) {
-      log_info('Search returned', users.length, 'record(s) for', loginRequest.username);
-      throw new Error('User not Found');
-    }
+      ldap.connectSync();
+
+     if (!!LDAP.settings_get('LDAP_USER_AUTHENTICATION')) {
+        ldap.bindUserIfNecessary(loginRequest.username, loginRequest.ldapPass);
+       ldapUser = ldap.searchUsersSync(loginRequest.username)[0];
+       } else {
+
+       const users = ldap.searchUsersSync(loginRequest.username);
+
+       if (users.length !== 1) {
+         log_info('Search returned', users.length, 'record(s) for', loginRequest.username);
+         throw new Error('User not Found');
+       }
+
+       if (ldap.authSync(users[0].dn, loginRequest.ldapPass) === true) {
+         if (ldap.isUserInGroup(loginRequest.username, users[0])) {
+           ldapUser = users[0];
+         } else {
+           throw new Error('User not in a valid group');
+         }
+       } else {
+         log_info('Wrong password for', loginRequest.username);
+       }
+     }
+

-    if (ldap.authSync(users[0].dn, loginRequest.ldapPass) === true) {
-      if (ldap.isUserInGroup(loginRequest.username, users[0])) {
-        ldapUser = users[0];
-      } else {
-        throw new Error('User not in a valid group');
-      }
-    } else {
-      log_info('Wrong password for', loginRequest.username);
-    }
  } catch (error) {
-    log_error(error);
+     log_error(error);
  }

-  if (ldapUser === undefined) {
+  if (!ldapUser) {
    if (LDAP.settings_get('LDAP_LOGIN_FALLBACK') === true) {
      return fallbackDefaultAccountSystem(self, loginRequest.username, loginRequest.ldapPass);
    }
@@ -76,8 +86,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {

  const Unique_Identifier_Field = getLdapUserUniqueID(ldapUser);
  let user;
-
-  // Attempt to find user by unique identifier
+   // Attempt to find user by unique identifier

  if (Unique_Identifier_Field) {
    userQuery = {
@@ -88,14 +97,14 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
    log_debug('userQuery', userQuery);

    user = Meteor.users.findOne(userQuery);
-  }
+   }

  // Attempt to find user by username

  let username;
  let email;

-  if (LDAP.settings_get('LDAP_USERNAME_FIELD') !== '') {
+   if (LDAP.settings_get('LDAP_USERNAME_FIELD') !== '') {
    username = slug(getLdapUsername(ldapUser));
  } else {
    username = slug(loginRequest.username);
@@ -105,6 +114,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
    email = getLdapEmail(ldapUser);
  }

+
  if (!user) {
    if(email && LDAP.settings_get('LDAP_EMAIL_MATCH_REQUIRE') === true) {
      if(LDAP.settings_get('LDAP_EMAIL_MATCH_VERIFIED') === true) {
@@ -191,6 +191,8 @@
        # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
        # example :  export LDAP_REJECT_UNAUTHORIZED=true
        #export LDAP_REJECT_UNAUTHORIZED=false
+        # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+        #export LDAP_USER_AUTHENTICATION=true
        # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
        # example :  export LDAP_USER_SEARCH_FILTER=
        #export LDAP_USER_SEARCH_FILTER=
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
    appTitle = (defaultText = "Wekan"),
    # The name of the app as it is displayed to the user.

-    appVersion = 269,
+    appVersion = 274,
    # Increment this for every release.

-    appMarketingVersion = (defaultText = "2.67.0~2019-05-10"),
+    appMarketingVersion = (defaultText = "2.72.0~2019-05-13"),
    # Human-readable presentation of the app version.

    minUpgradableAppVersion = 0,
@@ -3,7 +3,7 @@
 # All supported keys are defined here together with descriptions and default values

 # list of supported keys
-keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW EMAIL_NOTIFICATION_TIMEOUT CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"
+keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW EMAIL_NOTIFICATION_TIMEOUT CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"

 # default values
 DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'"
@@ -250,6 +250,10 @@ DESCRIPTION_LDAP_REJECT_UNAUTHORIZED="Reject Unauthorized Certificate"
 DEFAULT_LDAP_REJECT_UNAUTHORIZED="false"
 KEY_LDAP_REJECT_UNAUTHORIZED="ldap-reject-unauthorized"

+DESCRIPTION_LDAP_USER_AUTHENTICATION="Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key)."
+DEFAULT_LDAP_USER_AUTHENTICATION="false"
+KEY_LDAP_USER_AUTHENTICATION="ldap-user-authentication"
+
 DESCRIPTION_LDAP_USER_SEARCH_FILTER="Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed"
 DEFAULT_LDAP_USER_SEARCH_FILTER=""
 KEY_LDAP_USER_SEARCH_FILTER="ldap-user-search-filter"
@@ -234,6 +234,9 @@ echo -e "Ldap Reject Unauthorized."
 echo -e "Reject Unauthorized Certificate:"
 echo -e "\t$ snap set $SNAP_NAME ldap-reject-unauthorized='true'"
 echo -e "\n"
+echo -e "Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key)."
+echo -e "\t$ snap set $SNAP_NAME ldap-user-authentication='true'"
+echo -e "\n"
 echo -e "Ldap User Search Filter."
 echo -e "Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed:"
 echo -e "\t$ snap set $SNAP_NAME ldap-user-search-filter=''"
@@ -173,6 +173,9 @@ REM # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
 REM # example : LDAP_REJECT_UNAUTHORIZED=true
 REM SET LDAP_REJECT_UNAUTHORIZED=false

+REM # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+REM SET LDAP_USER_AUTHENTICATION=true
+
 REM # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
 REM # example : LDAP_USER_SEARCH_FILTER=
 REM SET LDAP_USER_SEARCH_FILTER=
@@ -210,6 +210,8 @@ function wekan_repo_check(){
      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
      # example :  export LDAP_REJECT_UNAUTHORIZED=true
      #export LDAP_REJECT_UNAUTHORIZED=false
+      # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+      #export LDAP_USER_AUTHENTICATION=true
      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
      # example :  export LDAP_USER_SEARCH_FILTER=
      #export LDAP_USER_SEARCH_FILTER=
Author	SHA1	Message	Date
Lauri Ojansivu	b983479476	v2.72	2019-05-13 10:49:41 +03:00
Lauri Ojansivu	f6e5e514ef	Merge pull request #2401 from guyzyl/devel Added BIDI support to "Add Card" #884	2019-05-13 10:42:42 +03:00
Guy Zylberberg	ddd828083e	Added BIDI support to "Add Card" #884	2019-05-13 00:37:40 +03:00
Lauri Ojansivu	e079b4df17	v2.71	2019-05-12 20:49:27 +03:00
Lauri Ojansivu	4e5ff17e18	Update translations.	2019-05-12 20:43:23 +03:00
Lauri Ojansivu	86e1a9cd5d	Update changelog.	2019-05-12 20:40:32 +03:00
Lauri Ojansivu	8a0efffdf8	Merge pull request #2400 from atilaromero/devel Add partentId support on card web API	2019-05-12 20:27:50 +03:00
Lauri Ojansivu	c21f710a70	Fix typo.	2019-05-12 19:15:49 +03:00
Atila Romero	f3382abe3b	Add partentId support on card web API	2019-05-12 10:26:08 -03:00
Lauri Ojansivu	d6c86f3cba	v2.70	2019-05-11 23:50:47 +03:00
Lauri Ojansivu	3a6516f0cb	Update changelog.	2019-05-11 23:47:11 +03:00
Lauri Ojansivu	b795115042	- [View markdown on List names, Custom Fields (Text and Dropdown), Label names, All Boards view Board names and Board descriptions](https://github.com/wekan/wekan/issues/2334). Thanks to shaygover and xet7 ! Related #2334	2019-05-11 23:40:18 +03:00
Lauri Ojansivu	52fe845d24	v2.69	2019-05-11 00:07:37 +03:00
Lauri Ojansivu	b2b6bb2d39	Update changelog.	2019-05-11 00:05:34 +03:00
Lauri Ojansivu	db40ca25ac	- Fix translation name in Wekan menu: oc to Occitan. Thanks to xet7 !	2019-05-11 00:02:40 +03:00
Lauri Ojansivu	3eef42eee0	v2.68	2019-05-10 23:18:12 +03:00
Lauri Ojansivu	38d0ad74a9	Update changelog.	2019-05-10 23:13:20 +03:00
Lauri Ojansivu	3bbc805ee4	Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key). With new setting: LDAP_USER_AUTHENTICATION=true Added to Snap, Docker and Source. Thanks to xet7 ! Related https://github.com/wekan/wekan/pull/2399	2019-05-10 23:04:51 +03:00
Lauri Ojansivu	c37a454bd5	Merge branch 'thiagofernando-devel' into devel	2019-05-10 22:23:15 +03:00
Lauri Ojansivu	6f98be5608	Merge branch 'devel' of https://github.com/thiagofernando/wekan into thiagofernando-devel	2019-05-10 22:21:50 +03:00
Thiago Fernando	36f148a7cb	Update loginHandler.js additional option to login in ldap server with user account	2019-05-10 14:58:19 -03:00
Thiago Fernando	fd1af07e43	Update ldap.js	2019-05-10 14:56:07 -03:00
Thiago Fernando	ce0473480b	Merge pull request #1 from wekan/devel ldap changes	2019-05-10 14:54:25 -03:00