From 0846ce76f2523ee4f3b463fcc5d46244e8079184 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Wed, 18 Sep 2019 20:23:51 -0300 Subject: [PATCH] Move function to outside callback --- app/meteor-accounts-saml/server/saml_server.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js index 6b49000d3d0e..c112d452650a 100644 --- a/app/meteor-accounts-saml/server/saml_server.js +++ b/app/meteor-accounts-saml/server/saml_server.js @@ -105,15 +105,14 @@ Accounts.normalizeUsername = function(name) { return name; }; -Accounts.registerLoginHandler(function(loginRequest) { - const _guessNameFromUsername = function(username) { - return username - .replace(/\W/g, ' ') - .replace(/\s(.)/g, function($1) { return $1.toUpperCase(); }) - .replace(/^(.)/, function($1) { return $1.toLowerCase(); }) - .replace(/^\w/, function($1) { return $1.toUpperCase(); }); - }; +const guessNameFromUsername = (username) => + username + .replace(/\W/g, ' ') + .replace(/\s(.)/g, (u) => u.toUpperCase()) + .replace(/^(.)/, (u) => u.toLowerCase()) + .replace(/^\w/, (u) => u.toUpperCase()); +Accounts.registerLoginHandler(function(loginRequest) { if (!loginRequest.saml || !loginRequest.credentialToken) { return undefined; } @@ -193,7 +192,7 @@ Accounts.registerLoginHandler(function(loginRequest) { if (username) { newUser.username = username; - newUser.name = newUser.name || _guessNameFromUsername(username); + newUser.name = newUser.name || guessNameFromUsername(username); } const userId = Accounts.insertUserDoc({}, newUser);