From e5a28b96acb8b6c85ab20d2581446eea15818e6b Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Wed, 23 Oct 2013 13:25:50 -0700 Subject: [PATCH] Clean up the model --- lib/models/application.js | 15 ++++----------- lib/models/installation.js | 26 -------------------------- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 lib/models/installation.js diff --git a/lib/models/application.js b/lib/models/application.js index cc423d25..646e2897 100644 --- a/lib/models/application.js +++ b/lib/models/application.js @@ -91,21 +91,14 @@ function generateKey(hmacKey, algorithm, encoding) { return hmac.digest('base64'); } -// var AuthenticationScheme = dataSource.define('AuthenticationScheme', AuthenticationSchemeSchema); -// ApplicationSchema.authenticationSchemes = [AuthenticationScheme]; - -// var PushNotificationSetting = dataSource.define('PushNotificationSetting', PushNotificationSettingSchema); -// ApplicationSchema.pushSettings = [PushNotificationSetting]; - var Application = loopback.createModel('Application', ApplicationSchema); -// Application.hasMany(AuthenticationScheme, {as: 'authenticationSchemes', foreignKey: 'appId'}); -// Application.hasMany(PushNotificationSetting, {as: 'pushNotificationSettings', foreignKey: 'appId'}); - +/*! + * A hook to generate keys before creation + * @param next + */ Application.beforeCreate = function (next) { - // console.trace(); var app = this; - // use data argument to update object app.created = app.modified = new Date(); app.id = generateKey('id', 'sha1'); app.clientKey = generateKey('client'); diff --git a/lib/models/installation.js b/lib/models/installation.js deleted file mode 100644 index b6231998..00000000 --- a/lib/models/installation.js +++ /dev/null @@ -1,26 +0,0 @@ -// See Device registration -var InstallationSchema = { - id: { - type: String, - required: true, - id: 1 - }, - appId: String, // Application id - appVersion: String, // Application version - userId: String, // User id - deviceToken: String, // Device token - deviceType: String, // Device type, such as apns - subscriptions: [String], - - status: {type: String, default: 'active'}, // Status of the application, production/sandbox/disabled - - // Timestamps - created: {type: Date, default: Date}, - modified: {type: Date, default: Date} -}; - -module.exports = function(dataSource) { - dataSource = dataSource || new require('loopback-datasource-juggler').ModelBuilder(); - var Installation = dataSource.define('Installation', InstallationSchema); - return Installation; -}