Skip to content

Commit 635a30a

Browse files
committed
update dependencies
1 parent 2fbbc02 commit 635a30a

4 files changed

Lines changed: 23 additions & 23 deletions

File tree

api/services/authentication/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import local from 'feathers-authentication-local';
44
// import oauth1 from 'feathers-authentication-oauth1';
55
import oauth2 from 'feathers-authentication-oauth2';
66
import FacebookTokenStrategy from 'passport-facebook-token';
7-
import hooks from 'feathers-hooks-common';
7+
import { discard } from 'feathers-hooks-common';
88
import { verifyJWT } from 'feathers-authentication/lib/utils';
99

1010
export socketAuth from './socketAuth';
@@ -70,7 +70,7 @@ export default function authenticationService() {
7070
after: {
7171
create: [
7272
populateUser(config),
73-
hooks.remove('user.password'),
73+
discard('user.password'),
7474
addTokenExpiration(),
7575
restToSocketAuth()
7676
]

api/services/messages/hooks.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import hooks from 'feathers-hooks-common';
1+
import { disallow, discard, populate } from 'feathers-hooks-common';
22
import auth from 'feathers-authentication';
33
import { required } from 'utils/validation';
44
import { validateHook as validate } from 'hooks';
@@ -8,7 +8,7 @@ const schemaValidator = {
88
};
99

1010
function populateUser() {
11-
return hooks.populate({
11+
return populate({
1212
schema: {
1313
include: [{
1414
nameAs: 'sentBy',
@@ -35,23 +35,23 @@ const messagesHooks = {
3535
};
3636
}
3737
],
38-
update: hooks.disable(),
39-
patch: hooks.disable(),
40-
remove: hooks.disable()
38+
update: disallow(),
39+
patch: disallow(),
40+
remove: disallow()
4141
},
4242
after: {
4343
all: [],
4444
find: [
4545
populateUser(),
46-
hooks.remove('sentBy.password')
46+
discard('sentBy.password')
4747
],
4848
get: [
4949
populateUser(),
50-
hooks.remove('sentBy.password')
50+
discard('sentBy.password')
5151
],
5252
create: [
5353
populateUser(),
54-
hooks.remove('sentBy.password')
54+
discard('sentBy.password')
5555
],
5656
update: [],
5757
patch: [],

api/services/users/hooks.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import hooks from 'feathers-hooks-common';
1+
import { discard, iff, isProvider } from 'feathers-hooks-common';
22
import auth from 'feathers-authentication';
33
import local from 'feathers-authentication-local';
44
import errors from 'feathers-errors';
@@ -26,7 +26,7 @@ const userHooks = {
2626
get: auth.hooks.authenticate('jwt'),
2727
create: [
2828
validate(),
29-
hooks.remove('password_confirmation'),
29+
discard('password_confirmation'),
3030
local.hooks.hashPassword()
3131
],
3232
update: [
@@ -43,7 +43,7 @@ const userHooks = {
4343
]
4444
},
4545
after: {
46-
all: hooks.remove('password'),
46+
all: iff(isProvider('external'), discard('password')),
4747
find: [],
4848
get: [],
4949
create: [],

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@
123123
"feathers-authentication-oauth2": "^0.2.3",
124124
"feathers-errors": "^2.5.0",
125125
"feathers-hooks": "^2.0.1",
126-
"feathers-hooks-common": "^2.0.3",
126+
"feathers-hooks-common": "^3.3.2",
127127
"feathers-nedb": "^2.6.0",
128128
"feathers-rest": "^1.6.0",
129-
"feathers-socketio": "^1.4.2",
129+
"feathers-socketio": "^2.0.0",
130130
"http-proxy": "^1.16.2",
131131
"is-promise": "^2.1.0",
132132
"js-cookie": "^2.1.3",
@@ -156,14 +156,14 @@
156156
"redux-persist": "^4.4.0",
157157
"serialize-javascript": "^1.3.0",
158158
"serve-favicon": "^2.3.2",
159-
"socket.io": "^1.7.3",
160-
"socket.io-client": "^1.7.3",
159+
"socket.io": "^2.0.1",
160+
"socket.io-client": "^2.0.1",
161161
"superagent": "^3.4.4"
162162
},
163163
"devDependencies": {
164164
"autoprefixer-loader": "^3.2.0",
165165
"babel-eslint": "^7.1.1",
166-
"babel-jest": "^19.0.0",
166+
"babel-jest": "^20.0.1",
167167
"babel-loader": "^7.0.0",
168168
"better-npm-run": "^0.0.15",
169169
"bootstrap-loader": "^2.1.0",
@@ -176,16 +176,16 @@
176176
"eslint-config-airbnb": "^14.1.0",
177177
"eslint-loader": "^1.6.1",
178178
"eslint-plugin-import": "^2.2.0",
179-
"eslint-plugin-jsx-a11y": "^4.0.0",
180-
"eslint-plugin-react": "^6.10.0",
179+
"eslint-plugin-jsx-a11y": "^5.0.1",
180+
"eslint-plugin-react": "^7.0.0",
181181
"extract-text-webpack-plugin": "2.1.0",
182182
"file-loader": "^0.11.1",
183183
"font-awesome": "^4.7.0",
184-
"font-awesome-webpack": "^0.0.4",
184+
"font-awesome-webpack": "^0.0.5-beta.2",
185185
"happypack": "^3.0.2",
186186
"html-webpack-plugin": "^2.28.0",
187-
"jest": "^19.0.2",
188-
"jest-cli": "^19.0.2",
187+
"jest": "^20.0.1",
188+
"jest-cli": "^20.0.1",
189189
"karma": "^1.4.1",
190190
"karma-cli": "^1.0.1",
191191
"karma-mocha": "^1.3.0",

0 commit comments

Comments
 (0)