[FIX] OAuth users being asked to change password on second login (#20003)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
pull/20085/head^2
pierre-lehnen-rc 4 years ago committed by GitHub
parent 66dda4b0df
commit 5769cec0f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      server/configuration/accounts_meld.js
  2. 2
      server/lib/compareUserPassword.js

@ -39,7 +39,7 @@ Accounts.updateOrCreateUserFromExternalService = function(serviceName, serviceDa
verified: true,
};
if (!_.findWhere(user.emails, findQuery)) {
if (user.services?.password && !_.findWhere(user.emails, findQuery)) {
Users.resetPasswordAndSetRequirePasswordChange(user._id, true, 'This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password');
}

@ -7,7 +7,7 @@ import { Accounts } from 'meteor/accounts-base';
*/
export function compareUserPassword(user, pass) {
if (!user?.services?.password?.bcrypt?.trim()) {
return true;
return false;
}
if (!pass || (!pass.plain && !pass.sha256)) {

Loading…
Cancel
Save