From bca972219695ea1f567bc7d8145724ec257ff6a6 Mon Sep 17 00:00:00 2001 From: Rand McKinney Date: Tue, 24 Jun 2014 16:14:01 -0700 Subject: [PATCH 1/7] Update link to doc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f7bb033..a8beab86 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ as illustrated below: ## Resources - * [Documentation](http://docs.strongloop.com/display/DOC/LoopBack). + * [Documentation](http://docs.strongloop.com/display/LB/LoopBack). * [API documentation](http://apidocs.strongloop.com/loopback). * [LoopBack Google Group](https://groups.google.com/forum/#!forum/loopbackjs). * [GitHub issues](https://github.com/strongloop/loopback/issues). From 70615696cd2626d0dd3ffa8c4e0ff0d5d655da80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Wed, 25 Jun 2014 13:44:07 +0200 Subject: [PATCH 2/7] Mark `app.boot` as deprecated. --- lib/application.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/application.js b/lib/application.js index a94a5faa..3b6d9dc6 100644 --- a/lib/application.js +++ b/lib/application.js @@ -167,6 +167,9 @@ app.model = function (Model, config) { /** * Get the models exported by the app. Returns only models defined using `app.model()` * + * **Deprecated. Use the package + * [loopback-boot](https://github.com/strongloop/loopback-boot) instead.** + * There are two ways to access models: * * 1. Call `app.models()` to get a list of all models. From 70c1cb5ce0971a627ffe23f2c79be1e964adf36f Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Wed, 25 Jun 2014 09:09:04 -0700 Subject: [PATCH 3/7] Update debug setting --- lib/connectors/mail.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/connectors/mail.js b/lib/connectors/mail.js index c0337f46..5660adcc 100644 --- a/lib/connectors/mail.js +++ b/lib/connectors/mail.js @@ -4,9 +4,8 @@ var mailer = require('nodemailer') , assert = require('assert') - , debug = require('debug') + , debug = require('debug')('loopback:connector:mail') , loopback = require('../loopback') - , STUB = 'STUB'; /** * Export the MailConnector class. From c20ecaf2655b614dcd0720fe168c13f53b03c41c Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Wed, 25 Jun 2014 09:09:14 -0700 Subject: [PATCH 4/7] Bump version and update deps --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index a4f691a6..2f190c88 100644 --- a/package.json +++ b/package.json @@ -26,18 +26,18 @@ "mobile", "mBaaS" ], - "version": "1.9.0-pre", + "version": "1.9.0", "scripts": { "test": "mocha -R spec" }, "dependencies": { - "debug": "~0.8.1", + "debug": "~1.0.2", "express": "~3.5.0", "strong-remoting": "~1.5.0", - "inflection": "~1.3.5", - "nodemailer": "~0.6.5", + "inflection": "~1.3.7", + "nodemailer": "~0.7.0", "ejs": "~1.0.0", - "bcryptjs": "~0.7.12", + "bcryptjs": "~1.0.3", "underscore.string": "~2.3.3", "underscore": "~1.6.0", "uid2": "0.0.3", @@ -50,23 +50,23 @@ "loopback-datasource-juggler": ">=1.4.0 <1.7.0", "mocha": "~1.20.1", "strong-task-emitter": "0.0.x", - "supertest": "~0.12.1", + "supertest": "~0.13.0", "chai": "~1.9.1", "loopback-testing": "~0.2.0", - "browserify": "~4.1.5", + "browserify": "~4.1.11", "grunt": "~0.4.5", "grunt-browserify": "~2.1.0", - "grunt-contrib-uglify": "~0.4.0", + "grunt-contrib-uglify": "~0.5.0", "grunt-contrib-jshint": "~0.10.0", "grunt-contrib-watch": "~0.6.1", "karma-script-launcher": "~0.1.0", - "karma-chrome-launcher": "~0.1.3", + "karma-chrome-launcher": "~0.1.4", "karma-firefox-launcher": "~0.1.3", "karma-html2js-preprocessor": "~0.1.0", "karma-phantomjs-launcher": "~0.1.4", "karma": "~0.12.16", - "karma-browserify": "~0.2.0", - "karma-mocha": "~0.1.3", + "karma-browserify": "~0.2.1", + "karma-mocha": "~0.1.4", "grunt-karma": "~0.8.3" }, "repository": { From 46af483bdd165963484d6d986fdd72bdd411dbd7 Mon Sep 17 00:00:00 2001 From: Karl Mikkelsen Date: Tue, 17 Jun 2014 16:27:41 +1000 Subject: [PATCH 5/7] Invalid Access Token return 401 Clean up logic to be easier to read. Signed-off-by: Karl Mikkelsen --- lib/middleware/token.js | 10 ++-------- lib/models/access-token.js | 4 +++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/middleware/token.js b/lib/middleware/token.js index 6087fd31..3bfff701 100644 --- a/lib/middleware/token.js +++ b/lib/middleware/token.js @@ -51,14 +51,8 @@ function token(options) { return function (req, res, next) { if (req.accessToken !== undefined) return next(); TokenModel.findForRequest(req, options, function(err, token) { - if(err) return next(err); - if(token) { - req.accessToken = token; - next(); - } else { - req.accessToken = null; - return next(); - } + req.accessToken = token || null; + next(err); }); } } diff --git a/lib/models/access-token.js b/lib/models/access-token.js index f5f66d20..15aaeb3b 100644 --- a/lib/models/access-token.js +++ b/lib/models/access-token.js @@ -133,7 +133,9 @@ AccessToken.findForRequest = function(req, options, cb) { } else if(isValid) { cb(null, token); } else { - cb(new Error('Invalid Access Token')); + var e = new Error('Invalid Access Token'); + e.status = e.statusCode = 401; + cb(e); } }); } else { From 3fba6c50f07d583e054735b0e0765752c806d852 Mon Sep 17 00:00:00 2001 From: Guilherme Cirne Date: Wed, 25 Jun 2014 16:37:30 -0300 Subject: [PATCH 6/7] Fix "ReferenceError: loopback is not defined" in registry.memory(). Signed-off-by: Guilherme Cirne --- lib/registry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/registry.js b/lib/registry.js index 1c48e24c..acbb7384 100644 --- a/lib/registry.js +++ b/lib/registry.js @@ -248,7 +248,7 @@ registry.memory = function (name) { if(!memory) { memory = this._memoryDataSources[name] = this.createDataSource({ - connector: loopback.Memory + connector: 'memory' }); } From 57060ec4c1d7ea89fad8b348cb4d2c0e3fa93d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Fri, 27 Jun 2014 10:25:47 +0200 Subject: [PATCH 7/7] v1.9.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f190c88..5e3756b2 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "mobile", "mBaaS" ], - "version": "1.9.0", + "version": "1.9.1", "scripts": { "test": "mocha -R spec" },