Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Populate more user informations on POST /auth/login #3723

Merged
merged 5 commits into from Aug 6, 2019
+1 −1
Merged

Populate more user informations on POST /auth/login #3723

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04f0995
Fix /auth/login, user object ignore files and relations
Erim32 Aug 3, 2019
0d1450b
Fix /auth/login, user object was ignoring files and relations
Erim32 Aug 5, 2019
ad01efc
Fix /auth/login, reformat code and fix comment
Erim32 Aug 5, 2019
ce1f669
Merge branch 'master' into master
alexandrebodin Aug 6, 2019
7ef2c11
Merge branch 'master' into master
alexandrebodin Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/strapi-plugin-users-permissions/controllers/Auth.js
View file
Open in desktop
Expand Up @@ -57,15 +57,17 @@ module.exports = {
const isEmail = emailRegExp.test(params.identifier);

// Set the identifier to the appropriate query field.
let key = "email";
derrickmehaffy marked this conversation as resolved.
Show resolved Hide resolved
if (isEmail) {
query.email = params.identifier.toLowerCase();
} else {
query.username = params.identifier;
key = "username";
}

// Check if the user exists.
const user = await strapi.plugins['users-permissions'].queries('user', 'users-permissions')
.findOne(query, ['role']);
const user = await strapi.plugins["users-permissions"]
.queries("user", "users-permissions")
.findOne(_.pick(query, [key, key]));
derrickmehaffy marked this conversation as resolved.
Show resolved Hide resolved

if (!user) {
return ctx.badRequest(
Expand Down