feat(auth): check tha name of the app on the social authenticating

flatlogic · Jun 11, 2019 · 03424c1 · 03424c1
1 parent 20c1a6b
commit 03424c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/config.js b/src/config.js
@@ -7,7 +7,7 @@ module.exports = {
     secret_key: "HUEyqESqgQ1yTwzVlO6wprC9Kf1J1xuA",
     host: process.env.HOST || "http://localhost",
     port: process.env.NODE_ENV === "production" ? "" : "8080",
-    hostUI: process.env.NODE_ENV === "production" ? "https://demo.flatlogic.com/sing-app-react" : "http://localhost",
+    hostUI: process.env.NODE_ENV === "production" ? "https://demo.flatlogic.com" : "http://localhost",
     portUI: process.env.NODE_ENV === "production" ? "" : "3000",
     google: {
         clientId: "592707349093-3ab6a0seutt1qpiiq8u0k3in5k7f226d.apps.googleusercontent.com",

diff --git a/src/routes/user.js b/src/routes/user.js
@@ -59,21 +59,25 @@ router.post('/signin/local', (req, res) => {
 });
 
 
-router.get('/signin/google', passport.authenticate("google", {scope: ["profile", "email"]}));
+router.get('/signin/google', (req, res, next) => {
+    passport.authenticate("google", {scope: ["profile", "email"], state: req.query.app})(req, res, next);
+});
 
 router.get('/signin/google/callback', passport.authenticate("google", {failureRedirect: "/login", session: false}),
   function (req, res) {
     let token = req.user.token;
-    res.redirect(config.hostUI + `${config.portUI ? `:${config.portUI}` : ``}` + "/#/login?token=" + token);
+    res.redirect(config.hostUI + `${config.portUI ? `:${config.portUI}` : ``}` + `${req.query.state ? `/${req.query.state}` : ``}` + "/#/login?token=" + token);
   }
   );
 
-router.get('/signin/microsoft', passport.authenticate("microsoft", {scope: ["https://graph.microsoft.com/user.read openid"]}));
+router.get('/signin/microsoft', (req, res, next) => {
+    passport.authenticate("microsoft", {scope: ["https://graph.microsoft.com/user.read openid"], state: req.query.app})(req, res, next);
+});
 
 router.get('/signin/microsoft/callback', passport.authenticate("microsoft", {failureRedirect: "/login", session: false}),
   function (req, res) {
     let token = req.user.token;
-    res.redirect(config.hostUI + `${config.portUI ? `:${config.portUI}` : ``}` + "/#/login?token=" + token);
+    res.redirect(config.hostUI + `${config.portUI ? `:${config.portUI}` : ``}` + `${req.query.state ? `/${req.query.state}` : ``}` + "/#/login?token=" + token);
   }
 );