models: move AccessToken LDL def into a json file

common/models/access-token.js

@@ -4,25 +4,11 @@
 
 var loopback = require('../../lib/loopback')
   , assert = require('assert')
-  , crypto = require('crypto')
   , uid = require('uid2')
-  , DEFAULT_TTL = 1209600 // 2 weeks in seconds
   , DEFAULT_TOKEN_LEN = 64
   , Role = require('./role').Role
   , ACL = require('./acl').ACL;
 
-/*!
- * Default AccessToken properties.
- */
-
-var properties = {
-  id: {type: String, id: true},
-  ttl: {type: Number, ttl: true, default: DEFAULT_TTL}, // time to live in seconds
-  created: {type: Date, default: function() {
-    return new Date();
-  }}
-};
-
 /**
  * Token based authentication and access control.
  *
@@ -32,36 +18,20 @@ var properties = {
  *  - ALLOW EVERYONE create
  *
  * @property {String} id Generated token ID
- * @property {Number} ttl Time to live in seconds
+ * @property {Number} ttl Time to live in seconds, 2 weeks by default.
  * @property {Date} created When the token was created
  *
- * @class
+ * @class AccessToken
  * @inherits {PersistedModel}
  */
 
-var AccessToken = module.exports =
-  loopback.PersistedModel.extend('AccessToken', properties, {
-  acls: [
-    {
-      principalType: ACL.ROLE,
-      principalId: Role.EVERYONE,
-      permission: 'DENY'
-    },
-    {
-      principalType: ACL.ROLE,
-      principalId: Role.EVERYONE,
-      property: 'create',
-      permission: 'ALLOW'
-    }
-  ],
-  relations: {
-    user: {
-      type: 'belongsTo',
-      model: 'User',
-      foreignKey: 'userId'
-    }
-  }
-});
+module.exports = function(AccessToken) {
+
+  // Workaround for https://github.com/strongloop/loopback/issues/292
+  AccessToken.definition.rawProperties.created.default =
+  AccessToken.definition.properties.created.default = function() {
+    return new Date();
+  };
 
   /**
    * Anonymous Token
@@ -232,3 +202,4 @@ function tokenIdForRequest(req, options) {
     }
     return null;
   }
+};

common/models/access-token.json

@@ -0,0 +1,38 @@
+{
+  "name": "AccessToken",
+  "properties": {
+    "id": {
+      "type": "string",
+      "id": true
+    },
+    "ttl": {
+      "type": "number",
+      "ttl": true,
+      "default": 1209600,
+      "description": "time to live in seconds (2 weeks by default)"
+    },
+    "created": {
+      "type": "Date"
+    }
+  },
+  "relations": {
+    "user": {
+      "type": "belongsTo",
+      "model": "User",
+      "foreignKey": "userId"
+    }
+  },
+  "acls": [
+    {
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "permission": "DENY"
+    },
+    {
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "property": "create",
+      "permission": "ALLOW"
+    }
+  ]
+}

lib/access-context.js

@@ -1,5 +1,4 @@
 var loopback = require('./loopback');
-var AccessToken = require('../common/models/access-token');
 var debug = require('debug')('loopback:security:access-context');
 
 /**
@@ -49,7 +48,9 @@ function AccessContext(context) {
   }
   
   this.accessType = context.accessType || AccessContext.ALL;
-  this.accessToken = context.accessToken || AccessToken.ANONYMOUS;
+  assert(loopback.AccessToken,
+    'AccessToken model must be defined before AccessContext model');
+  this.accessToken = context.accessToken || loopback.AccessToken.ANONYMOUS;
 
   var principalType = context.principalType || Principal.USER;
   var principalId = context.principalId || undefined;

lib/builtin-models.js

@@ -9,7 +9,10 @@ module.exports = function(loopback) {
     require('../common/models/application.json'),
     require('../common/models/application.js'));
 
-  loopback.AccessToken = require('../common/models/access-token');
+  loopback.AccessToken = createModel(
+    require('../common/models/access-token.json'),
+    require('../common/models/access-token.js'));
+
   loopback.Role = require('../common/models/role').Role;
   loopback.RoleMapping = require('../common/models/role').RoleMapping;
   loopback.ACL = require('../common/models/acl').ACL;