Merge branch 'develop' into google-oauth

[FIX] Login and register via Google OAuth
2022-01-25 08:07:45 +05:30 · 2022-01-24 16:25:34 +05:30
1 changed files with 1 additions and 1 deletions
--- a/app/containers/LoginServices.tsx
+++ b/app/containers/LoginServices.tsx
@ -144,7 +144,7 @@ class LoginServices extends React.PureComponent<ILoginServicesProps, any> {
 		const { services, server } = this.props;
 		const { clientId } = services.google;
 		const endpoint = 'https://accounts.google.com/o/oauth2/auth';
-		const redirect_uri = `${server}/_oauth/google?close`;
+		const redirect_uri = `${server}/_oauth/google`;
 		const scope = 'email';
 		const state = this.getOAuthState(LOGIN_STYPE_REDIRECT);
 		const params = `?client_id=${clientId}&redirect_uri=${redirect_uri}&scope=${scope}&state=${state}&response_type=code`;
Author	SHA1	Message	Date
Debdut Chakraborty	43c47c75d0	Merge branch 'develop' into google-oauth	2022-01-25 08:07:45 +05:30
Danish Ahmed Mirza	ea12d90f74	[FIX] Login and register via Google OAuth	2022-01-24 16:25:34 +05:30