Skip to content

Commit a2317e0

Browse files
author
Tom Kirkpatrick
committed
style: fix eslint issues
1 parent 8f70ad2 commit a2317e0

File tree

17 files changed

+636
-632
lines changed

17 files changed

+636
-632
lines changed

lib/index.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1-
'use strict';
1+
'use strict'
22

3-
const debug = require('debug')('loopback:component:access');
4-
const AccessUtils = require('./utils');
5-
const accessLogger = require('./middleware/access-logger');
6-
const userContext = require('./middleware/user-context');
3+
const debug = require('debug')('loopback:component:access')
4+
const AccessUtils = require('./utils')
5+
const accessLogger = require('./middleware/access-logger')
6+
const userContext = require('./middleware/user-context')
77

88
module.exports = function loopbackComponentAccess(app, options) {
9-
debug('initializing component');
10-
const loopback = app.loopback;
11-
const loopbackMajor = loopback && loopback.version &&
12-
loopback.version.split('.')[0] || 1;
9+
debug('initializing component')
10+
const { loopback } = app
11+
const loopbackMajor = (loopback && loopback.version && loopback.version.split('.')[0]) || 1
1312

1413
if (loopbackMajor < 2) {
15-
throw new Error('loopback-component-access-groups requires loopback 2.0 or newer');
14+
throw new Error('loopback-component-access-groups requires loopback 2.0 or newer')
1615
}
1716

1817
// Initialize middleware
19-
app.middleware('auth:after', userContext());
20-
app.middleware('routes:before', accessLogger());
18+
app.middleware('auth:after', userContext())
19+
app.middleware('routes:before', accessLogger())
2120

2221
// Initialise helper class.
23-
const accessUtils = new AccessUtils(app, options);
22+
const accessUtils = new AccessUtils(app, options)
2423

25-
app.accessUtils = accessUtils;
24+
app.accessUtils = accessUtils
2625

2726
// Set up role resolvers.
28-
accessUtils.setupRoleResolvers();
27+
accessUtils.setupRoleResolvers()
2928

3029
// Set up model opertion hooks.
3130
if (options.applyToStatic) {
32-
accessUtils.setupFilters();
31+
accessUtils.setupFilters()
3332
}
3433

3534
// TODO: Create Group Access model automatically if one hasn't been specified
36-
};
35+
}

lib/middleware/access-logger.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
'use strict';
1+
'use strict'
22

3-
const debug = require('debug')('loopback:component:access:logger');
3+
const debug = require('debug')('loopback:component:access:logger')
44

55
module.exports = function accessLoggerMiddleware() {
6-
debug('initializing access logger middleware');
6+
debug('initializing access logger middleware')
77
return function accessLogger(req, res, next) {
88
if (req.accessToken) {
9-
debug('req: %s %s, token: %o', req.method, req.originalUrl, req.accessToken);
9+
debug('req: %s %s, token: %o', req.method, req.originalUrl, req.accessToken)
1010
}
1111
else {
12-
debug('req', req.method, req.originalUrl);
12+
debug('req', req.method, req.originalUrl)
1313
}
1414

15-
const start = new Date();
15+
const start = new Date()
1616

1717
if (res._responseTime) {
18-
return next();
18+
return next()
1919
}
20-
res._responseTime = true;
20+
res._responseTime = true
2121

2222
// install a listener for when the response is finished
2323
res.on('finish', () => {
2424
// the request was handled, print the log entry
25-
const duration = new Date() - start;
25+
const duration = new Date() - start
2626

2727
debug('res %s %s: %o', req.method, req.originalUrl, {
2828
lbHttpMethod: req.method,
2929
lbUrl: req.originalUrl,
3030
lbStatusCode: res.statusCode,
3131
lbResponseTime: duration,
32-
lbResponseTimeUnit: 'ms'
32+
lbResponseTimeUnit: 'ms',
3333
}
34-
);
35-
});
34+
)
35+
})
3636

37-
return next();
38-
};
39-
};
37+
return next()
38+
}
39+
}

lib/middleware/user-context.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
'use strict';
1+
'use strict'
22

3-
const debug = require('debug')('loopback:component:access:context');
4-
const loopback = require('loopback');
5-
const Promise = require('bluebird');
3+
const debug = require('debug')('loopback:component:access:context')
4+
const loopback = require('loopback')
5+
const Promise = require('bluebird')
66

77
module.exports = function userContextMiddleware() {
8-
debug('initializing user context middleware');
8+
debug('initializing user context middleware')
99
// set current user to enable user access for remote methods
1010
return function userContext(req, res, next) {
11-
const loopbackContext = loopback.getCurrentContext();
11+
const loopbackContext = loopback.getCurrentContext()
1212

1313
if (!loopbackContext) {
14-
debug('No user context (loopback current context not found)');
15-
return next();
14+
debug('No user context (loopback current context not found)')
15+
return next()
1616
}
1717

1818
if (!req.accessToken) {
19-
debug('No user context (access token not found)');
20-
return next();
19+
debug('No user context (access token not found)')
20+
return next()
2121
}
2222

23-
loopbackContext.set('accessToken', req.accessToken.id);
24-
const app = req.app;
25-
const UserModel = app.accessUtils.options.userModel || 'User';
23+
loopbackContext.set('accessToken', req.accessToken.id)
24+
const { app } = req
25+
const UserModel = app.accessUtils.options.userModel || 'User'
2626

2727
return Promise.join(
2828
app.models[UserModel].findById(req.accessToken.userId),
2929
app.accessUtils.getUserGroups(req.accessToken.userId),
3030
(user, groups) => {
3131
if (!user) {
32-
return next(new Error('No user with this access token was found.'));
32+
return next(new Error('No user with this access token was found.'))
3333
}
34-
loopbackContext.set('currentUser', user);
35-
loopbackContext.set('currentUserGroups', groups);
36-
debug('currentUser', user);
37-
debug('currentUserGroups', groups);
38-
return next();
34+
loopbackContext.set('currentUser', user)
35+
loopbackContext.set('currentUserGroups', groups)
36+
debug('currentUser', user)
37+
debug('currentUserGroups', groups)
38+
return next()
3939
})
40-
.catch(next);
41-
};
42-
};
40+
.catch(next)
41+
}
42+
}

lib/mixins/get-current-user.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
'use strict';
1+
'use strict'
22

3-
const loopback = require('loopback');
4-
const debug = require('debug')('loopback:component:access:utils');
3+
const loopback = require('loopback')
4+
const debug = require('debug')('loopback:component:access:utils')
55

66
module.exports = function getCurrentUserMixin(Model) {
7-
debug('initializing GetCurrentUser Mixin for model %s', Model.modelName);
7+
debug('initializing GetCurrentUser Mixin for model %s', Model.modelName)
88

99
Model.getCurrentUser = function getCurrentUser() {
10-
const ctx = loopback.getCurrentContext();
11-
const currentUser = ctx && ctx.get('currentUser') || null;
10+
const ctx = loopback.getCurrentContext()
11+
const currentUser = (ctx && ctx.get('currentUser')) || null
1212

1313
if (ctx) {
14-
debug(`${Model.definition.name}.getCurrentUser() - currentUser: %o`, currentUser);
14+
debug(`${Model.definition.name}.getCurrentUser() - currentUser: %o`, currentUser)
1515
}
1616
else {
1717
// this means its a server-side logic call w/o any HTTP req/resp aspect to it.
18-
debug(`${Model.definition.name}.getCurrentUser() - no loopback context`);
18+
debug(`${Model.definition.name}.getCurrentUser() - no loopback context`)
1919
}
2020

21-
return currentUser;
22-
};
23-
};
21+
return currentUser
22+
}
23+
}

0 commit comments

Comments
 (0)