diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/wekan-ldap/server/ldap.js | 4 | ||||
| -rw-r--r-- | packages/wekan-oidc/oidc_server.js | 7 | ||||
| -rw-r--r-- | packages/wekan-scrollbar/jquery.mCustomScrollbar.js | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/packages/wekan-ldap/server/ldap.js b/packages/wekan-ldap/server/ldap.js index bd2cd1fb..f2d9a7b7 100644 --- a/packages/wekan-ldap/server/ldap.js +++ b/packages/wekan-ldap/server/ldap.js @@ -286,14 +286,14 @@ export default class LDAP { if (attribute) { filter = new this.ldapjs.filters.EqualityFilter({ attribute, - value: new Buffer(id, 'hex'), + value: Buffer.from(id, 'hex'), }); } else { const filters = []; Unique_Identifier_Field.forEach((item) => { filters.push(new this.ldapjs.filters.EqualityFilter({ attribute: item, - value : new Buffer(id, 'hex'), + value : Buffer.from(id, 'hex'), })); }); diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index 326238da..f6e23a15 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -10,6 +10,7 @@ OAuth.registerService('oidc', 2, null, function (query) { var expiresAt = (+new Date) + (1000 * parseInt(token.expires_in, 10)); var userinfo = getUserInfo(accessToken); + if (userinfo.ocs) userinfo = userinfo.ocs.data; // Nextcloud hack if (debug) console.log('XXX: userinfo:', userinfo); var serviceData = {}; @@ -131,9 +132,9 @@ var getTokenContent = function (token) { if (token) { try { var parts = token.split('.'); - var header = JSON.parse(new Buffer(parts[0], 'base64').toString()); - content = JSON.parse(new Buffer(parts[1], 'base64').toString()); - var signature = new Buffer(parts[2], 'base64'); + var header = JSON.parse(Buffer.from(parts[0], 'base64').toString()); + content = JSON.parse(Buffer.from(parts[1], 'base64').toString()); + var signature = Buffer.from(parts[2], 'base64'); var signed = parts[0] + '.' + parts[1]; } catch (err) { this.content = { diff --git a/packages/wekan-scrollbar/jquery.mCustomScrollbar.js b/packages/wekan-scrollbar/jquery.mCustomScrollbar.js index b7883579..056e4284 100644 --- a/packages/wekan-scrollbar/jquery.mCustomScrollbar.js +++ b/packages/wekan-scrollbar/jquery.mCustomScrollbar.js @@ -111,7 +111,7 @@ and dependencies (minified). scrolling inertia values: integer (milliseconds) */ - scrollInertia:950, + scrollInertia:0, /* auto-adjust scrollbar dragger length values: boolean |