Renamed "data" to "socket", updated deps
This commit is contained in:
		
							
								
								
									
										24
									
								
								lib/index.js
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								lib/index.js
									
									
									
									
									
								
							| @@ -112,15 +112,15 @@ function authorize(options, onConnection) { | ||||
|   } | ||||
|  | ||||
|   var defaults = { | ||||
|     success: function(data, accept){ | ||||
|       if (data.request) { | ||||
|     success: function(socket, accept){ | ||||
|       if (socket.request) { | ||||
|         accept(); | ||||
|       } else { | ||||
|         accept(null, true); | ||||
|       } | ||||
|     }, | ||||
|     fail: function(error, data, accept){ | ||||
|       if (data.request) { | ||||
|     fail: function(error, socket, accept){ | ||||
|       if (socket.request) { | ||||
|         accept(error); | ||||
|       } else { | ||||
|         accept(null, false); | ||||
| @@ -130,9 +130,9 @@ function authorize(options, onConnection) { | ||||
|  | ||||
|   var auth = xtend(defaults, options); | ||||
|  | ||||
|   return function(data, accept){ | ||||
|   return function(socket, accept){ | ||||
|     var token, error; | ||||
|     var req = data.request || data; | ||||
|     var req = socket.request || socket; | ||||
|     var authorization_header = (req.headers || {}).authorization; | ||||
|  | ||||
|     if (authorization_header) { | ||||
| @@ -148,7 +148,7 @@ function authorize(options, onConnection) { | ||||
|         error = new UnauthorizedError('credentials_bad_format', { | ||||
|           message: 'Format is Authorization: Bearer [token]' | ||||
|         }); | ||||
|         return auth.fail(error, data, accept); | ||||
|         return auth.fail(error, socket, accept); | ||||
|       } | ||||
|     } | ||||
|  | ||||
| @@ -164,25 +164,25 @@ function authorize(options, onConnection) { | ||||
|       error = new UnauthorizedError('credentials_required', { | ||||
|         message: 'No Authorization header was found' | ||||
|       }); | ||||
|       return auth.fail(error, data, accept); | ||||
|       return auth.fail(error, socket, accept); | ||||
|     } | ||||
|  | ||||
|     var onJwtVerificationReady = function(err, decoded) { | ||||
|  | ||||
|       if (err) { | ||||
|         error = new UnauthorizedError(err.code || 'invalid_token', err); | ||||
|         return auth.fail(error, data, accept); | ||||
|         return auth.fail(error, socket, accept); | ||||
|       } | ||||
|  | ||||
|       data[options.decodedPropertyName] = decoded; | ||||
|       socket[options.decodedPropertyName] = decoded; | ||||
|  | ||||
|       return auth.success(data, accept); | ||||
|       return auth.success(socket, accept); | ||||
|     }; | ||||
|  | ||||
|     var onSecretReady = function(err, secret) { | ||||
|       if (err) { | ||||
|         error = new UnauthorizedError(err.code || 'invalid_secret', err); | ||||
|         return auth.fail(error, data, accept); | ||||
|         return auth.fail(error, socket, accept); | ||||
|       } | ||||
|  | ||||
|       jwt.verify(token, secret, options, onJwtVerificationReady); | ||||
|   | ||||
							
								
								
									
										21
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								package.json
									
									
									
									
									
								
							| @@ -22,19 +22,18 @@ | ||||
|   }, | ||||
|   "license": "MIT", | ||||
|   "dependencies": { | ||||
|     "jsonwebtoken": "^5.0.0", | ||||
|     "xtend": "~2.1.2" | ||||
|     "jsonwebtoken": "^7.3.0", | ||||
|     "xtend": "~4.0.1" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "body-parser": "~1.13.3", | ||||
|     "express": "~4.10.6", | ||||
|     "mocha": "~1.17.0", | ||||
|     "passport-local": "~0.1.6", | ||||
|     "request": "~2.19.0", | ||||
|     "serve-static": "^1.7.1", | ||||
|     "body-parser": "~1.17.1", | ||||
|     "express": "~4.15.2", | ||||
|     "mocha": "~3.2.0", | ||||
|     "request": "~2.81.0", | ||||
|     "serve-static": "^1.12.1", | ||||
|     "server-destroy": "~1.0.1", | ||||
|     "should": "~1.2.2", | ||||
|     "socket.io": "^1.0.4", | ||||
|     "socket.io-client": "^1.0.4" | ||||
|     "should": "~11.2.1", | ||||
|     "socket.io": "^1.7.3", | ||||
|     "socket.io-client": "^1.7.3" | ||||
|   } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user