Skip to content

Commit 870bddb

Browse files
committed
Remove legacy express 3.x middleware getters
Remove middleware-getter properties that were simlifying upgrade from LoopBack 1.x/Express 3.x applications: - loopback.compress - loopback.timeout - loopback.cookieParser - loopback.cookieSession - loopback.csrf - loopback.errorHandler - loopback.session - loopback.methodOverride - loopback.logger - loopback.responseTime - loopback.favicon - loopback.directory - loopback.vhost Also remove `loopback.mime`, which was set to `undefined` anyways.
1 parent 70cec07 commit 870bddb

6 files changed

Lines changed: 10 additions & 95 deletions

File tree

lib/express-middleware.js

Lines changed: 0 additions & 57 deletions
This file was deleted.

lib/loopback.js

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ var juggler = require('loopback-datasource-juggler');
2929
* ```
3030
*
3131
* @property {String} version Version of LoopBack framework. Static read-only property.
32-
* @property {String} mime
3332
* @property {Boolean} isBrowser True if running in a browser environment; false otherwise. Static read-only property.
3433
* @property {Boolean} isServer True if running in a server environment; false otherwise. Static read-only property.
3534
* @property {Registry} registry The global `Registry` object.
@@ -47,12 +46,6 @@ var loopback = module.exports = createApplication;
4746

4847
loopback.version = require('../package.json').version;
4948

50-
/*!
51-
* Expose mime.
52-
*/
53-
54-
loopback.mime = express.mime;
55-
5649
loopback.registry = new Registry();
5750

5851
Object.defineProperties(loopback, {
@@ -128,23 +121,11 @@ function mixin(source) {
128121
mixin(require('./runtime'));
129122

130123
/*!
131-
* Expose static express methods like `express.errorHandler`.
124+
* Expose static express methods like `express.Router`.
132125
*/
133126

134127
mixin(express);
135128

136-
/*!
137-
* Expose additional middleware like session as loopback.*
138-
* This will keep the loopback API compatible with express 3.x
139-
*
140-
* ***only in node***
141-
*/
142-
143-
if (loopback.isServer) {
144-
var middlewares = require('./express-middleware');
145-
mixin(middlewares);
146-
}
147-
148129
/*!
149130
* Expose additional loopback middleware
150131
* for example `loopback.configure` etc.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"body-parser": "^1.12.0",
4242
"canonical-json": "0.0.4",
4343
"continuation-local-storage": "^3.1.3",
44-
"cookie-parser": "^1.3.4",
4544
"debug": "^2.1.2",
4645
"depd": "^1.0.0",
4746
"ejs": "^2.3.1",
@@ -62,6 +61,7 @@
6261
"devDependencies": {
6362
"browserify": "^10.0.0",
6463
"chai": "^2.1.1",
64+
"cookie-parser": "^1.3.4",
6565
"es5-shim": "^4.1.0",
6666
"eslint-config-loopback": "^1.0.0",
6767
"grunt": "^0.4.5",

server/middleware/favicon.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
var favicon = require('serve-favicon');
7+
68
/**
79
* Serve the LoopBack favicon.
810
* @header loopback.favicon()
911
*/
10-
module.exports = require('../../lib/express-middleware').favicon;
12+
module.exports = function(icon, options) {
13+
icon = icon || path.join(__dirname, '../favicon.ico');
14+
return favicon(icon, options);
15+
};

test/access-token.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// This file is licensed under the MIT License.
44
// License text available at https://opensource.org/licenses/MIT
55

6+
var cookieParser = require('cookie-parser');
67
var loopback = require('../');
78
var extend = require('util')._extend;
89
var Token = loopback.AccessToken.extend('MyToken');
@@ -500,7 +501,7 @@ function createTestApp(testToken, settings, done) {
500501

501502
var app = loopback();
502503

503-
app.use(loopback.cookieParser('secret'));
504+
app.use(cookieParser('secret'));
504505
app.use(loopback.token(tokenSettings));
505506
app.get('/token', function(req, res) {
506507
res.cookie('authorization', testToken.id, { signed: true });

test/loopback.test.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,13 @@ describe('loopback', function() {
5858
'ValidationError',
5959
'application',
6060
'arguments',
61-
'bodyParser',
6261
'caller',
63-
'compress',
6462
'configureModel',
6563
'context',
66-
'cookieParser',
67-
'cookieSession',
6864
'createContext',
6965
'createDataSource',
7066
'createModel',
71-
'csrf',
7267
'defaultDataSources',
73-
'directory',
7468
'errorHandler',
7569
'favicon',
7670
'faviconFile',
@@ -80,12 +74,8 @@ describe('loopback', function() {
8074
'getModelByType',
8175
'isBrowser',
8276
'isServer',
83-
'json',
8477
'length',
85-
'logger',
8678
'memory',
87-
'methodOverride',
88-
'mime',
8979
'modelBuilder',
9080
'name',
9181
'prototype',
@@ -94,19 +84,14 @@ describe('loopback', function() {
9484
'remoteMethod',
9585
'request',
9686
'response',
97-
'responseTime',
9887
'rest',
9988
'runInContext',
100-
'session',
10189
'static',
10290
'status',
10391
'template',
104-
'timeout',
10592
'token',
10693
'urlNotFound',
107-
'urlencoded',
10894
'version',
109-
'vhost',
11095
];
11196

11297
var actual = Object.getOwnPropertyNames(loopback);

0 commit comments

Comments
 (0)