@tiledesk/tiledesk-server 2.4.43 → 2.4.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/routes/auth.js +3 -1
package/package.json
CHANGED
package/routes/auth.js
CHANGED
|
@@ -466,6 +466,8 @@ function (req, res) {
|
|
|
466
466
|
|
|
467
467
|
// https://tiledesk-server-pre.herokuapp.com/auth/google
|
|
468
468
|
|
|
469
|
+
// https://tiledesk-server-pre.herokuapp.com/auth/google?forced_redirect_url=https%3A%2F%2Fpanel.tiledesk.com%2Fv3%2Fchat%2F%23conversation-detail%3Ffrom%3Dgoogle
|
|
470
|
+
|
|
469
471
|
// Redirect the user to the Google signin page</em>
|
|
470
472
|
// router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
|
|
471
473
|
router.get("/google", function(req,res,next){
|
|
@@ -537,7 +539,7 @@ router.get("/google/callback", passport.authenticate("google", { session: false
|
|
|
537
539
|
var url = dashboard_base_url+homeurl+"?token=JWT "+token;
|
|
538
540
|
|
|
539
541
|
if (req.session.forced_redirect_url) {
|
|
540
|
-
url = req.session.forced_redirect_url+"
|
|
542
|
+
url = req.session.forced_redirect_url+"?jwt=JWT "+token; //attention we use jwt= (ionic) instead token=(dashboard) for ionic
|
|
541
543
|
}
|
|
542
544
|
|
|
543
545
|
winston.info("Google Redirect: "+ url);
|