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

Remove user.admin property

Browse Source 
The UI will now base itself entirely off the scopes of the token
This commit is contained in:
Girish Ramakrishnan
2018-06-17 16:13:45 -07:00
parent 156ffb40c9
commit f24a099e79
6 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/routes/test/profile-test.js
View File

@@ -102,11 +102,10 @@ describe('Profile API', function () {
expect(result.body.username).to.equal(USERNAME_0.toLowerCase());
expect(result.body.email).to.equal(EMAIL_0.toLowerCase());
expect(result.body.fallbackEmail).to.equal(EMAIL_0.toLowerCase());
expect(result.body.admin).to.be.ok();
expect(result.body.displayName).to.be.a('string');
expect(result.body.password).to.not.be.ok();
expect(result.body.salt).to.not.be.ok();
expect(result.body.tokenScope).to.be('apps,clients,cloudron,domains,mail,profile,settings,users');
expect(result.body.tokenScope).to.be(accesscontrol.VALID_SCOPES.join(','));
user_0 = result.body;
@@ -141,11 +140,10 @@ describe('Profile API', function () {
expect(result.statusCode).to.equal(200);
expect(result.body.username).to.equal(USERNAME_0.toLowerCase());
expect(result.body.email).to.equal(EMAIL_0.toLowerCase());
expect(result.body.admin).to.be.ok();
expect(result.body.displayName).to.be.a('string');
expect(result.body.password).to.not.be.ok();
expect(result.body.salt).to.not.be.ok();
expect(result.body.tokenScope).to.be('apps,clients,cloudron,domains,mail,profile,settings,users');
expect(result.body.tokenScope).to.be(accesscontrol.VALID_SCOPES.join(','));
done();
});
});
@@ -198,7 +196,7 @@ describe('Profile API', function () {
expect(res.body.username).to.equal(USERNAME_0.toLowerCase());
expect(res.body.email).to.equal(EMAIL_0_NEW.toLowerCase());
expect(res.body.fallbackEmail).to.equal(EMAIL_0_NEW_FALLBACK.toLowerCase());
expect(res.body.admin).to.equal(true);
expect(res.body.tokenScope).to.be(accesscontrol.VALID_SCOPES.join(','));
expect(res.body.displayName).to.equal('');
done();
@@ -219,7 +217,7 @@ describe('Profile API', function () {
expect(res.statusCode).to.equal(200);
expect(res.body.username).to.equal(USERNAME_0.toLowerCase());
expect(res.body.email).to.equal(EMAIL_0_NEW.toLowerCase());
expect(res.body.admin).to.be.ok();
expect(res.body.tokenScope).to.be(accesscontrol.VALID_SCOPES.join(','));
expect(res.body.displayName).to.equal(DISPLAY_NAME_0_NEW);
done();