From c6b62fc7ab975db8718aeba3507dab2110f4431a Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Sun, 20 May 2018 13:40:15 +0530
Subject: [PATCH] fix: add user object to Observables

---
 common/models/User-Identity.js | 7 ++++---
 server/component-passport.js   | 2 +-
 server/passport-providers.js   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/models/User-Identity.js b/common/models/User-Identity.js
index 0a716a75e7..eeaa59f6a6 100644
--- a/common/models/User-Identity.js
+++ b/common/models/User-Identity.js
@@ -14,7 +14,6 @@ import { wrapHandledError } from '../../server/utils/create-handled-error.js';
 export default function(UserIdent) {
   UserIdent.on('dataSourceAttached', () => {
     UserIdent.findOne$ = observeMethod(UserIdent, 'findOne');
-    UserIdent.create$ = observeMethod(UserIdent, 'create');
   });
   // original source
   // github.com/strongloop/loopback-component-passport
@@ -65,6 +64,7 @@ export default function(UserIdent) {
         );
 
     } else {
+
       return UserIdent.findOne$(query)
         .flatMap(identity => {
           if (!identity) {
@@ -76,7 +76,7 @@ export default function(UserIdent) {
                   Please create an account below
                 `,
                 type: 'info',
-                redirectTo: '/deprecated-signup'
+                redirectTo: '/signup'
               }
             );
           }
@@ -96,7 +96,7 @@ export default function(UserIdent) {
                   new Error('user identity is not associated with a user'),
                   {
                     type: 'info',
-                    redirectTo: '/deprecated-signup',
+                    redirectTo: '/signup',
                     message: dedent`
     The user account associated with the ${provider} user ${username || 'Anon'}
     no longer exists.
@@ -131,6 +131,7 @@ export default function(UserIdent) {
             }
           );
           return Observable.combineLatest(
+            Observable.of(user),
             updateIdentity,
             createToken,
             (user, identity, token) => ({ user, identity, token })
diff --git a/server/component-passport.js b/server/component-passport.js
index 788dfe865e..63104737ff 100644
--- a/server/component-passport.js
+++ b/server/component-passport.js
@@ -104,7 +104,7 @@ export default function setupPassport(app) {
       return config.successRedirect || '';
     };
 
-    config.customCallback = !config.redirectWithToken
+    config.customCallback = !config.useCustomCallback
       ? null
       : (req, res, next) => {
 
diff --git a/server/passport-providers.js b/server/passport-providers.js
index b190b6d53c..bab270396b 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -176,7 +176,7 @@ export default {
     callbackURL: '/auth/auth0/callback',
     authPath: '/auth/auth0',
     callbackPath: '/auth/auth0/callback',
-    redirectWithToken: true,
+    useCustomCallback: true,
     successRedirect: successRedirect,
     failureRedirect: failureRedirect,
     scope: ['openid email'],