fix: correctly apply mergeWithLastSubmission for interactionFinished

panva · Jun 28, 2019 · eb67723 · eb67723
1 parent 0aa4e1c
commit eb67723
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/example/routes/express.js b/example/routes/express.js
@@ -118,6 +118,7 @@ module.exports = (app, provider) => {
       const account = await Account.findByLogin(req.body.login);
 
       const result = {
+        select_account: {}, // make sure its skipped by the interaction policy since we just logged in
         login: {
           account: account.accountId,
           ts: Math.floor(Date.now() / 1000),

diff --git a/example/routes/koa.js b/example/routes/koa.js
@@ -119,6 +119,7 @@ module.exports = (provider) => {
     const account = await Account.findByLogin(ctx.request.body.login);
 
     const result = {
+      select_account: {}, // make sure its skipped by the interaction policy since we just logged in
       login: {
         account: account.accountId,
         ts: Math.floor(Date.now() / 1000),
@@ -149,6 +150,7 @@ module.exports = (provider) => {
           const account = await Account.findByFederated('google', tokenset.claims());
 
           const result = {
+            select_account: {}, // make sure its skipped by the interaction policy since we just logged in
             login: {
               account: account.accountId,
               ts: Math.floor(Date.now() / 1000),

diff --git a/lib/provider.js b/lib/provider.js
@@ -194,7 +194,7 @@ class Provider extends events.EventEmitter {
    * @api public
    */
   async interactionFinished(req, res, result, { mergeWithLastSubmission = true } = {}) {
-    const returnTo = await this.interactionResult(req, res, result, mergeWithLastSubmission);
+    const returnTo = await this.interactionResult(req, res, result, { mergeWithLastSubmission });
 
     res.statusCode = 302; // eslint-disable-line no-param-reassign
     res.setHeader('Location', returnTo);