Merge branch 'google-cdns' into remove-angular
Conflicts: server/boot/user.js server/views/account/show.jade server/views/account/signin.jade server/views/coursewares/showBonfire.jade server/views/coursewares/showZiplineOrBasejump.jade server/views/partials/scripts.jade
This commit is contained in:
@ -123,6 +123,14 @@ module.exports = function(User) {
|
||||
});
|
||||
});
|
||||
|
||||
User.beforeRemote('login', function(ctx, notUsed, next) {
|
||||
const { body } = ctx.req;
|
||||
if (body && typeof body.email === 'string') {
|
||||
body.email = body.email.toLowerCase();
|
||||
}
|
||||
next();
|
||||
});
|
||||
|
||||
User.afterRemote('login', function(ctx, accessToken, next) {
|
||||
var res = ctx.res;
|
||||
var req = ctx.req;
|
||||
|
Reference in New Issue
Block a user