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

Remove tokenScopes

Browse Source 
decided that the UI won't use this any more and will just the admin flag
This commit is contained in:
Girish Ramakrishnan
2018-08-03 10:07:21 -07:00
parent ce9fc7b3f7
commit fba70d888b
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/profile.js
-1
View File
@@ -29,7 +29,6 @@ function get(req, res, next) {
username: req.user.username, username: req.user.username,
email: req.user.email, email: req.user.email,
fallbackEmail: req.user.fallbackEmail, fallbackEmail: req.user.fallbackEmail,
tokenScopes: req.authInfo.authorizedScopes,
displayName: req.user.displayName, displayName: req.user.displayName,
twoFactorAuthenticationEnabled: req.user.twoFactorAuthenticationEnabled, twoFactorAuthenticationEnabled: req.user.twoFactorAuthenticationEnabled,
admin: req.user.admin admin: req.user.admin
src/routes/test/profile-test.js
+1 -6
View File
@@ -6,8 +6,7 @@
'use strict'; 'use strict';
var accesscontrol = require('../../accesscontrol.js'), var config = require('../../config.js'),
config = require('../../config.js'),
database = require('../../database.js'), database = require('../../database.js'),
expect = require('expect.js'), expect = require('expect.js'),
mailer = require('../../mailer.js'), mailer = require('../../mailer.js'),
@@ -105,7 +104,6 @@ describe('Profile API', function () {
expect(result.body.displayName).to.be.a('string'); expect(result.body.displayName).to.be.a('string');
expect(result.body.password).to.not.be.ok(); expect(result.body.password).to.not.be.ok();
expect(result.body.salt).to.not.be.ok(); expect(result.body.salt).to.not.be.ok();
expect(result.body.tokenScopes).to.eql(accesscontrol.VALID_SCOPES);
user_0 = result.body; user_0 = result.body;
@@ -143,7 +141,6 @@ describe('Profile API', function () {
expect(result.body.displayName).to.be.a('string'); expect(result.body.displayName).to.be.a('string');
expect(result.body.password).to.not.be.ok(); expect(result.body.password).to.not.be.ok();
expect(result.body.salt).to.not.be.ok(); expect(result.body.salt).to.not.be.ok();
expect(result.body.tokenScopes).to.eql(accesscontrol.VALID_SCOPES);
done(); done();
}); });
}); });
@@ -196,7 +193,6 @@ describe('Profile API', function () {
expect(res.body.username).to.equal(USERNAME_0.toLowerCase()); expect(res.body.username).to.equal(USERNAME_0.toLowerCase());
expect(res.body.email).to.equal(EMAIL_0_NEW.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.fallbackEmail).to.equal(EMAIL_0_NEW_FALLBACK.toLowerCase());
expect(res.body.tokenScopes).to.eql(accesscontrol.VALID_SCOPES);
expect(res.body.displayName).to.equal(''); expect(res.body.displayName).to.equal('');
done(); done();
@@ -217,7 +213,6 @@ describe('Profile API', function () {
expect(res.statusCode).to.equal(200); expect(res.statusCode).to.equal(200);
expect(res.body.username).to.equal(USERNAME_0.toLowerCase()); expect(res.body.username).to.equal(USERNAME_0.toLowerCase());
expect(res.body.email).to.equal(EMAIL_0_NEW.toLowerCase()); expect(res.body.email).to.equal(EMAIL_0_NEW.toLowerCase());
expect(res.body.tokenScopes).to.eql(accesscontrol.VALID_SCOPES);
expect(res.body.displayName).to.equal(DISPLAY_NAME_0_NEW); expect(res.body.displayName).to.equal(DISPLAY_NAME_0_NEW);
done(); done();
src/setup.js
-1
View File
@@ -255,7 +255,6 @@ function activate(username, password, email, displayName, ip, auditSource, callb
callback(null, { callback(null, {
userId: userObject.id, userId: userObject.id,
token: result.accessToken, token: result.accessToken,
tokenScopes: result.tokenScopes,
expires: result.expires expires: result.expires
}); });