Skip to content

test: add saml login tests for user without name and user with channels #36383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 9 commits into from
Aug 20, 2025
Merged

test: add saml login tests for user without name and user with channels #36383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0df06dd
test: add SAML login tests for user without name and user with channels
jessicaschelly Jul 8, 2025
445a725
improve tests
jessicaschelly Jul 9, 2025
3debf83
add test for fallback to displayname
jessicaschelly Jul 9, 2025
ed78d8a
Merge branch 'develop' into test/saml-tests
jessicaschelly Jul 10, 2025
7f74cd3
add promise all and user order
jessicaschelly Jul 10, 2025
098a184
add test for user without channel attribute
jessicaschelly Jul 17, 2025
564e0d6
Merge branch 'develop' into test/saml-tests
jessicaschelly Jul 17, 2025
c24a0ee
Merge branch 'develop' into test/saml-tests
jessicaschelly Aug 13, 2025
5f12982
fix lint
jessicaschelly Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions apps/meteor/tests/e2e/containers/saml/config/simplesamlphp/authsources.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,27 @@
'email' => '[email protected]',
'role' => 'saml-role',
),
'samluser5:password' => array(
'uid' => array('5'),
'username' => 'samluser5',
'eduPersonAffiliation' => array('group5'),
'email' => '[email protected]',
),
'samluser6:password' => array(
'uid' => array('6'),
'username' => 'samluser6',
'displayName' => 'Saml User 6 Display Name',
'eduPersonAffiliation' => array('group6'),
'email' => '[email protected]',
),
'samluser7:password' => array(
'uid' => array('7'),
'username' => 'samluser7',
'cn' => 'Saml User 7',
'eduPersonAffiliation' => array('group7'),
'email' => '[email protected]',
'channels' => array('saml-channel-1', 'saml-channel-2'),
),
'samlusernoname:password' => array(
'uid' => array('5'),
'cn' => 'Saml User No Username',
Expand Down
3 changes: 3 additions & 0 deletions apps/meteor/tests/e2e/fixtures/userStates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ export const Users = {
samluser1: generateContext('samluser1'),
samluser2: generateContext('samluser2'),
samluser4: generateContext('samluser4'),
samluser5: generateContext('samluser5'),
samluser6: generateContext('samluser6'),
samluser7: generateContext('samluser7'),
samlusernoname: generateContext('custom_saml_username'),
samlusernoname2: generateContext('custom_saml_username2'),
userForSamlMerge: generateContext('user_for_saml_merge'),
Expand Down
114 changes: 108 additions & 6 deletions apps/meteor/tests/e2e/saml.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ const resetTestData = async ({ api, cleanupOnly = false }: { api?: any; cleanupO
Users.samluser1,
Users.samluser2,
Users.samluser4,
Users.samluser5,
Users.samluser6,
Users.samluser7,
Users.samlusernoname,
Users.samlusernoname2,
].map(({ data: { username } }) => username),
'custom_saml_username',
'custom_saml_username2',
];

await connection
.db()
.collection('users')
Expand Down Expand Up @@ -94,6 +98,8 @@ test.describe('SAML', () => {
let targetInviteGroupId: string;
let targetInviteGroupName: string;
let inviteId: string;
let targetChannel: string;
let autoCreatedChannel: string;

const containerPath = path.join(__dirname, 'containers', 'saml');

Expand All @@ -118,11 +124,18 @@ test.describe('SAML', () => {
});

test.beforeAll(async ({ api }) => {
const groupResponse = await api.post('/groups.create', { name: faker.string.uuid() });
const [groupResponse, channelResponse] = await Promise.all([
api.post('/groups.create', { name: faker.string.uuid() }),
api.post('/channels.create', { name: 'saml-channel-1' }),
]);

expect(groupResponse.status()).toBe(200);
expect(channelResponse.status()).toBe(200);

const { group } = await groupResponse.json();
targetInviteGroupId = group._id;
targetInviteGroupName = group.name;
targetChannel = 'saml-channel-1';

const inviteResponse = await api.post('/findOrCreateInvite', { rid: targetInviteGroupId, days: 1, maxUses: 0 });
expect(inviteResponse.status()).toBe(200);
Expand Down Expand Up @@ -154,7 +167,11 @@ test.describe('SAML', () => {
});

test.afterAll(async ({ api }) => {
expect((await api.post('/groups.delete', { roomId: targetInviteGroupId })).status()).toBe(200);
await Promise.all([
api.post('/groups.delete', { roomId: targetInviteGroupId }).then((response) => expect(response.status()).toBe(200)),
api.post('/channels.delete', { roomName: targetChannel }).then((response) => expect(response.status()).toBe(200)),
api.post('/channels.delete', { roomName: autoCreatedChannel }),
]);
});

test.beforeEach(async ({ page }) => {
Expand Down Expand Up @@ -573,12 +590,97 @@ test.describe('SAML', () => {
// Test different variations of the Immutable Property setting
});

test.fixme('Login - User without name', async () => {
// Test login with a SAML user with no name
test('Login - User without name', async ({ page, api }) => {
await test.step('expect user name to fallback to username when displayName is not provided', async () => {
await doLoginStep(page, 'samluser5');

const user = await getUserInfo(api, 'samluser5');

expect(user).toBeDefined();
expect(user?.username).toBe('samluser5');
expect(user?.emails).toBeDefined();
expect(user?.emails?.[0].address).toBe('[email protected]');
// When displayName is not provided, it should fall back to username
expect(user?.name).toBe('samluser5');
await doLogoutStep(page);
});

await test.step('expect user name to fallback to displayName when provided', async () => {
await doLoginStep(page, 'samluser6');

const user = await getUserInfo(api, 'samluser6');

expect(user).toBeDefined();
expect(user?.username).toBe('samluser6');
expect(user?.emails).toBeDefined();
expect(user?.emails?.[0].address).toBe('[email protected]');
// When displayName is provided, it should fall back to displayName
expect(user?.name).toBe('Saml User 6 Display Name');
});
});

test.fixme('Login - User with channels attribute', async () => {
// Test login with a SAML user with a "channels" attribute
test('Login - User with channels attribute', async ({ page, api }) => {
autoCreatedChannel = 'saml-channel-2';

await test.step('Configure SAML to enable channels attribute updates', async () => {
expect((await setSettingValueById(api, 'SAML_Custom_Default_channels_update', true)).status()).toBe(200);
});

await doLoginStep(page, 'samluser7');

await test.step('expect user data to have been mapped correctly', async () => {
const user = await getUserInfo(api, 'samluser7');

expect(user).toBeDefined();
expect(user?.username).toBe('samluser7');
expect(user?.name).toBe('Saml User 7');
expect(user?.emails).toBeDefined();
expect(user?.emails?.[0].address).toBe('[email protected]');
});

await test.step('expect auto-created channel to be created automatically', async () => {
const channelInfoResponse = await api.get(`/channels.info?roomName=${autoCreatedChannel}`);
expect(channelInfoResponse.status()).toBe(200);
const { channel } = await channelInfoResponse.json();
expect(channel).toBeDefined();
expect(channel.name).toBe(autoCreatedChannel);
});

await test.step('expect user to be member of existing channel', async () => {
const existingChannelMembersResponse = await api.get(`/channels.members?roomName=${targetChannel}`);
expect(existingChannelMembersResponse.status()).toBe(200);
const { members: existingMembers } = await existingChannelMembersResponse.json();
expect(existingMembers).toBeDefined();
expect(existingMembers.some((member: { username: string }) => member.username === 'samluser7')).toBe(true);
});

await test.step('expect user to be member of auto-created channel', async () => {
const autoCreatedChannelMembersResponse = await api.get(`/channels.members?roomName=${autoCreatedChannel}`);
expect(autoCreatedChannelMembersResponse.status()).toBe(200);
const { members: autoCreatedMembers } = await autoCreatedChannelMembersResponse.json();
expect(autoCreatedMembers).toBeDefined();
expect(autoCreatedMembers.some((member: { username: string }) => member.username === 'samluser7')).toBe(true);
});

await doLogoutStep(page);

await doLoginStep(page, 'samluser1');

await test.step('expect user without channels attribute to not be added to existing channel', async () => {
const existingChannelMembersResponse = await api.get(`/channels.members?roomName=${targetChannel}`);
expect(existingChannelMembersResponse.status()).toBe(200);
const { members: existingMembers } = await existingChannelMembersResponse.json();
expect(existingMembers).toBeDefined();
expect(existingMembers.some((member: { username: string }) => member.username === 'samluser1')).toBe(false);
});

await test.step('expect user without channels attribute to not be added to auto-created channel', async () => {
const autoCreatedChannelMembersResponse = await api.get(`/channels.members?roomName=${autoCreatedChannel}`);
expect(autoCreatedChannelMembersResponse.status()).toBe(200);
const { members: autoCreatedMembers } = await autoCreatedChannelMembersResponse.json();
expect(autoCreatedMembers).toBeDefined();
expect(autoCreatedMembers.some((member: { username: string }) => member.username === 'samluser1')).toBe(false);
});
});

test.fixme('Data Sync - Custom Field Map', async () => {
Expand Down
Loading