Skip to content
This repository was archived by the owner on Mar 22, 2022. It is now read-only.

Commit ec64bea

Browse files
Rolanddaffl
authored andcommitted
Options merged (#611)
* Options merged * Fix merging order
1 parent b103639 commit ec64bea

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

lib/socket/handler.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
const Debug = require('debug');
22
const ms = require('ms');
33

4+
const merge = require('lodash.merge');
5+
46
const {
57
normalizeError
68
} = require('@feathersjs/socket-commons/lib/utils');
@@ -79,7 +81,7 @@ module.exports = function setupSocketHandler (app, options, { feathersParams, pr
7981
cookies: {}
8082
}, feathersParams(socket));
8183

82-
const strategyOptions = app.passport.options(strategy);
84+
const strategyOptions = merge({}, options, app.passport.options(strategy));
8385

8486
const promise = service.create(data, socket._feathers)
8587
.then(tokens => {

0 commit comments

Comments
 (0)