simplify base user lookup

bajtos · bajtos · commit a689eddfcfff · 2017-02-01T17:02:09.000+01:00
diff --git a/lib/access-context.js b/lib/access-context.js
@@ -128,6 +128,7 @@ AccessContext.prototype.addPrincipal = function(principalType, principalId, prin
  * @returns {*}
  */
 AccessContext.prototype.getUserId = function() {
+  var BaseUser = this.registry.getModel('User');
   for (var i = 0; i < this.principals.length; i++) {
     var p = this.principals[i];
     var isBuiltinPrincipal = p.type === Principal.APP ||
@@ -143,19 +144,9 @@ AccessContext.prototype.getUserId = function() {
     // or permit to resolve a valid user model
     var userModel = this.registry.findModel(p.type);
     if (!userModel) continue;
-    if (userModel.modelName === 'User') {
+    if (userModel.prototype instanceof BaseUser) {
       return p.id;
     }
-    var modelBase = userModel.definition.settings.base;
-    while (modelBase) {
-      // make sure modelBase is a model instance
-      modelBase = typeof(modelBase === 'string') ? this.registry.findModel(modelBase) : modelBase;
-      if (modelBase.modelName === 'User') {
-        return p.id;
-      }
-      // iterate on the upper base model
-      modelBase = modelBase.definition.settings.base;
-    }
   }
   return null;
 };
