Added env flag for github oauth option

paulpascal · Jun 12, 2022 · 7ed431f · 7ed431f
1 parent 4470db0
commit 7ed431f
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 32 deletions.
diff --git a/apps/web/.env b/apps/web/.env
@@ -2,3 +2,4 @@ SKIP_PREFLIGHT_CHECK=true
 REACT_APP_API_URL=api_url
 REACT_APP_WIDGET_SDK_PATH=sdk_path
 REACT_APP_ENVIRONMENT=dev
+REACT_APP_GITHUB_AUTH_OPTION=show
diff --git a/apps/web/src/components/auth/LoginForm.tsx b/apps/web/src/components/auth/LoginForm.tsx
@@ -9,7 +9,7 @@ import { AuthContext } from '../../store/authContext';
 import { api } from '../../api/api.client';
 import { PasswordInput, Button, colors, Input, Text } from '../../design-system';
 import { Github } from '../../design-system/icons';
-import { API_ROOT } from '../../config';
+import { API_ROOT, GITHUB_AUTH_OPTION } from '../../config';
 
 type Props = {};
 
@@ -51,20 +51,23 @@ export function LoginForm({}: Props) {
 
  return (
  <>
- <GithubButton
- component="a"
- href={`${API_ROOT}/v1/auth/github`}
- my={30}
- variant="white"
- fullWidth
- radius="md"
- leftIcon={<Github />}
- sx={{ color: colors.B40, fontSize: '16px', fontWeight: '700', height: '50px' }}
- >
- Sign In with Github
- </GithubButton>
- <Divider label={<Text color={colors.B40}>Or</Text>} color={colors.B30} labelPosition="center" my="md" />
-
+ {GITHUB_AUTH_OPTION && (
+ <>
+ <GithubButton
+ component="a"
+ href={`${API_ROOT}/v1/auth/github`}
+ my={30}
+ variant="white"
+ fullWidth
+ radius="md"
+ leftIcon={<Github />}
+ sx={{ color: colors.B40, fontSize: '16px', fontWeight: '700', height: '50px' }}
+ >
+ Sign In with Github
+ </GithubButton>
+ <Divider label={<Text color={colors.B40}>Or</Text>} color={colors.B30} labelPosition="center" my="md" />
+ </>
+ )}
  <form onSubmit={handleSubmit(onLogin)}>
  <Input
  error={errors.email?.message}

diff --git a/apps/web/src/components/auth/SignUpForm.tsx b/apps/web/src/components/auth/SignUpForm.tsx
@@ -9,7 +9,7 @@ import { AuthContext } from '../../store/authContext';
 import { api } from '../../api/api.client';
 import { PasswordInput, Button, colors, Input, Text } from '../../design-system';
 import { Github } from '../../design-system/icons';
-import { API_ROOT } from '../../config';
+import { API_ROOT, GITHUB_AUTH_OPTION } from '../../config';
 import { showNotification } from '@mantine/notifications';
 
 type Props = {
@@ -84,22 +84,22 @@ export function SignUpForm({ token, email }: Props) {
 
  return (
  <>
- {!token && (
- <GithubButton
- my={30}
- component="a"
- href={`${API_ROOT}/v1/auth/github`}
- variant="white"
- fullWidth
- radius="md"
- leftIcon={<Github />}
- sx={{ color: colors.B40, fontSize: '16px', fontWeight: '700', height: '50px' }}
- >
- Sign Up with Github
- </GithubButton>
- )}
- {!token && (
- <Divider label={<Text color={colors.B40}>Or</Text>} color={colors.B30} labelPosition="center" my="md" />
+ {GITHUB_AUTH_OPTION && !token && (
+ <>
+ <GithubButton
+  my={30}
+  component="a"
+  href={`${API_ROOT}/v1/auth/github`}
+  variant="white"
+  fullWidth
+  radius="md"
+  leftIcon={<Github />}
+  sx={{ color: colors.B40, fontSize: '16px', fontWeight: '700', height: '50px' }}
+ >
+  Sign Up with Github
+  </GithubButton>
+  <Divider label={<Text color={colors.B40}>Or</Text>} color={colors.B30} labelPosition="center" my="md" />
+ </>
  )}
 
  <form name="login-form" onSubmit={handleSubmit(onSubmit)}>

diff --git a/apps/web/src/config/index.ts b/apps/web/src/config/index.ts
@@ -23,3 +23,5 @@ export const ENV = process.env.REACT_APP_ENVIRONMENT;
 export const APP_ID = process.env.REACT_APP_NOVU_APP_ID;
 
 export const WIDGET_EMEBED_PATH = process.env.REACT_APP_WIDGET_EMBED_PATH || 'https://localhost:4701/embed.umd.min.js';
+
+export const GITHUB_AUTH_OPTION = process.env.REACT_APP_GITHUB_AUTH_OPTION === 'show';
diff --git a/docker/.env.example b/docker/.env.example
@@ -25,3 +25,6 @@ API_ROOT_URL=https://localhost:3000
 FRONT_BASE_URL=https://client:4200
 WIDGET_EMBED_PATH=https://localhost:4701/embed.umd.min.js
 WIDGET_URL=https://localhost:4500
+
+# Github Auth Option
+REACT_APP_GITHUB_AUTH_OPTION=hide
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -69,6 +69,7 @@ services:
  REACT_APP_API_URL: ${API_ROOT_URL}
  REACT_APP_ENVIRONMENT: ${NODE_ENV}
  REACT_APP_WIDGET_EMBED_PATH: ${WIDGET_EMBED_PATH}
+ REACT_APP_GITHUB_AUTH_OPTION: ${REACT_APP_GITHUB_AUTH_OPTION}
  ports:
  - 4200:4200
  volumes: