From 6d063a4f64bbe133cb182fdd9d2d97defc60a8fd Mon Sep 17 00:00:00 2001 From: Allemand <37148072+salleman33@users.noreply.github.com> Date: Wed, 17 Jun 2020 18:07:22 +0200 Subject: Update users.js change method to find existing user --- models/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models') diff --git a/models/users.js b/models/users.js index 2b5a059e..a1928f97 100644 --- a/models/users.js +++ b/models/users.js @@ -933,7 +933,7 @@ if (Meteor.isServer) { user.authenticationMethod = 'oauth2'; // see if any existing user has this email address or username, otherwise create new - const existingUser = Meteor.users.findOne({ + const existingUser = Users.findOne({ $or: [{ 'emails.address': email }, { username: user.username }], }); if (!existingUser) return user; -- cgit v1.2.3-1-g7c22 From f6c377eb9f3f7e62911cadbd0ac8745b537d3f97 Mon Sep 17 00:00:00 2001 From: Allemand <37148072+salleman33@users.noreply.github.com> Date: Wed, 17 Jun 2020 18:44:12 +0200 Subject: update onCreateUser for oidc correct bug : remove the wrong user ! --- models/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models') diff --git a/models/users.js b/models/users.js index a1928f97..7f234a54 100644 --- a/models/users.js +++ b/models/users.js @@ -946,7 +946,7 @@ if (Meteor.isServer) { existingUser.profile = user.profile; existingUser.authenticationMethod = user.authenticationMethod; - Meteor.users.remove({ _id: existingUser._id }); // remove existing record + Meteor.users.remove({ _id: user._id }); // remove existing record return existingUser; } -- cgit v1.2.3-1-g7c22 From 670b964e6bfc6000cdfe1a6adc343f4c7b406b9e Mon Sep 17 00:00:00 2001 From: Allemand <37148072+salleman33@users.noreply.github.com> Date: Wed, 17 Jun 2020 18:50:44 +0200 Subject: update comments --- models/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models') diff --git a/models/users.js b/models/users.js index 7f234a54..7ce4edbc 100644 --- a/models/users.js +++ b/models/users.js @@ -946,7 +946,7 @@ if (Meteor.isServer) { existingUser.profile = user.profile; existingUser.authenticationMethod = user.authenticationMethod; - Meteor.users.remove({ _id: user._id }); // remove existing record + Meteor.users.remove({ _id: user._id }); // remove previous record return existingUser; } -- cgit v1.2.3-1-g7c22 From 768412ba7c2da28f2365e9d0152912aeafb61bbc Mon Sep 17 00:00:00 2001 From: Allemand <37148072+salleman33@users.noreply.github.com> Date: Wed, 17 Jun 2020 19:00:40 +0200 Subject: remove useless comments --- models/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models') diff --git a/models/users.js b/models/users.js index 7ce4edbc..8675dbad 100644 --- a/models/users.js +++ b/models/users.js @@ -946,7 +946,7 @@ if (Meteor.isServer) { existingUser.profile = user.profile; existingUser.authenticationMethod = user.authenticationMethod; - Meteor.users.remove({ _id: user._id }); // remove previous record + Meteor.users.remove({ _id: user._id }); return existingUser; } -- cgit v1.2.3-1-g7c22