Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion common/models/acl.js
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@ module.exports = function(ACL) {
*/

ACL.checkAccessForContext = function(context, callback) {
var registry = this.registry;

if (!(context instanceof AccessContext)) {
context = new AccessContext(context);
}
Expand All @@ -394,7 +396,7 @@ module.exports = function(ACL) {
var staticACLs = this.getStaticACLs(model.modelName, property);

var self = this;
var roleModel = loopback.getModelByType(Role);
var roleModel = registry.getModelByType(Role);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Role is the global loopback.Role, this should be IMO changed to getModelByType('Role').

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll address this in another PR. Its a bit more complex than this. The Role model is required before an app.registry even exists.

this.find({where: {model: model.modelName, property: propertyQuery,
accessType: accessTypeQuery}}, function(err, acls) {
if (err) {
Expand Down
13 changes: 9 additions & 4 deletions common/models/role-mapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ module.exports = function(RoleMapping) {
* @param {Application} application
*/
RoleMapping.prototype.application = function(callback) {
var registry = this.constructor.registry;

if (this.principalType === RoleMapping.APPLICATION) {
var applicationModel = this.constructor.Application ||
loopback.getModelByType(loopback.Application);
registry.getModelByType('Application');
applicationModel.findById(this.principalId, callback);
} else {
process.nextTick(function() {
Expand All @@ -42,9 +44,10 @@ module.exports = function(RoleMapping) {
* @param {User} user
*/
RoleMapping.prototype.user = function(callback) {
var RoleMapping = this.constructor;
if (this.principalType === RoleMapping.USER) {
var userModel = this.constructor.User ||
loopback.getModelByType(loopback.User);
var userModel = RoleMapping.User ||
RoleMapping.registry.getModelByType('User');
userModel.findById(this.principalId, callback);
} else {
process.nextTick(function() {
Expand All @@ -60,9 +63,11 @@ module.exports = function(RoleMapping) {
* @param {User} childUser
*/
RoleMapping.prototype.childRole = function(callback) {
var registry = this.constructor.registry;

if (this.principalType === RoleMapping.ROLE) {
var roleModel = this.constructor.Role ||
loopback.getModelByType(loopback.Role);
registry.getModelByType(loopback.Role);
roleModel.findById(this.principalId, callback);
} else {
process.nextTick(function() {
Expand Down
10 changes: 7 additions & 3 deletions common/models/role.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ module.exports = function(Role) {

// Set up the connection to users/applications/roles once the model
Role.once('dataSourceAttached', function() {
var roleMappingModel = this.RoleMapping || loopback.getModelByType(RoleMapping);
var registry = Role.registry;
var roleMappingModel = this.RoleMapping || registry.getModelByType(RoleMapping);
Role.prototype.users = function(callback) {
roleMappingModel.find({where: {roleId: this.id,
principalType: RoleMapping.USER}}, function(err, mappings) {
Expand Down Expand Up @@ -242,6 +243,8 @@ module.exports = function(Role) {
context = new AccessContext(context);
}

var registry = this.registry;

debug('isInRole(): %s', role);
context.debug();

Expand Down Expand Up @@ -277,7 +280,7 @@ module.exports = function(Role) {
return;
}

var roleMappingModel = this.RoleMapping || loopback.getModelByType(RoleMapping);
var roleMappingModel = this.RoleMapping || registry.getModelByType(RoleMapping);
this.findOne({where: {name: role}}, function(err, result) {
if (err) {
if (callback) callback(err);
Expand Down Expand Up @@ -332,6 +335,7 @@ module.exports = function(Role) {
context = new AccessContext(context);
}
var roles = [];
var registry = this.registry;

var addRole = function(role) {
if (role && roles.indexOf(role) === -1) {
Expand All @@ -358,7 +362,7 @@ module.exports = function(Role) {
});
});

var roleMappingModel = this.RoleMapping || loopback.getModelByType(RoleMapping);
var roleMappingModel = this.RoleMapping || registry.getModelByType(RoleMapping);
context.principals.forEach(function(p) {
// Check against the role mappings
var principalType = p.type || undefined;
Expand Down
3 changes: 2 additions & 1 deletion common/models/scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ module.exports = function(Scope) {
*/
Scope.checkPermission = function(scope, model, property, accessType, callback) {
var ACL = loopback.ACL;
var registry = this.registry;
assert(ACL,
'ACL model must be defined before Scope.checkPermission is called');

this.findOne({where: {name: scope}}, function(err, scope) {
if (err) {
if (callback) callback(err);
} else {
var aclModel = loopback.getModelByType(ACL);
var aclModel = registry.getModelByType(ACL);
aclModel.checkPermission(ACL.SCOPE, scope.id, model, property, accessType, callback);
}
});
Expand Down
3 changes: 2 additions & 1 deletion common/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ module.exports = function(User) {
User.prototype.verify = function(options, fn) {
var user = this;
var userModel = this.constructor;
var registry = userModel.registry;
assert(typeof options === 'object', 'options required when calling user.verify()');
assert(options.type, 'You must supply a verification type (options.type)');
assert(options.type === 'email', 'Unsupported verification type');
Expand Down Expand Up @@ -364,7 +365,7 @@ module.exports = function(User) {
options.redirect;

// Email model
var Email = options.mailer || this.constructor.email || loopback.getModelByType(loopback.Email);
var Email = options.mailer || this.constructor.email || registry.getModelByType(loopback.Email);

// Set a default token generation function if one is not provided
var tokenGenerator = options.generateVerificationToken || User.generateVerificationToken;
Expand Down
16 changes: 9 additions & 7 deletions lib/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

var DataSource = require('loopback-datasource-juggler').DataSource;
var registry = require('./registry');
var Registry = require('./registry');
var assert = require('assert');
var fs = require('fs');
var extend = require('util')._extend;
Expand Down Expand Up @@ -104,6 +104,8 @@ app.disuse = function(route) {

app.model = function(Model, config) {
var isPublic = true;
var registry = this.registry;

if (arguments.length > 1) {
config = config || {};
if (typeof Model === 'string') {
Expand All @@ -130,7 +132,7 @@ app.model = function(Model, config) {
configureModel(Model, config, this);
isPublic = config.public !== false;
} else {
assert(Model.prototype instanceof registry.Model,
assert(Model.prototype instanceof Model.registry.getModel('Model'),
Model.modelName + ' must be a descendant of loopback.Model');
}

Expand Down Expand Up @@ -216,7 +218,7 @@ app.models = function() {
* @param {Object} config The data source config
*/
app.dataSource = function(name, config) {
var ds = dataSourcesFromConfig(config, this.connectors);
var ds = dataSourcesFromConfig(name, config, this.connectors, this.registry);
this.dataSources[name] =
this.dataSources[classify(name)] =
this.dataSources[camelize(name)] = ds;
Expand Down Expand Up @@ -362,14 +364,14 @@ app.boot = function(options) {
'`app.boot` was removed, use the new module loopback-boot instead');
};

function dataSourcesFromConfig(config, connectorRegistry) {
function dataSourcesFromConfig(name, config, connectorRegistry, registry) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of the new name parameter? AFAICT, it's not used anywhere.

var connectorPath;

assert(typeof config === 'object',
'cannont create data source without config object');

if (typeof config.connector === 'string') {
var name = config.connector;
name = config.connector;
if (connectorRegistry[name]) {
config.connector = connectorRegistry[name];
} else {
Expand All @@ -385,7 +387,7 @@ function dataSourcesFromConfig(config, connectorRegistry) {
}

function configureModel(ModelCtor, config, app) {
assert(ModelCtor.prototype instanceof registry.Model,
assert(ModelCtor.prototype instanceof ModelCtor.registry.getModel('Model'),
ModelCtor.modelName + ' must be a descendant of loopback.Model');

var dataSource = config.dataSource;
Expand All @@ -405,7 +407,7 @@ function configureModel(ModelCtor, config, app) {
config = extend({}, config);
config.dataSource = dataSource;

registry.configureModel(ModelCtor, config);
app.registry.configureModel(ModelCtor, config);
}

function clearHandlerCache(app) {
Expand Down
42 changes: 21 additions & 21 deletions lib/builtin-models.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
module.exports = function(loopback) {
module.exports = function(registry) {
// NOTE(bajtos) we must use static require() due to browserify limitations

loopback.Email = createModel(
registry.Email = createModel(
require('../common/models/email.json'),
require('../common/models/email.js'));

loopback.Application = createModel(
registry.Application = createModel(
require('../common/models/application.json'),
require('../common/models/application.js'));

loopback.AccessToken = createModel(
registry.AccessToken = createModel(
require('../common/models/access-token.json'),
require('../common/models/access-token.js'));

loopback.RoleMapping = createModel(
registry.RoleMapping = createModel(
require('../common/models/role-mapping.json'),
require('../common/models/role-mapping.js'));

loopback.Role = createModel(
registry.Role = createModel(
require('../common/models/role.json'),
require('../common/models/role.js'));

loopback.ACL = createModel(
registry.ACL = createModel(
require('../common/models/acl.json'),
require('../common/models/acl.js'));

loopback.Scope = createModel(
registry.Scope = createModel(
require('../common/models/scope.json'),
require('../common/models/scope.js'));

loopback.User = createModel(
registry.User = createModel(
require('../common/models/user.json'),
require('../common/models/user.js'));

loopback.Change = createModel(
registry.Change = createModel(
require('../common/models/change.json'),
require('../common/models/change.js'));

loopback.Checkpoint = createModel(
registry.Checkpoint = createModel(
require('../common/models/checkpoint.json'),
require('../common/models/checkpoint.js'));

Expand All @@ -50,18 +50,18 @@ module.exports = function(loopback) {
MAIL: 'mail'
};

loopback.Email.autoAttach = dataSourceTypes.MAIL;
loopback.PersistedModel.autoAttach = dataSourceTypes.DB;
loopback.User.autoAttach = dataSourceTypes.DB;
loopback.AccessToken.autoAttach = dataSourceTypes.DB;
loopback.Role.autoAttach = dataSourceTypes.DB;
loopback.RoleMapping.autoAttach = dataSourceTypes.DB;
loopback.ACL.autoAttach = dataSourceTypes.DB;
loopback.Scope.autoAttach = dataSourceTypes.DB;
loopback.Application.autoAttach = dataSourceTypes.DB;
registry.Email.autoAttach = dataSourceTypes.MAIL;
registry.getModel('PersistedModel').autoAttach = dataSourceTypes.DB;
registry.User.autoAttach = dataSourceTypes.DB;
registry.AccessToken.autoAttach = dataSourceTypes.DB;
registry.Role.autoAttach = dataSourceTypes.DB;
registry.RoleMapping.autoAttach = dataSourceTypes.DB;
registry.ACL.autoAttach = dataSourceTypes.DB;
registry.Scope.autoAttach = dataSourceTypes.DB;
registry.Application.autoAttach = dataSourceTypes.DB;

function createModel(definitionJson, customizeFn) {
var Model = loopback.createModel(definitionJson);
var Model = registry.createModel(definitionJson);
customizeFn(Model);
return Model;
}
Expand Down
8 changes: 8 additions & 0 deletions lib/global-registry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = function() {
var Registry = require('./registry');
var registry = global.__LOOPBACK_GLOBAL_REGISTRY__;
if (!registry) {
registry = global.__LOOPBACK_GLOBAL_REGISTRY__ = new Registry();
}
return registry;
};
Loading