admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: inject enviroment at the ./front deployment phase (#2174) (#2179)

Browse Source 
* chore: inject enviroment at the deployment phase (#2174)

* Dockerfile CMD env.sh
* env.sh generates env-config.js file
* index.html imports env-config.js
* front/src/config/index.ts imports REACT_APP_SERVER_BASE_URL

* Upgrade Dockerfiles

* Add compute pg_database_url for render

* fix tests

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Ruslan
2023-10-22 17:36:36 +07:00
committed by GitHub
parent 1954ed5e3a
commit a5fe256d7e
15 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/modules/auth/hooks/useAuth.ts
View File

@ -6,6 +6,7 @@ import {
useRecoilState,
} from 'recoil';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import {
useChallengeMutation,
useCheckUserExistsLazyQuery,
@ -136,8 +137,7 @@ export const useAuth = () => {
const handleGoogleLogin = useCallback((workspaceInviteHash?: string) => {
const authServerUrl =
process.env.REACT_APP_SERVER_AUTH_URL ??
process.env.REACT_APP_SERVER_BASE_URL + '/auth';
REACT_APP_SERVER_BASE_URL ?? REACT_APP_SERVER_BASE_URL + '/auth';
window.location.href =
`${authServerUrl}/google/${
workspaceInviteHash ? '?inviteHash=' + workspaceInviteHash : ''