more profileConfig rename

This commit is contained in:
Girish Ramakrishnan
2022-01-13 15:20:16 -08:00
parent e9945d8010
commit 97e439f8a3
5 changed files with 49 additions and 36 deletions

View File

@@ -100,13 +100,13 @@ describe('Cloudron API', function () {
const USER = {
email: 'setup2@account.com',
password: 'test?!3434543534',
username: 'setupuser2',
username: 'presetup2',
displayName: 'setup user2',
};
const response = await superagent.post(`${serverUrl}/api/v1/users`)
.query({ access_token: owner.token })
.send({ email: USER.email, username: 'presetup', displayName: 'pre setup' });
.send({ email: USER.email, username: 'presetup2', displayName: 'pre setup' });
expect(response.statusCode).to.equal(201);
USER.id = response.body.id;
@@ -119,24 +119,33 @@ describe('Cloudron API', function () {
.send({
inviteToken: require('url').parse(response2.body.inviteLink, true).query.inviteToken,
password: USER.password,
username: USER.username,
username: 'setupuser2', // this will cause a conflict. cannot change username
displayName: USER.displayName
})
.ok(() => true);
expect(response3.statusCode).to.equal(201);
expect(response3.body.accessToken).to.be.a('string');
expect(response3.statusCode).to.equal(409);
const response4 = await superagent.get(`${serverUrl}/api/v1/users/${USER.id}`)
const response4 = await superagent.post(`${serverUrl}/api/v1/cloudron/setup_account`)
.send({
inviteToken: require('url').parse(response2.body.inviteLink, true).query.inviteToken,
password: USER.password,
displayName: USER.displayName
})
.ok(() => true);
expect(response4.statusCode).to.equal(201);
expect(response4.body.accessToken).to.be.a('string');
const response5 = await superagent.get(`${serverUrl}/api/v1/users/${USER.id}`)
.query({ access_token: owner.token })
.ok(() => true);
expect(response4.statusCode).to.equal(200);
expect(response4.body.username).to.equal(USER.username);
expect(response4.body.displayName).to.equal(USER.displayName);
const response5 = await superagent.post(`${serverUrl}/api/v1/cloudron/login`)
.send({ username: USER.username, password: USER.password });
expect(response5.statusCode).to.equal(200);
expect(response5.body.username).to.equal(USER.username);
expect(response5.body.displayName).to.equal(USER.displayName);
const response6 = await superagent.post(`${serverUrl}/api/v1/cloudron/login`)
.send({ username: USER.username, password: USER.password });
expect(response6.statusCode).to.equal(200);
});
it('succeeds and does not overwrite pre-set username and display name if profiles are locked', async function () {
@@ -147,14 +156,14 @@ describe('Cloudron API', function () {
displayName: 'setup user3',
};
const response0 = await superagent.post(`${serverUrl}/api/v1/settings/directory_config`)
const response0 = await superagent.post(`${serverUrl}/api/v1/settings/profile_config`)
.query({ access_token: owner.token })
.send({ lockUserProfiles: true, mandatory2FA: false });
expect(response0.statusCode).to.equal(200);
const response = await superagent.post(`${serverUrl}/api/v1/users`)
.query({ access_token: owner.token })
.send({ email: USER.email, username: 'presetup', displayName: 'pre setup' });
.send({ email: USER.email, username: 'presetup3', displayName: 'pre setup3' });
expect(response.statusCode).to.equal(201);
USER.id = response.body.id;
@@ -167,8 +176,8 @@ describe('Cloudron API', function () {
.send({
inviteToken: require('url').parse(response2.body.inviteLink, true).query.inviteToken,
password: USER.password,
username: USER.username,
displayName: USER.displayName
username: USER.username, // ignored
displayName: USER.displayName // ignored
})
.ok(() => true);
expect(response3.statusCode).to.equal(201);
@@ -179,11 +188,11 @@ describe('Cloudron API', function () {
.ok(() => true);
expect(response4.statusCode).to.equal(200);
expect(response4.body.username).to.equal('presetup');
expect(response4.body.displayName).to.equal('pre setup');
expect(response4.body.username).to.equal('presetup3'); // what the admin provided
expect(response4.body.displayName).to.equal('pre setup3'); // what the admin provided
const response5 = await superagent.post(`${serverUrl}/api/v1/cloudron/login`)
.send({ username: 'presetup', password: USER.password });
.send({ username: 'presetup3', password: USER.password });
expect(response5.statusCode).to.equal(200);
});
});