feathers-authentication
Advanced tools
Comparing version 1.2.7 to 1.3.0
@@ -61,3 +61,3 @@ // TODO: don't have the defs from the hooks PR yet, fix later | ||
*/ | ||
verifyToken(options?): Hook; | ||
verifyToken(options?:any): Hook; | ||
/** | ||
@@ -70,3 +70,3 @@ * The populateUser hook is for populating a user based on an id. | ||
*/ | ||
populateUser(options?): Hook; | ||
populateUser(options?:any): Hook; | ||
@@ -73,0 +73,0 @@ /** |
@@ -32,14 +32,12 @@ 'use strict'; | ||
if ('' + entityId === '' + socketEntityId) { | ||
(function () { | ||
// Need to assign because of external references | ||
Object.assign(socketEntity, entity); | ||
// Need to assign because of external references | ||
Object.assign(socketEntity, entity); | ||
// Delete any removed entity properties | ||
var entityProps = new Set(Object.keys(entity)); | ||
Object.keys(socketEntity).filter(function (prop) { | ||
return !entityProps.has(prop); | ||
}).forEach(function (prop) { | ||
return delete socketEntity[prop]; | ||
}); | ||
})(); | ||
// Delete any removed entity properties | ||
var entityProps = new Set(Object.keys(entity)); | ||
Object.keys(socketEntity).filter(function (prop) { | ||
return !entityProps.has(prop); | ||
}).forEach(function (prop) { | ||
return delete socketEntity[prop]; | ||
}); | ||
} | ||
@@ -46,0 +44,0 @@ } |
@@ -13,10 +13,18 @@ 'use strict'; | ||
var _lodash = require('lodash.pick'); | ||
var _v = require('uuid/v4'); | ||
var _v2 = _interopRequireDefault(_v); | ||
var _lodash = require('lodash.merge'); | ||
var _lodash2 = _interopRequireDefault(_lodash); | ||
var _lodash3 = require('lodash.omit'); | ||
var _lodash3 = require('lodash.pick'); | ||
var _lodash4 = _interopRequireDefault(_lodash3); | ||
var _lodash5 = require('lodash.omit'); | ||
var _lodash6 = _interopRequireDefault(_lodash5); | ||
var _jsonwebtoken = require('jsonwebtoken'); | ||
@@ -35,3 +43,3 @@ | ||
var VALID_KEYS = ['algorithm', 'expiresIn', 'notBefore', 'audience', 'issuer', 'jwtid', 'subject', 'noTimestamp', 'header', 'exp', 'nbf', 'aud', 'sub', 'iss']; | ||
var settings = Object.assign({}, options.jwt); | ||
var settings = (0, _lodash2.default)({ jwtid: (0, _v2.default)() }, options.jwt); | ||
var secret = options.secret; | ||
@@ -48,3 +56,3 @@ | ||
// TODO (EK): Support jwtids. Maybe auto-generate a uuid | ||
_jsonwebtoken2.default.sign((0, _lodash4.default)(payload, VALID_KEYS), secret, (0, _lodash2.default)(settings, VALID_KEYS), function (error, token) { | ||
_jsonwebtoken2.default.sign((0, _lodash6.default)(payload, VALID_KEYS), secret, (0, _lodash4.default)(settings, VALID_KEYS), function (error, token) { | ||
if (error) { | ||
@@ -65,3 +73,3 @@ debug('Error signing JWT', error); | ||
var VALID_KEYS = ['algorithms', 'audience', 'issuer', 'ignoreExpiration', 'ignoreNotBefore', 'subject', 'clockTolerance']; | ||
var settings = Object.assign({}, options.jwt); | ||
var settings = (0, _lodash2.default)({}, options.jwt); | ||
var secret = options.secret; | ||
@@ -86,3 +94,3 @@ | ||
debug('Verifying token', token); | ||
_jsonwebtoken2.default.verify(token, secret, (0, _lodash2.default)(settings, VALID_KEYS), function (error, payload) { | ||
_jsonwebtoken2.default.verify(token, secret, (0, _lodash4.default)(settings, VALID_KEYS), function (error, payload) { | ||
if (error) { | ||
@@ -89,0 +97,0 @@ debug('Error verifying token', error); |
{ | ||
"name": "feathers-authentication", | ||
"description": "Add Authentication to your FeathersJS app.", | ||
"version": "1.2.7", | ||
"version": "1.3.0", | ||
"homepage": "https://github.com/feathersjs/feathers-authentication", | ||
@@ -58,3 +58,3 @@ "main": "lib/", | ||
"dependencies": { | ||
"debug": "^2.2.0", | ||
"debug": "^3.1.0", | ||
"feathers-authentication-client": "^0.3.1", | ||
@@ -64,3 +64,3 @@ "feathers-commons": "^0.8.4", | ||
"feathers-socket-commons": "^2.3.1", | ||
"jsonwebtoken": "^7.1.9", | ||
"jsonwebtoken": "^8.0.0", | ||
"lodash.clone": "^4.5.0", | ||
@@ -72,3 +72,4 @@ "lodash.merge": "^4.6.0", | ||
"ms": "^2.0.0", | ||
"passport": "^0.3.2" | ||
"passport": "^0.4.0", | ||
"uuid": "^3.1.0" | ||
}, | ||
@@ -79,5 +80,7 @@ "devDependencies": { | ||
"babel-plugin-add-module-exports": "^0.2.0", | ||
"babel-polyfill": "^6.26.0", | ||
"babel-preset-es2015": "^6.14.0", | ||
"body-parser": "^1.15.2", | ||
"chai": "^3.5.0", | ||
"chai": "^4.1.0", | ||
"chai-uuid": "^1.0.6", | ||
"feathers": "^2.0.2", | ||
@@ -95,3 +98,3 @@ "feathers-authentication-jwt": "^0.3.0", | ||
"localstorage-memory": "^1.0.2", | ||
"mocha": "^3.0.2", | ||
"mocha": "^4.0.0", | ||
"mongodb": "^2.2.29", | ||
@@ -103,8 +106,8 @@ "nsp": "^2.6.1", | ||
"semistandard": "^11.0.0", | ||
"sinon": "^2.1.0", | ||
"sinon": "^4.0.0", | ||
"sinon-chai": "^2.8.0", | ||
"socket.io-client": "^2.0.0", | ||
"superagent": "^3.0.0", | ||
"ws": "^2.2.3" | ||
"ws": "^3.1.0" | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
156011
14
32
33
1197
+ Addeduuid@^3.1.0
+ Addedjsonwebtoken@8.5.1(transitive)
+ Addedlodash.includes@4.3.0(transitive)
+ Addedlodash.isboolean@3.0.3(transitive)
+ Addedlodash.isinteger@4.0.4(transitive)
+ Addedlodash.isnumber@3.0.3(transitive)
+ Addedlodash.isplainobject@4.0.6(transitive)
+ Addedlodash.isstring@4.0.1(transitive)
+ Addedpassport@0.4.1(transitive)
+ Addedsemver@5.7.2(transitive)
+ Addeduuid@3.4.0(transitive)
- Removedhoek@2.16.3(transitive)
- Removedisemail@1.2.0(transitive)
- Removedjoi@6.10.1(transitive)
- Removedjsonwebtoken@7.4.3(transitive)
- Removedmoment@2.30.1(transitive)
- Removedpassport@0.3.2(transitive)
- Removedtopo@1.1.0(transitive)
- Removedxtend@4.0.2(transitive)
Updateddebug@^3.1.0
Updatedjsonwebtoken@^8.0.0
Updatedpassport@^0.4.0