Google login fixes

tiller1010 · Dec 31, 2022 · 3251b5e · 3251b5e
1 parent 74cab85
commit 3251b5e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/app/passport.js b/app/passport.js
@@ -97,12 +97,12 @@ passport.use(new GoogleStrategy({
 
 		try {
 			let user = await findAndSyncUser(profile.id, 'google');
-			await sendEmail(newUser.email, `${process.env.SECURED_DOMAIN_WITHOUT_PROTOCOL}> Registration`, "<b>Thank you for registering</b>");
 
-			if(user){
+			if (user) {
 				return done(null, user);
 			} else {
 				let user = await addUser(newUser);
+				await sendEmail(newUser.email, `${process.env.SECURED_DOMAIN_WITHOUT_PROTOCOL}> Registration`, "<b>Thank you for registering</b>");
 				return done(null, newUser);
 			}
 		} catch(error) {

diff --git a/js/components/Login.jsx b/js/components/Login.jsx
@@ -71,7 +71,7 @@ class Login extends React.Component {
 					    Register
 					    <FontAwesomeIcon icon={faLongArrowAltRight}/>
 				    </a>
-				    <a href={`/auth/google?backURL=${backURL}`} className="button">
+				    <a href={`/auth/google${backURL ? '?backURL=' + backURL : ''}`} className="button">
 					    Login with Google
 					    <FontAwesomeIcon icon={faGoogle}/>
 				    </a>

diff --git a/public/js/main.js b/public/js/main.js
diff --git a/routes/authentication.js b/routes/authentication.js
@@ -68,13 +68,16 @@ module.exports.defineAuthenticationRoutes = function(app) {
 
 	// Google login
 	let googleNativeFlag = false;
+	let googleBackURL = '';
 	app.get('/auth/google', (req, res, next) => {
 		const { backURL, nativeFlag } = req.query;
-		if(nativeFlag){
+		if (nativeFlag) {
 			googleNativeFlag = true;
 		}
+		googleBackURL = backURL || '';
 		next();
 	}, passport.authenticate('google', { scope: [ 'https://www.googleapis.com/auth/plus.login', 'email' ] }));
+
 	app.get('/auth/google/callback', passport.authenticate('google', { failureRedirect: '/login' }), (req, res) => {
 
 		if(req.user && !req.cookies.jwt){
@@ -98,7 +101,8 @@ module.exports.defineAuthenticationRoutes = function(app) {
 			res.redirect(process.env.REACT_NATIVE_APP_URL + '?userID=' + String(req.user._id));
 			return;
 		} else {
-			const successRedirect = backURL ? backURL : '/account-profile';
+			const successRedirect = googleBackURL ? googleBackURL : '/account-profile';
+			googleBackURL = '';
 			res.redirect(successRedirect);
 			return;
 		}