diff options
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | packages/wekan-ldap/server/loginHandler.js | 18 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
5 files changed, 32 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ae3fd7d7..56c91e3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# v2.74 2019-05-14 Wekan release + +This release fixes the following bugs: + +- Add missing [wekan-ldap#40](https://github.com/wekan/wekan-ldap/pull/40) code about + [LDAP_SYNC_ADMIN_STATUS](https://github.com/wekan/wekan/commit/0fe40ad9ec82ef2045578f4cc1e2ebb6cc80d47a). + Thanks to JulianJacobi, n-st, chirrut2 and xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.73 2019-05-14 Wekan release This release fixes the following bugs with Apache I-CLA: diff --git a/Stackerfile.yml b/Stackerfile.yml index 427e9988..40f01671 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.73.0" +appVersion: "v2.74.0" files: userUploads: - README.md diff --git a/package.json b/package.json index a238b96a..741759c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.73.0", + "version": "v2.74.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/packages/wekan-ldap/server/loginHandler.js b/packages/wekan-ldap/server/loginHandler.js index 0c1aa33f..79b3899a 100644 --- a/packages/wekan-ldap/server/loginHandler.js +++ b/packages/wekan-ldap/server/loginHandler.js @@ -179,6 +179,15 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) { }, }; + if (LDAP.settings_get('LDAP_SYNC_ADMIN_STATUS') === true) { + log_debug('Updating admin status'); + const targetGroups = LDAP.settings_get('LDAP_SYNC_ADMIN_GROUPS').split(','); + const groups = ldap.getUserGroups(username, ldapUser).filter((value) => targetGroups.includes(value)); + + user.isAdmin = groups.length > 0; + Meteor.users.update({_id: user._id}, {$set: {isAdmin: user.isAdmin}}); + } + if( LDAP.settings_get('LDAP_SYNC_GROUP_ROLES') === true ) { log_debug('Updating Groups/Roles'); const groups = ldap.getUserGroups(username, ldapUser); @@ -217,6 +226,15 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) { const result = addLdapUser(ldapUser, username, loginRequest.ldapPass); + if (LDAP.settings_get('LDAP_SYNC_ADMIN_STATUS') === true) { + log_debug('Updating admin status'); + const targetGroups = LDAP.settings_get('LDAP_SYNC_ADMIN_GROUPS').split(','); + const groups = ldap.getUserGroups(username, ldapUser).filter((value) => targetGroups.includes(value)); + + result.isAdmin = groups.length > 0; + Meteor.users.update({_id: result.userId}, {$set: {isAdmin: result.isAdmin}}); + } + if( LDAP.settings_get('LDAP_SYNC_GROUP_ROLES') === true ) { const groups = ldap.getUserGroups(username, ldapUser); if( groups.length > 0 ) { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 25baa88d..63c7fec3 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 275, + appVersion = 276, # Increment this for every release. - appMarketingVersion = (defaultText = "2.73.0~2019-05-14"), + appMarketingVersion = (defaultText = "2.74.0~2019-05-14"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |