Skip to content

Commit f9610b3

Browse files
committed
Allowing any case for email login
1 parent ddf9910 commit f9610b3

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bmore-responsive",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "An emergency response API",
55
"main": "src/index.js",
66
"directories": {

src/routes/user.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ router.post('/login', async (req, res) => {
1212
try {
1313
const { email, password } = req.body;
1414
if (validator.isEmail(email)) {
15-
const token = await req.context.models.User.findByLogin(email, password);
15+
const token = await req.context.models.User.findByLogin(email.toLowerCase(), password);
1616
if (token) {
1717
code = 200;
1818
message = token;
@@ -37,7 +37,7 @@ router.post('/reset/:email', async(req, res) => {
3737
if (validator.isEmail(req.params.email)) {
3838
const user = await req.context.models.User.findOne({
3939
where: {
40-
email: req.params.email
40+
email: req.params.email.toLowerCase()
4141
},
4242
attributes: ['id', 'email']
4343
});
@@ -101,14 +101,16 @@ router.get('/:email', utils.authMiddleware, async (req, res) => {
101101
if (validator.isEmail(req.params.email)) {
102102
const user = await req.context.models.User.findOne({
103103
where: {
104-
email: req.params.email
104+
email: req.params.email.toLowerCase()
105105
},
106106
attributes: ['id', 'email', 'roles', 'displayName', 'phone', 'createdAt', 'updatedAt']
107107
});
108-
if (user.roles) {
109-
user.roles = await req.context.models.UserRole.findRoles(user.roles);
108+
if (user) {
109+
if (user.roles) user.roles = await req.context.models.UserRole.findRoles(user.roles);
110110
/** @todo add contact info for users */
111111
// user.dataValues.contact = await req.context.models.Contact.findByUserId(user.id);
112+
} else {
113+
return utils.response(res, 422);
112114
}
113115

114116
code = 200;
@@ -132,7 +134,7 @@ if (process.env.NODE_ENV === 'development') {
132134
try {
133135
if (validator.isEmail(req.body.email)) {
134136
const { email, password, roles } = req.body;
135-
const user = await req.context.models.User.create({ email, password, roles });
137+
const user = await req.context.models.User.create({ email: email.toLowerCase(), password, roles });
136138

137139
code = 200;
138140
message = user.email + ' created';
@@ -158,7 +160,7 @@ router.put('/', utils.authMiddleware, async (req, res) => {
158160
const { email, password } = req.body;
159161
const user = await req.context.models.User.findOne({
160162
where: {
161-
email
163+
email: email.toLowerCase()
162164
}
163165
});
164166
user.password = password;
@@ -185,7 +187,7 @@ router.delete('/:email', utils.authMiddleware, async (req, res) => {
185187
if (validator.isEmail(req.params.email)) {
186188
const user = await req.context.models.User.findOne({
187189
where: {
188-
email: req.params.email
190+
email: req.params.email.toLowerCase()
189191
}
190192
});
191193
await user.destroy();

0 commit comments

Comments
 (0)