Skip to content

Commit 763ab01

Browse files
author
David Inga
committed
test passed
1 parent 8778a0d commit 763ab01

File tree

3 files changed

+3015
-14
lines changed

3 files changed

+3015
-14
lines changed

Diff for: .eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules
2+
examples

Diff for: lib/auth.js

+12-14
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ function Strategy(options = {}) {
1414
// Inherits from Passport Strategy
1515
util.inherits(Strategy, passport.Strategy);
1616

17-
function reqParamFromQuery(paramName, request) {
17+
function reqParamFromQuery(paramName, req) {
1818
let token = null;
19-
if (request.query && Object.prototype.hasOwnProperty.call(request.query, paramName)) {
20-
token = request.query[paramName];
19+
if (req.query && Object.prototype.hasOwnProperty.call(req.query, paramName)) {
20+
token = req.query[paramName];
2121
}
2222
return token;
2323
}
@@ -33,42 +33,40 @@ Strategy.prototype.authenticate = function authenticate(req) {
3333
return self.fail(new Error('No auth token'));
3434
}
3535

36-
// Save token in session
37-
38-
const verified = function(err, user, info) {
36+
function verified(err, user, info) {
3937
if (err) {
4038
return self.error(err);
4139
}
4240
if (!user) {
4341
return self.fail(info);
4442
}
4543
return self.success(user, info);
46-
};
44+
}
4745

4846
try {
49-
self.verify(token, verified);
50-
} catch(ex) {
51-
self.error(ex);
47+
return self.verify(token, verified);
48+
} catch (ex) {
49+
return self.error(ex);
5250
}
5351
};
5452

5553
/**
5654
* Verify using Control Tower gateway
5755
*/
58-
Strategy.prototype.verify = function verify(token, done) {
56+
Strategy.prototype.verify = function verify(userToken, done) {
5957
request(`${this.controlTowerUrl}/auth/check-logged`)
60-
.set('Authorization', `Bearer ${token}`)
58+
.set('Authorization', `Bearer ${userToken}`)
6159
.end((err, res) => {
6260
if (err) {
6361
done(err, null, 'User unathorized');
6462
} else {
65-
const user = Object.assign({}, res.body, { token: token });
63+
const user = Object.assign({}, res.body, { token: userToken });
6664
done(null, user, 'User authenticated correctly');
6765
}
6866
});
6967
};
7068

71-
Strategy.prototype.login = function(req, res) {
69+
Strategy.prototype.login = function login(req, res) {
7270
res.redirect(`${this.controlTowerUrl}/auth?callbackUrl=${this.callbackUrl}&token=true`);
7371
};
7472

0 commit comments

Comments
 (0)