@tiledesk/tiledesk-server 2.4.42 → 2.4.44

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/routes/auth.js +16 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@tiledesk/tiledesk-server",
3
3
  "description": "The Tiledesk server module",
4
- "version": "2.4.42",
4
+ "version": "2.4.44",
5
5
  "scripts": {
6
6
  "start": "node ./bin/www",
7
7
  "pretest": "mongodb-runner start",
package/routes/auth.js CHANGED
@@ -458,13 +458,25 @@ function (req, res) {
458
458
 
459
459
  // http://localhost:3000/auth/google?redirect_url=%2F%23%2Fproject%2F6452281f6d68c5f419c1c577%2Fhome
460
460
 
461
+ // http://localhost:3000/auth/google?redirect_url=%23%2Fcreate-project-gs
461
462
 
463
+ // http://localhost:3000/auth/google?forced_redirect_url=https%3A%2F%2Fpanel.tiledesk.com%2Fv3%2Fchat%2F%23conversation-detail%3Ffrom%3Dgoogle
464
+
465
+ // https://tiledesk-server-pre.herokuapp.com/auth/google?redirect_url=%23%2Fcreate-project-gs
466
+
467
+ // https://tiledesk-server-pre.herokuapp.com/auth/google
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
462
470
 
463
471
  // Redirect the user to the Google signin page</em>
464
472
  // router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
465
473
  router.get("/google", function(req,res,next){
466
474
  winston.info("redirect_url: "+ req.query.redirect_url );
467
475
  req.session.redirect_url = req.query.redirect_url;
476
+
477
+ winston.info("forced_redirect_url: "+ req.query.forced_redirect_url );
478
+ req.session.forced_redirect_url = req.query.forced_redirect_url;
479
+
468
480
  // req._toParam = 'Hello';
469
481
  passport.authenticate(
470
482
  // 'google', { scope : ["email", "profile"], state: base64url(JSON.stringify({blah: 'text'})) } //custom redirect_url req.query.state
@@ -487,7 +499,7 @@ router.get("/google/callback", passport.authenticate("google", { session: false
487
499
  // winston.info("req._toParam: "+ req._toParam);
488
500
  // winston.info("req.query.redirect_url: "+ req.query.redirect_url);
489
501
  // winston.info("req.query.state: "+ req.query.state);
490
- winston.info("req.session.redirect_url: "+ req.session.redirect_url);
502
+ winston.debug("req.session.redirect_url: "+ req.session.redirect_url);
491
503
 
492
504
 
493
505
  var userJson = user.toObject();
@@ -526,6 +538,9 @@ router.get("/google/callback", passport.authenticate("google", { session: false
526
538
 
527
539
  var url = dashboard_base_url+homeurl+"?token=JWT "+token;
528
540
 
541
+ if (req.session.forced_redirect_url) {
542
+ url = req.session.forced_redirect_url+"?token=JWT "+token;
543
+ }
529
544
 
530
545
  winston.info("Google Redirect: "+ url);
531
546