Migrate from koa-route to koa-router
This commit is contained in:
parent
8474cca94c
commit
a4bf3dd51d
17 changed files with 206 additions and 291 deletions
|
@ -6,7 +6,7 @@ export function* signin() {
|
|||
}
|
||||
this.statsd.incr('auth.attempt', 1);
|
||||
|
||||
const user = yield authenticate(this, this.request.body.email, this.request.body.password);
|
||||
const user = yield authenticate.call(this, this.request.body.email, this.request.body.password);
|
||||
if(!user) {
|
||||
this.statsd.incr('auth.failure', 1);
|
||||
return yield this.render('signin', {error: 'Invalid login details', csrf: this.csrf});
|
||||
|
@ -14,7 +14,7 @@ export function* signin() {
|
|||
return yield this.render('signin', {error: 'Your account hasn\'t been activated yet. Check your for an activation email.', csrf: this.csrf});
|
||||
} else {
|
||||
this.statsd.incr('auth.success', 1);
|
||||
yield setupSession(this, user);
|
||||
yield setupSession.call(this, user);
|
||||
this.redirect('/');
|
||||
}
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ export function* signup() {
|
|||
const email = this.request.body.email;
|
||||
const password = this.request.body.password;
|
||||
try {
|
||||
yield signupUser(this, email, password, ip);
|
||||
yield signupUser.call(this, email, password, ip);
|
||||
} catch (e) {
|
||||
return yield this.render('signup', {error: e.message, csrf: this.csrf});
|
||||
}
|
||||
|
@ -50,23 +50,23 @@ export function* forgot(token) {
|
|||
const Users = this.db.Users;
|
||||
if (this.request.body.email) {
|
||||
var email = this.request.body.email;
|
||||
yield sendResetToken(this, email);
|
||||
yield sendResetToken.call(this, email);
|
||||
this.statsd.incr('auth.reset.request', 1);
|
||||
return yield this.render('forgot', {message: 'We\'ve sent an email with a link to reset your password. Be sure to check your spam folder if you it doesn\'t appear within a few minutes', token: null, csrf: this.csrf});
|
||||
} else if (token && this.request.body.password) {
|
||||
if (this.request.body.password.length < 7) {
|
||||
return yield this.render('forgot', {error: 'Password needs to be at least 7 characters long.', token: token, csrf: this.csrf});
|
||||
}
|
||||
const tokenUser = yield validateResetToken(this, token);
|
||||
const tokenUser = yield validateResetToken.call(this, token);
|
||||
var userId = tokenUser._id;
|
||||
yield updatePassword(this, userId, this.request.body.password);
|
||||
yield updatePassword.call(this, userId, this.request.body.password);
|
||||
yield Reset.remove({_id: userId});
|
||||
const user = yield Users.findOne({_id: userId});
|
||||
yield setupSession(this, user);
|
||||
yield setupSession.call(this, user);
|
||||
this.statsd.incr('auth.reset.success', 1);
|
||||
this.redirect('/');
|
||||
} else if (token.length) {
|
||||
const tokenUser = yield validateResetToken(this, token);
|
||||
const tokenUser = yield validateResetToken.call(this, token);
|
||||
if (!tokenUser) {
|
||||
this.statsd.incr('auth.reset.fail', 1);
|
||||
return yield this.render('forgot', {error: 'Invalid password reset token. It might be expired, or has already been used.', token: null, csrf: this.csrf});
|
||||
|
@ -88,7 +88,7 @@ export function* logout() {
|
|||
|
||||
|
||||
export function* activate(code) {
|
||||
if (yield activateUser(this, code)) {
|
||||
if (yield activateUser.call(this, code)) {
|
||||
this.statsd.incr('auth.activation', 1);
|
||||
}
|
||||
this.redirect('/');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue