jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge auth.js into accesscontrol.js

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-05-01 13:34:46 -07:00
parent a545bdd574
commit 8c4015851a
4 changed files with 136 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/accesscontrol.js
+1 -2
View File
@@ -7,7 +7,6 @@ exports = module.exports = {
var accesscontrol = require('../accesscontrol.js'),
assert = require('assert'),
auth = require('../auth.js'),
debug = require('debug')('box:routes/accesscontrol'),
HttpError = require('connect-lastmile').HttpError,
passport = require('passport');
@@ -44,7 +43,7 @@ function websocketAuth(requestedScopes, req, res, next) {
if (typeof req.query.access_token !== 'string') return next(new HttpError(401, 'Unauthorized'));
auth.accessTokenAuth(req.query.access_token, function (error, user, info) {
accesscontrol.accessTokenAuth(req.query.access_token, function (error, user, info) {
if (error) return next(new HttpError(500, error.message));
if (!user) return next(new HttpError(401, 'Unauthorized'));