From eaf2d3fbb34be47e4f7bac340c9fca3e3c597b55 Mon Sep 17 00:00:00 2001 From: Harry Adel Date: Thu, 12 Feb 2026 02:50:29 +0200 Subject: [PATCH] Final touches - Removed underscore dependency and replaced it with a native solution - Added ecmascript - Update versions in .meteor --- .meteor/versions | 2 +- packages/wekan-accounts-cas/cas_server.js | 4 ++-- packages/wekan-accounts-cas/package.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.meteor/versions b/.meteor/versions index 8908839b5..0159e8b28 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -137,7 +137,7 @@ useraccounts:flow-routing-extra@1.1.0 useraccounts:unstyled@1.14.2 webapp@1.13.8 webapp-hashing@1.1.1 -wekan-accounts-cas@0.1.0 +wekan-accounts-cas@0.2.0 wekan-accounts-lockout@1.1.0 wekan-accounts-oidc@1.0.10 wekan-accounts-sandstorm@0.8.0 diff --git a/packages/wekan-accounts-cas/cas_server.js b/packages/wekan-accounts-cas/cas_server.js index 69ba139af..f8bb2d894 100644 --- a/packages/wekan-accounts-cas/cas_server.js +++ b/packages/wekan-accounts-cas/cas_server.js @@ -252,7 +252,7 @@ const casValidate = (req, ticket, token, service, callback) => { if (attrs.debug) { console.log(`Creating user account ${JSON.stringify(options)}`); } - const userId = Accounts.insertUserDoc({}, options); + const userId = await Accounts.insertUserDoc({}, options); user = await Meteor.users.findOneAsync(userId); } if (attrs.debug) { @@ -262,7 +262,7 @@ const casValidate = (req, ticket, token, service, callback) => { }); const _hasCredential = (credentialToken) => { - return _.has(_casCredentialTokens, credentialToken); + return Object.prototype.hasOwnProperty.call(_casCredentialTokens, credentialToken); } /* diff --git a/packages/wekan-accounts-cas/package.js b/packages/wekan-accounts-cas/package.js index 89b17f7f3..8cf749829 100644 --- a/packages/wekan-accounts-cas/package.js +++ b/packages/wekan-accounts-cas/package.js @@ -6,12 +6,12 @@ Package.describe({ }); Package.onUse(function(api) { + api.use('ecmascript'); api.use('routepolicy', 'server'); api.use('webapp', 'server'); api.use('accounts-base', ['client', 'server']); // Export Accounts (etc) to packages using this one. api.imply('accounts-base', ['client', 'server']); - api.use('underscore'); api.addFiles('cas_client.js', 'web.browser'); api.addFiles('cas_client_cordova.js', 'web.cordova'); api.addFiles('cas_server.js', 'server');