jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Capitalize the 2fa text

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-04-28 10:20:21 -07:00
parent b72efb1018
commit 6768994bbe
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/oauth2.js
+2 -2
View File
@@ -257,13 +257,13 @@ function login(req, res) {
})(req, res, function () {
if (req.user.twoFactorAuthenticationEnabled) {
if (!req.body.totpToken) {
let failureQuery = querystring.stringify({ error: 'A 2fa token is required', returnTo: returnTo });
let failureQuery = querystring.stringify({ error: 'A 2FA token is required', returnTo: returnTo });
return res.redirect('/api/v1/session/login?' + failureQuery);
}
let verified = speakeasy.totp.verify({ secret: req.user.twoFactorAuthenticationSecret, encoding: 'base32', token: req.body.totpToken });
if (!verified) {
let failureQuery = querystring.stringify({ error: 'The 2fa token is invalid', returnTo: returnTo });
let failureQuery = querystring.stringify({ error: 'The 2FA token is invalid', returnTo: returnTo });
return res.redirect('/api/v1/session/login?' + failureQuery);
}
}
src/routes/test/oauth2-test.js
+3 -3
View File
@@ -692,7 +692,7 @@ describe('OAuth2', function () {
});
});
describe('loginForm 2fa submit', function () {
describe('loginForm 2FA submit', function () {
var secret, accessToken;
before(function (done) {
@@ -757,7 +757,7 @@ describe('OAuth2', function () {
expect(response.statusCode).to.eql(302);
var tmp = urlParse(response.headers.location, true);
expect(tmp.query.error).to.eql('A 2fa token is required');
expect(tmp.query.error).to.eql('A 2FA token is required');
expect(tmp.query.returnTo).to.eql('/api/v1/oauth/dialog/authorize?redirect_uri=' + CLIENT_2.redirectURI + '&client_id=' + CLIENT_2.id + '&response_type=code');
done();
@@ -779,7 +779,7 @@ describe('OAuth2', function () {
expect(response.statusCode).to.eql(302);
var tmp = urlParse(response.headers.location, true);
expect(tmp.query.error).to.eql('The 2fa token is invalid');
expect(tmp.query.error).to.eql('The 2FA token is invalid');
expect(tmp.query.returnTo).to.eql('/api/v1/oauth/dialog/authorize?redirect_uri=' + CLIENT_2.redirectURI + '&client_id=' + CLIENT_2.id + '&response_type=code');
done();