ashpie/swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Make tests pass

Browse Source
This commit is contained in:
Alice Gaudon 2021-11-08 01:21:51 +01:00
parent e7695b7027
commit eefb6e0dac
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/auth/password/PasswordAuthMethod.ts
View File

@ -57,6 +57,10 @@ export default class PasswordAuthMethod implements AuthMethod<PasswordAuthProof>
const passwordAuthProof = PasswordAuthProof.createProofForLogin(req.getSession()); const passwordAuthProof = PasswordAuthProof.createProofForLogin(req.getSession());
passwordAuthProof.setResource(user); passwordAuthProof.setResource(user);
await Validator.validate({
password: new Validator().defined(),
}, req.body);
await passwordAuthProof.authorize(req.body.password); await passwordAuthProof.authorize(req.body.password);
try { try {
await this.app.as(AuthComponent).getAuthGuard().authenticateOrRegister( await this.app.as(AuthComponent).getAuthGuard().authenticateOrRegister(

22
test/Authentication.test.ts
View File

@ -210,7 +210,7 @@ describe('Register with email (magic_link)', () => {
name: 'angella', name: 'angella',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -252,7 +252,7 @@ describe('Register with email (magic_link)', () => {
name: 'bow', name: 'bow',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -423,7 +423,7 @@ describe('Authenticate with username and password (password)', () => {
auth_method: 'password', auth_method: 'password',
}) })
.expect(400); .expect(400);
expect(res.body.messages?.password?.name).toStrictEqual('InvalidFormatValidationError'); expect(res.body.messages?.password?.name).toStrictEqual('UndefinedValueValidationError');
// Authenticate without password (automatic method) // Authenticate without password (automatic method)
res = await agent.post('/auth/login') res = await agent.post('/auth/login')
@ -433,7 +433,7 @@ describe('Authenticate with username and password (password)', () => {
identifier: 'angella', identifier: 'angella',
}) })
.expect(400); .expect(400);
expect(res.body.messages?.password?.name).toStrictEqual('InvalidFormatValidationError'); expect(res.body.messages?.password?.name).toStrictEqual('UndefinedValueValidationError');
}); });
}); });
@ -478,7 +478,7 @@ describe('Authenticate with email (magic_link)', () => {
identifier: 'angella@example.org', identifier: 'angella@example.org',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -542,7 +542,7 @@ describe('Authenticate with email and password (password)', () => {
name: 'double-trouble', name: 'double-trouble',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -653,7 +653,7 @@ describe('Change password', () => {
name: 'aang', name: 'aang',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
}); });
@ -974,7 +974,7 @@ describe('Manage email addresses', () => {
name: 'katara', name: 'katara',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -1181,7 +1181,7 @@ describe('Session persistence', () => {
name: 'zuko', name: 'zuko',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -1210,7 +1210,7 @@ describe('Session persistence', () => {
persist_session: 'on', persist_session: 'on',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -1237,7 +1237,7 @@ describe('Session persistence', () => {
persist_session: undefined, persist_session: undefined,
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);

4
test/AuthenticationNoUsername.test.ts
View File

@ -54,7 +54,7 @@ describe('Register with email (magic_link)', () => {
identifier: 'glimmer@example.org', identifier: 'glimmer@example.org',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);
@ -89,7 +89,7 @@ describe('Register with email (magic_link)', () => {
name: 'bow', name: 'bow',
}) })
.expect(302) .expect(302)
.expect('Location', '/magic/lobby?redirect_uri='); .expect('Location', '/magic/lobby');
await followMagicLinkFromMail(agent, cookies); await followMagicLinkFromMail(agent, cookies);