From 599ace1db7918df41d9708d14b0351acb0f8688e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 20 Nov 2019 23:40:04 +0200 Subject: Fix slow scroll on card detail by setting scrollInertia to 0. Thanks to cafeoh ! Closes #2179 --- packages/wekan-scrollbar/jquery.mCustomScrollbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') 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 -- cgit v1.2.3-1-g7c22 From e01f4dbf1393a789faaa2f38b53d2effad827e86 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 11 Jan 2020 13:08:29 +0200 Subject: Change Buffer to Buffer.alloc on Node v12. Try to fix Snap. --- packages/wekan-ldap/server/ldap.js | 4 ++-- packages/wekan-oidc/oidc_server.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/wekan-ldap/server/ldap.js b/packages/wekan-ldap/server/ldap.js index bd2cd1fb..9d9f7f9d 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: new Buffer.alloc(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 : new Buffer.alloc(id, 'hex'), })); }); diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index 326238da..5a0f82cd 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -131,9 +131,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(new Buffer.alloc(parts[0], 'base64').toString()); + content = JSON.parse(new Buffer.alloc(parts[1], 'base64').toString()); + var signature = new Buffer.alloc(parts[2], 'base64'); var signed = parts[0] + '.' + parts[1]; } catch (err) { this.content = { -- cgit v1.2.3-1-g7c22 From 9b905c2833d54cf34d1875148075b2bf756d943a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 18 Jan 2020 16:01:02 +0200 Subject: Try to fix Node 12 Buffer() deprecation errors. Thanks to xet7 ! --- packages/wekan-ldap/server/ldap.js | 4 ++-- packages/wekan-oidc/oidc_server.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/wekan-ldap/server/ldap.js b/packages/wekan-ldap/server/ldap.js index 9d9f7f9d..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.alloc(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.alloc(id, 'hex'), + value : Buffer.from(id, 'hex'), })); }); diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index 5a0f82cd..ee60a490 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -131,9 +131,9 @@ var getTokenContent = function (token) { if (token) { try { var parts = token.split('.'); - var header = JSON.parse(new Buffer.alloc(parts[0], 'base64').toString()); - content = JSON.parse(new Buffer.alloc(parts[1], 'base64').toString()); - var signature = new Buffer.alloc(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 = { -- cgit v1.2.3-1-g7c22 From 7bba07ccbfb673a814ab8fc2524a827c77016109 Mon Sep 17 00:00:00 2001 From: Bojan Hartmann Date: Wed, 22 Jan 2020 22:28:03 +0100 Subject: Implemented Nextcloud OAuth2 Hack Fixed: OAuth2 authentication via Nextcloud(tested Nextcloud 17.0.2-18.0.0) Todo: actually use the profile data: Fullname and Email in Profile --- packages/wekan-oidc/oidc_server.js | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index ee60a490..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 = {}; -- cgit v1.2.3-1-g7c22