@@ -14,10 +14,10 @@ function Strategy(options = {}) {
14
14
// Inherits from Passport Strategy
15
15
util . inherits ( Strategy , passport . Strategy ) ;
16
16
17
- function reqParamFromQuery ( paramName , request ) {
17
+ function reqParamFromQuery ( paramName , req ) {
18
18
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 ] ;
21
21
}
22
22
return token ;
23
23
}
@@ -33,42 +33,40 @@ Strategy.prototype.authenticate = function authenticate(req) {
33
33
return self . fail ( new Error ( 'No auth token' ) ) ;
34
34
}
35
35
36
- // Save token in session
37
-
38
- const verified = function ( err , user , info ) {
36
+ function verified ( err , user , info ) {
39
37
if ( err ) {
40
38
return self . error ( err ) ;
41
39
}
42
40
if ( ! user ) {
43
41
return self . fail ( info ) ;
44
42
}
45
43
return self . success ( user , info ) ;
46
- } ;
44
+ }
47
45
48
46
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 ) ;
52
50
}
53
51
} ;
54
52
55
53
/**
56
54
* Verify using Control Tower gateway
57
55
*/
58
- Strategy . prototype . verify = function verify ( token , done ) {
56
+ Strategy . prototype . verify = function verify ( userToken , done ) {
59
57
request ( `${ this . controlTowerUrl } /auth/check-logged` )
60
- . set ( 'Authorization' , `Bearer ${ token } ` )
58
+ . set ( 'Authorization' , `Bearer ${ userToken } ` )
61
59
. end ( ( err , res ) => {
62
60
if ( err ) {
63
61
done ( err , null , 'User unathorized' ) ;
64
62
} else {
65
- const user = Object . assign ( { } , res . body , { token : token } ) ;
63
+ const user = Object . assign ( { } , res . body , { token : userToken } ) ;
66
64
done ( null , user , 'User authenticated correctly' ) ;
67
65
}
68
66
} ) ;
69
67
} ;
70
68
71
- Strategy . prototype . login = function ( req , res ) {
69
+ Strategy . prototype . login = function login ( req , res ) {
72
70
res . redirect ( `${ this . controlTowerUrl } /auth?callbackUrl=${ this . callbackUrl } &token=true` ) ;
73
71
} ;
74
72
0 commit comments