diff --git a/middleware/passport.middleware.js b/middleware/passport.middleware.js index 17afc33e..9adab7ad 100644 --- a/middleware/passport.middleware.js +++ b/middleware/passport.middleware.js @@ -400,8 +400,10 @@ exports.sattConnect = async (req, res, next) => { /* * begin signin with facebook strategy */ -exports.facebookAuthSignin = async (profile, cb) => { +exports.facebookAuthSignin = async (req,profile, cb) => { await handleSocialMediaSignin( + req, + profile, { idOnSn: profile._json.token_for_business }, cb ) diff --git a/routes/login.routes.js b/routes/login.routes.js index 2035ec06..3cf0fe38 100644 --- a/routes/login.routes.js +++ b/routes/login.routes.js @@ -497,7 +497,7 @@ passport.use( new FbStrategy( facebookCredentials('auth/callback/facebook/connection'), async function (req, accessToken, refreshToken, profile, cb) { - facebookAuthSignin(profile, cb) + facebookAuthSignin(req,profile, cb) } ) ) diff --git a/routes/profile.routes.js b/routes/profile.routes.js index 271854d2..c591078e 100644 --- a/routes/profile.routes.js +++ b/routes/profile.routes.js @@ -645,7 +645,7 @@ router.get( (req, res, next) => { passport.authenticate('facebook_strategy_add_channel', { failureRedirect: - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL )+ req.query.state.split('|')[1] + '?message=access-denied', })(req, res, next) @@ -655,7 +655,7 @@ router.get( redirect = req.query.state.split('|')[1] let message = req.authInfo.message response.redirect( - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + redirect + '?message=' + message + @@ -743,7 +743,7 @@ router.get( if (!req.query.error) next() else res.redirect( - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + redirect + '?message=access-denied&sn=linkd' ) @@ -754,7 +754,7 @@ router.get( let redirect = req.query.state.split('|')[1] let message = req.authInfo.message res.redirect( - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + redirect + '?message=' + message + @@ -804,7 +804,7 @@ router.get( (req, res, next) => { passport.authenticate('tikTok_strategy_add_channel', { failureRedirect: - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + req.query.state.split('|')[1] + '?message=access-denied', })(req, res, next) @@ -819,7 +819,7 @@ router.get( message = 'account_linked_with_success' } response.redirect( - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + redirect + '?message=' + message + @@ -868,7 +868,7 @@ router.get( (req, res, next) => { passport.authenticate('youtube_strategy_add_channel', { failureRedirect: - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + req.query.state.split('|')[1] + '?message=access-denied&sn=youtue', })(req, res, next) @@ -882,7 +882,7 @@ router.get( message = 'account_linked_with_success' } res.redirect( - process.env.BASED_URL + redirect + '?message=' + message + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + redirect + '?message=' + message ) } catch (err) { res.end( @@ -1180,7 +1180,7 @@ router.get( '/callback/link/facebook', passport.authenticate('link_facebook_account', { failureRedirect: - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + '/home/settings/social-networks?message=access-denied', }), async (req, response) => { @@ -1188,7 +1188,7 @@ router.get( let state = req.query.state.split('|') let url = state[1] response.redirect( - process.env.BASED_URL + url + '?message=' + req.authInfo.message + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + url + '?message=' + req.authInfo.message ) } catch (e) {} } @@ -1233,7 +1233,7 @@ router.get( '/callback/link/google', passport.authenticate('link_google_account', { failureRedirect: - process.env.BASED_URL + + (process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + '/home/settings/social-networks?message=access-denied', }), async (req, res) => { @@ -1241,7 +1241,7 @@ router.get( let state = req.query.state.split('|') let url = state[1] let message = req.authInfo.message - res.redirect(process.env.BASED_URL + url + '?message=' + message) + res.redirect((process.env.NODE_ENV === "mainnet" ? (req.origins.header.includes('https://app.satt.com') ? process.env.METAMASK_BASED_URL : process.env.BASED_URL) : process.env.BASED_URL ) + url + '?message=' + message) } catch (e) {} } )