yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-22 07:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(plugin-users-permissions): lowercase email

Browse Source
This commit is contained in:
Luca 2018-01-23 13:35:51 +01:00 committed by GitHub
parent 0641c7b279
commit adc532cf74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/strapi-plugin-users-permissions/controllers/Auth.js
View File

@ -8,6 +8,7 @@
const _ = require('lodash'); const _ = require('lodash');
const crypto = require('crypto'); const crypto = require('crypto');
const emailRegExp = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
module.exports = { module.exports = {
callback: async (ctx) => { callback: async (ctx) => {
@ -29,14 +30,13 @@ module.exports = {
const query = {}; const query = {};
// Check if the provided identifier is an email or not. // Check if the provided identifier is an email or not.
const isEmail = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(params.identifier); const isEmail = emailRegExp.test(params.identifier);
// Set the identifier to the appropriate query field. // Set the identifier to the appropriate query field.
const identifier = params.identifier.toLowerCase();
if (isEmail) { if (isEmail) {
query.email = identifier; query.email = params.identifier.toLowerCase();
} else { } else {
query.username = identifier; query.username = params.identifier;
} }
// Check if the user exists. // Check if the user exists.
@ -169,7 +169,11 @@ module.exports = {
params.role = '1'; params.role = '1';
} }
params.identifier = params.identifier.toLowerCase(); // Check if the provided identifier is an email or not.
const isEmail = emailRegExp.test(params.identifier);
if (isEmail) {
params.identifier = params.identifier.toLowerCase();
}
params.password = await strapi.plugins['users-permissions'].services.user.hashPassword(params); params.password = await strapi.plugins['users-permissions'].services.user.hashPassword(params);
try { try {