From ef3ca7ac73c50cd234d253d8336c3b6551d861cc Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Wed, 4 Oct 2023 19:10:37 +0530
Subject: [PATCH 1/3] chore: remove unnecessary oauth envs

---
 space/components/accounts/sign-in.tsx | 18 +-----------------
 turbo.json                            |  2 --
 web/pages/index.tsx                   |  4 ++--
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/space/components/accounts/sign-in.tsx b/space/components/accounts/sign-in.tsx
index c6a151d4423..9e8d067a0b6 100644
--- a/space/components/accounts/sign-in.tsx
+++ b/space/components/accounts/sign-in.tsx
@@ -63,23 +63,7 @@ export const SignInView = observer(() => {
     }
   };
 
-  const handleGitHubSignIn = async (credential: string) => {
-    try {
-      if (process.env.NEXT_PUBLIC_GITHUB_ID && credential) {
-        const socialAuthPayload = {
-          medium: "github",
-          credential,
-          clientId: process.env.NEXT_PUBLIC_GITHUB_ID,
-        };
-        const response = await authenticationService.socialAuth(socialAuthPayload);
-        onSignInSuccess(response);
-      } else {
-        throw Error("Cant find credentials");
-      }
-    } catch (err: any) {
-      onSignInError(err);
-    }
-  };
+  const handleGitHubSignIn = async (credential: string) => {};
 
   const handlePasswordSignIn = async (formData: any) => {
     await authenticationService
diff --git a/turbo.json b/turbo.json
index 59bbe741f85..5aff42856ed 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,8 +1,6 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "globalEnv": [
-    "NEXT_PUBLIC_GITHUB_ID",
-    "NEXT_PUBLIC_GOOGLE_CLIENTID",
     "NEXT_PUBLIC_API_BASE_URL",
     "NEXT_PUBLIC_DEPLOY_URL",
     "API_BASE_URL",
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index ed98d29f638..1696f2fbc6f 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -85,11 +85,11 @@ const HomePage: NextPage = observer(() => {
 
   const handleGitHubSignIn = async (credential: string) => {
     try {
-      if (process.env.NEXT_PUBLIC_GITHUB_ID && credential) {
+      if (data && data.github && credential) {
         const socialAuthPayload = {
           medium: "github",
           credential,
-          clientId: process.env.NEXT_PUBLIC_GITHUB_ID,
+          clientId: data.github,
         };
         const response = await authenticationService.socialAuth(socialAuthPayload);
         if (response && response?.user) {

From f4140b32796b7be6be549223f3e87ab2bd8a5635 Mon Sep 17 00:00:00 2001
From: sriramveeraghanta <veeraghanta.sriram@gmail.com>
Date: Wed, 4 Oct 2023 20:32:03 +0530
Subject: [PATCH 2/3] merge conflicts resolved

---
 .../accounts/github-login-button.tsx          |  7 +-
 space/components/accounts/google-login.tsx    | 13 ++--
 space/components/accounts/sign-in.tsx         | 71 +++++++++----------
 3 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/space/components/accounts/github-login-button.tsx b/space/components/accounts/github-login-button.tsx
index e9b30ab73ed..b1bd586fe76 100644
--- a/space/components/accounts/github-login-button.tsx
+++ b/space/components/accounts/github-login-button.tsx
@@ -10,9 +10,12 @@ import githubWhiteImage from "public/logos/github-white.svg";
 
 export interface GithubLoginButtonProps {
   handleSignIn: React.Dispatch<string>;
+  clientId: string;
 }
 
-export const GithubLoginButton: FC<GithubLoginButtonProps> = ({ handleSignIn }) => {
+export const GithubLoginButton: FC<GithubLoginButtonProps> = (props) => {
+  const { handleSignIn, clientId } = props;
+  // states
   const [loginCallBackURL, setLoginCallBackURL] = useState(undefined);
   const [gitCode, setGitCode] = useState<null | string>(null);
 
@@ -38,7 +41,7 @@ export const GithubLoginButton: FC<GithubLoginButtonProps> = ({ handleSignIn })
     <div className="w-full flex justify-center items-center">
       <Link
         className="w-full"
-        href={`https://github.com/login/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_GITHUB_ID}&redirect_uri=${loginCallBackURL}&scope=read:user,user:email`}
+        href={`https://github.com/login/oauth/authorize?client_id=${clientId}&redirect_uri=${loginCallBackURL}&scope=read:user,user:email`}
       >
         <button className="flex w-full items-center justify-center gap-2 rounded border border-custom-border-300 p-2 text-sm font-medium text-custom-text-100 duration-300 hover:bg-custom-background-80 h-[46px]">
           <Image
diff --git a/space/components/accounts/google-login.tsx b/space/components/accounts/google-login.tsx
index 82916d7b569..4732ec8fdc7 100644
--- a/space/components/accounts/google-login.tsx
+++ b/space/components/accounts/google-login.tsx
@@ -1,22 +1,23 @@
-import { FC, CSSProperties, useEffect, useRef, useCallback, useState } from "react";
-
+import { FC, useEffect, useRef, useCallback, useState } from "react";
 import Script from "next/script";
 
 export interface IGoogleLoginButton {
-  text?: string;
+  clientId: string;
   handleSignIn: React.Dispatch<any>;
-  styles?: CSSProperties;
 }
 
-export const GoogleLoginButton: FC<IGoogleLoginButton> = ({ handleSignIn }) => {
+export const GoogleLoginButton: FC<IGoogleLoginButton> = (props) => {
+  const { handleSignIn, clientId } = props;
+  // refs
   const googleSignInButton = useRef<HTMLDivElement>(null);
+  // states
   const [gsiScriptLoaded, setGsiScriptLoaded] = useState(false);
 
   const loadScript = useCallback(() => {
     if (!googleSignInButton.current || gsiScriptLoaded) return;
 
     (window as any)?.google?.accounts.id.initialize({
-      client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENTID || "",
+      client_id: clientId,
       callback: handleSignIn,
     });
 
diff --git a/space/components/accounts/sign-in.tsx b/space/components/accounts/sign-in.tsx
index a4ef22bbd33..0c6810198af 100644
--- a/space/components/accounts/sign-in.tsx
+++ b/space/components/accounts/sign-in.tsx
@@ -1,27 +1,30 @@
-import React, { useEffect } from "react";
-
-import Image from "next/image";
+import React from "react";
+import useSWR from "swr";
 import { useRouter } from "next/router";
-
 // mobx
 import { observer } from "mobx-react-lite";
 import { useMobxStore } from "lib/mobx/store-provider";
 // services
 import authenticationService from "services/authentication.service";
+import { AppConfigService } from "services/app-config.service";
 // hooks
 import useToast from "hooks/use-toast";
 // components
-import { EmailPasswordForm, GithubLoginButton, GoogleLoginButton, EmailCodeForm } from "components/accounts";
+import { EmailPasswordForm, GoogleLoginButton, EmailCodeForm } from "components/accounts";
 // images
 const imagePrefix = Boolean(parseInt(process.env.NEXT_PUBLIC_DEPLOY_WITH_NGINX || "0")) ? "/spaces" : "";
 
+const appConfig = new AppConfigService();
+
 export const SignInView = observer(() => {
   const { user: userStore } = useMobxStore();
-
+  // router
   const router = useRouter();
   const { next_path } = router.query as { next_path: string };
-
+  // toast
   const { setToastAlert } = useToast();
+  // fetch app config
+  const { data } = useSWR("APP_CONFIG", () => appConfig.envConfig());
 
   const onSignInError = (error: any) => {
     setToastAlert({
@@ -64,8 +67,6 @@ export const SignInView = observer(() => {
     }
   };
 
-  const handleGitHubSignIn = async (credential: string) => {};
-
   const handlePasswordSignIn = async (formData: any) => {
     await authenticationService
       .emailLogin(formData)
@@ -103,38 +104,32 @@ export const SignInView = observer(() => {
       </div>
       <div className="grid place-items-center h-full overflow-y-auto py-5 px-7">
         <div>
-          {parseInt(process.env.NEXT_PUBLIC_ENABLE_OAUTH || "0") ? (
-            <>
-              <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-custom-text-100">
-                Sign in to Plane
-              </h1>
-              <div className="flex flex-col divide-y divide-custom-border-200">
-                <div className="pb-7">
-                  <EmailCodeForm handleSignIn={handleEmailCodeSignIn} />
-                </div>
-                <div className="flex flex-col items-center justify-center gap-4 pt-7 sm:w-[360px] mx-auto overflow-hidden">
-                  <GoogleLoginButton handleSignIn={handleGoogleSignIn} />
-                  {/* <GithubLoginButton handleSignIn={handleGitHubSignIn} /> */}
-                </div>
+          <h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-custom-text-100">Sign in to Plane</h1>
+          {data?.email_password_login && <EmailPasswordForm onSubmit={handlePasswordSignIn} />}
+
+          {data?.magic_login && (
+            <div className="flex flex-col divide-y divide-custom-border-200">
+              <div className="pb-7">
+                <EmailCodeForm handleSignIn={handleEmailCodeSignIn} />
               </div>
-            </>
-          ) : (
-            <EmailPasswordForm onSubmit={handlePasswordSignIn} />
+            </div>
           )}
 
-          {parseInt(process.env.NEXT_PUBLIC_ENABLE_OAUTH || "0") ? (
-            <p className="pt-16 text-custom-text-200 text-sm text-center">
-              By signing up, you agree to the{" "}
-              <a
-                href="https://plane.so/terms-and-conditions"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="font-medium underline"
-              >
-                Terms & Conditions
-              </a>
-            </p>
-          ) : null}
+          <div className="flex flex-col items-center justify-center gap-4 pt-7 sm:w-[360px] mx-auto overflow-hidden">
+            {data?.google && <GoogleLoginButton clientId={data.google} handleSignIn={handleGoogleSignIn} />}
+          </div>
+
+          <p className="pt-16 text-custom-text-200 text-sm text-center">
+            By signing up, you agree to the{" "}
+            <a
+              href="https://plane.so/terms-and-conditions"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="font-medium underline"
+            >
+              Terms & Conditions
+            </a>
+          </p>
         </div>
       </div>
     </div>

From 633f2f5516ad71f82f3a6d75e11b394a932131e9 Mon Sep 17 00:00:00 2001
From: sriramveeraghanta <veeraghanta.sriram@gmail.com>
Date: Wed, 4 Oct 2023 20:33:16 +0530
Subject: [PATCH 3/3] fix: adding new service

---
 space/services/app-config.service.ts | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 space/services/app-config.service.ts

diff --git a/space/services/app-config.service.ts b/space/services/app-config.service.ts
new file mode 100644
index 00000000000..713cda3da1b
--- /dev/null
+++ b/space/services/app-config.service.ts
@@ -0,0 +1,30 @@
+// services
+import APIService from "services/api.service";
+// helper
+import { API_BASE_URL } from "helpers/common.helper";
+
+export interface IEnvConfig {
+  github: string;
+  google: string;
+  github_app_name: string | null;
+  email_password_login: boolean;
+  magic_login: boolean;
+}
+
+export class AppConfigService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async envConfig(): Promise<IEnvConfig> {
+    return this.get("/api/configs/", {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    })
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}