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

tokens table always has canonical scope

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-06-17 22:52:36 -07:00
parent b6b7d08af3
commit 898cbd01b3
7 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/setup.js
View File

@@ -11,7 +11,8 @@ exports = module.exports = {
SetupError: SetupError
};
var assert = require('assert'),
var accesscontrol = require('./accesscontrol.js'),
assert = require('assert'),
async = require('async'),
backups = require('./backups.js'),
BackupsError = require('./backups.js').BackupsError,
@@ -252,7 +253,7 @@ function activate(username, password, email, displayName, ip, auditSource, callb
var token = tokendb.generateToken();
var expires = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
tokendb.add(token, userObject.id, result.id, expires, result.scope, function (error) {
tokendb.add(token, userObject.id, result.id, expires, accesscontrol.canonicalScopeString(result.scope), function (error) {
if (error) return callback(new SetupError(SetupError.INTERNAL_ERROR, error));
eventlog.add(eventlog.ACTION_ACTIVATE, auditSource, { });