refactor: Improve login logic

Author: tjtanjin

src/constants/Endpoints.ts

@@ -4,6 +4,7 @@ const Endpoints = {
   projectDiscordUrl: "https://discord.gg/6R4DK4G5Zh",
   projectNpmUrl: "https://www.npmjs.com/package/react-chatbotify",
   projectRepoUrl: "https://github.com/tjtanjin/react-chatbotify",
+  galleryAuthRedirectUrl: `${import.meta.env.VITE_GALLERY_API_URL}/api/v1/auth/callback`,
   fetchApiThemes: `${import.meta.env.VITE_GALLERY_API_URL}/api/v1/themes`,
   fetchApiPlugins: `${import.meta.env.VITE_GALLERY_API_URL}/api/v1/plugins`,
   fetchProjectDetails: `${import.meta.env.VITE_GALLERY_API_URL}/api/v1/projects`,

src/services/authService.ts

@@ -7,20 +7,23 @@ import { Endpoints } from "../constants/Endpoints";
  */
 const handleLogin = (redirect_uri?: string) => {
 
-	// if no uri specified to redirect to after login, then fallback to current location
-	let final_redirect_uri = redirect_uri as string;
-	if (!redirect_uri) {
-		final_redirect_uri = window.location.href;
-	}
+  // if no uri specified to redirect to after login, then fallback to current location
+  let final_redirect_uri = redirect_uri as string;
+  if (!redirect_uri) {
+    final_redirect_uri = window.location.href;
+  }
 
-	// save redirect uri for later (post-login)
-	localStorage.setItem('login_redirect_uri', final_redirect_uri);
+  // save redirect uri for later (post-login)
+  localStorage.setItem('login_redirect_uri', final_redirect_uri);
 
-	// oauth provider chosen (currently no parameter as github is the only one)
-	const client_id = import.meta.env.VITE_GITHUB_APP_CLIENT_ID;
+  // oauth provider chosen (currently no parameter as github is the only one)
+  const client_id = import.meta.env.VITE_GITHUB_APP_CLIENT_ID;
 
-	// redirect user to login endpoint with client id
-	window.location.href = `${Endpoints.gitHubLoginUrl}?client_id=${client_id}`;
+  const redirectUri = `${Endpoints.galleryAuthRedirectUrl}?provider=github&redirect_url=${window.location.origin}`;
+  const encodedRedirectUri = encodeURIComponent(redirectUri);
+  // redirect user to login endpoint with client id
+  window.location.href = `${Endpoints.gitHubLoginUrl}?client_id=${client_id}&redirect_uri=${encodedRedirectUri}`;
 }
 
-export { handleLogin }
+export { handleLogin };
+