Skip to content

Commit aa59a4c

Browse files
laoneolaoneo
authored
Merge branch '5.3-dev' into ghactions-codestyle
2 parents e9632ef + 96697bf commit aa59a4c

File tree

4 files changed

+90
-34
lines changed

4 files changed

+90
-34
lines changed

‎tests/System/integration/administrator/components/com_users/Mfa.cy.js‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { TOTP } from 'totp-generator';
22

3-
afterEach(() => cy.db_getUserId().then((uid) => cy.task('queryDB', `DELETE FROM #__user_mfa WHERE user_id = ${uid}`)));
4-
53
describe('Test in backend that the user', () => {
4+
afterEach(() => cy.db_getUserId().then((uid) => cy.task('queryDB', `DELETE FROM #__user_mfa WHERE user_id = ${uid}`)));
5+
66
it('can login with Multi-factor Authentication (email)', () => {
77
cy.doAdministratorLogin();
88
cy.visit('/administrator/index.php?option=com_users&view=users');
@@ -80,6 +80,44 @@ describe('Test in backend that the user', () => {
8080
cy.get('#com-users-methods-reset-message').contains('not enabled');
8181
});
8282

83+
it('can login with Multi-factor Authentication (passkey)', { browser: '!firefox' }, () => {
84+
Cypress.automation('remote:debugger:protocol', { command: 'WebAuthn.enable', params: {} }).then(() => {
85+
Cypress.automation('remote:debugger:protocol', {
86+
command: 'WebAuthn.addVirtualAuthenticator',
87+
params: {
88+
options: {
89+
protocol: 'ctap2', transport: 'internal', hasResidentKey: true, hasUserVerification: true, isUserVerified: true,
90+
},
91+
},
92+
});
93+
});
94+
cy.doAdministratorLogin();
95+
cy.visit('/administrator/index.php?option=com_users&view=users');
96+
cy.get('.header-profile:visible').click();
97+
cy.get('.header-profile a.dropdown-item').contains('Edit Account').click();
98+
cy.get('#myTab div[role="tablist"] button[aria-controls="multifactorauth"]').click();
99+
cy.get('.com-users-methods-list-method-name-webauthn a.com-users-methods-list-method-addnew').click();
100+
cy.get('#com-users-method-edit-title').clear().type('Test Passkey');
101+
cy.get('#toolbar-user-mfa-edit-save').click();
102+
cy.get('.com-users-methods-list-method-name-webauthn .com-users-methods-list-method-record').contains('Test Passkey');
103+
cy.clickToolbarButton('Cancel');
104+
cy.doAdministratorLogout();
105+
cy.get('#mod-login-username').type(Cypress.env('username'));
106+
cy.get('#mod-login-password').type(Cypress.env('password'));
107+
cy.get('#form-login').submit();
108+
cy.get('#users-mfa-title').contains('Passkey');
109+
cy.get('#toolbar-user-mfa-submit').click();
110+
cy.visit('/administrator/index.php?option=com_users&view=users');
111+
cy.get('.header-profile:visible').click();
112+
cy.get('.header-profile a.dropdown-item').contains('Edit Account').click();
113+
cy.get('#myTab div[role="tablist"] button[aria-controls="multifactorauth"]').click();
114+
cy.get('#com-users-methods-reset-message').contains('is enabled');
115+
cy.get('.com-users-methods-list-method-name-webauthn a.com-users-methods-list-method-record-delete').click();
116+
cy.on('window:confirm', (text) => expect(text).to.contains('Are you sure you want to delete?'));
117+
cy.get('#com-users-methods-reset-message').contains('not enabled');
118+
cy.then(() => Cypress.automation('remote:debugger:protocol', { command: 'WebAuthn.disable', params: {} }));
119+
});
120+
83121
it('can login with Multi-factor Authentication (backup codes)', () => {
84122
cy.doAdministratorLogin();
85123
cy.visit('/administrator/index.php?option=com_users&view=users');

‎tests/System/integration/install/Installation.cy.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ describe('Install Joomla', () => {
2828
cy.setErrorReportingToDevelopment();
2929
cy.doAdministratorLogout();
3030

31-
// Update to the correct secret for the API tests because of the bearer token
32-
cy.config_setParameter('secret', 'tEstValue');
33-
3431
// Setup mailing
3532
cy.config_setParameter('mailonline', true);
3633
cy.config_setParameter('mailer', 'smtp');

‎tests/System/integration/site/components/com_users/Mfa.cy.js‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { TOTP } from 'totp-generator';
22

3-
afterEach(() => cy.db_getUserId().then((uid) => cy.task('queryDB', `DELETE FROM #__user_mfa WHERE user_id = ${uid}`)));
4-
53
describe('Test in frontend that the user', () => {
4+
afterEach(() => cy.db_getUserId().then((uid) => cy.task('queryDB', `DELETE FROM #__user_mfa WHERE user_id = ${uid}`)));
5+
66
it('can login with Multi-factor Authentication (email)', () => {
77
cy.doFrontendLogin();
88
cy.visit('/index.php?option=com_users&view=profile&layout=edit');
@@ -66,6 +66,37 @@ describe('Test in frontend that the user', () => {
6666
cy.get('#com-users-methods-reset-message').contains('not enabled');
6767
});
6868

69+
it('can login with Multi-factor Authentication (passkey)', { browser: '!firefox' }, () => {
70+
Cypress.automation('remote:debugger:protocol', { command: 'WebAuthn.enable', params: {} }).then(() => {
71+
Cypress.automation('remote:debugger:protocol', {
72+
command: 'WebAuthn.addVirtualAuthenticator',
73+
params: {
74+
options: {
75+
protocol: 'ctap2', transport: 'internal', hasResidentKey: true, hasUserVerification: true, isUserVerified: true,
76+
},
77+
},
78+
});
79+
});
80+
cy.doFrontendLogin();
81+
cy.visit('/index.php?option=com_users&view=profile&layout=edit');
82+
cy.get('.com-users-methods-list-method-name-webauthn a.com-users-methods-list-method-addnew').click();
83+
cy.get('#com-users-method-edit-title').clear().type('Test Passkey');
84+
cy.get('#com-users-method-edit button.multifactorauth_webauthn_setup').click();
85+
cy.get('.com-users-methods-list-method-name-webauthn .com-users-methods-list-method-record').contains('Test Passkey');
86+
cy.doFrontendLogout();
87+
cy.get('form.mod-login input[name="username"]').type(Cypress.env('username'));
88+
cy.get('form.mod-login input[name="password"]').type(Cypress.env('password'));
89+
cy.get('form.mod-login').submit();
90+
cy.get('#users-mfa-title').contains('Passkey');
91+
cy.get('#users-mfa-captive-button-submit').click();
92+
cy.visit('/index.php?option=com_users&view=profile&layout=edit');
93+
cy.get('#com-users-methods-reset-message').contains('is enabled');
94+
cy.get('.com-users-methods-list-method-name-webauthn a.com-users-methods-list-method-record-delete').click();
95+
cy.on('window:confirm', (text) => expect(text).to.contains('Are you sure you want to delete?'));
96+
cy.get('#com-users-methods-reset-message').contains('not enabled');
97+
cy.then(() => Cypress.automation('remote:debugger:protocol', { command: 'WebAuthn.disable', params: {} }));
98+
});
99+
69100
it('can login with Multi-factor Authentication (backup codes)', () => {
70101
cy.doFrontendLogin();
71102
cy.visit('/index.php?option=com_users&view=profile&layout=edit');

‎tests/System/support/commands/api.mjs‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,20 @@ Cypress.Commands.add('api_patch', (path, body) => cy.api_getBearerToken().then((
1515

1616
Cypress.Commands.add('api_delete', (path) => cy.api_getBearerToken().then((token) => cy.request({ method: 'DELETE', url: `/api/index.php/v1${path}`, headers: { Authorization: `Bearer ${token}` } })));
1717

18-
Cypress.Commands.add('api_getBearerToken', () => cy.task('queryDB', "SELECT id FROM #__users WHERE username = 'api'").then((user) => {
19-
if (user.length > 0) {
20-
return 'c2hhMjU2OjM6ZTJmMjJlYTNlNTU0NmM1MDJhYTIzYzMwN2MxYzAwZTQ5NzJhMWRmOTUyNjY5MTk2YjE5ODJmZWMwZTcxNzgwMQ==';
21-
}
22-
23-
return cy.db_createUser({
24-
id: 3,
25-
name: 'API',
26-
email: '[email protected]',
27-
username: 'api',
28-
password: '123',
29-
block: 0,
30-
registerDate: '2000-01-01',
31-
params: '{}',
32-
group_id: 8,
33-
}).then((id) => {
34-
cy.task(
35-
'queryDB',
36-
'INSERT INTO #__user_profiles (user_id, profile_key, profile_value) VALUES '
37-
+ `('${id}', 'joomlatoken.token', 'dOi2m1NRrnBHlhaWK/WWxh3B5tqq1INbdf4DhUmYTI4=')`,
38-
);
39-
return cy.task(
40-
'queryDB',
41-
`INSERT INTO #__user_profiles (user_id, profile_key, profile_value) VALUES ('${id}', 'joomlatoken.enabled', 1)`,
42-
);
43-
}).then(() => 'c2hhMjU2OjM6ZTJmMjJlYTNlNTU0NmM1MDJhYTIzYzMwN2MxYzAwZTQ5NzJhMWRmOTUyNjY5MTk2YjE5ODJmZWMwZTcxNzgwMQ==');
44-
}));
18+
Cypress.Commands.add('api_getBearerToken', () => {
19+
cy.session('apiToken', () => {
20+
cy.db_getUserId().then((uid) => {
21+
cy.doAdministratorLogin();
22+
cy.visit(`/administrator/index.php?option=com_users&task=user.edit&id=${uid}#attrib-joomlatoken`);
23+
cy.get('#fieldset-joomlatoken').then((fieldset) => {
24+
if (fieldset.find('#jform_joomlatoken_reset1').length > 0) {
25+
cy.get('#jform_joomlatoken_reset1').click();
26+
}
27+
});
28+
cy.clickToolbarButton('Save');
29+
cy.get('#jform_joomlatoken_token').invoke('val').then((token) => {
30+
window.localStorage.setItem('authToken', token);
31+
});
32+
});
33+
}).then(() => window.localStorage.getItem('authToken'));
34+
});

0 commit comments

Comments
 (0)