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

Delete auth/file front variables (#4455)

Browse Source
This commit is contained in:
Félix Malfait
2024-03-19 22:19:40 +01:00
committed by GitHub
parent 4bfb90657f
commit b6e8bb1a6c
9 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/twenty-front/src/modules/auth/hooks/useAuth.ts
View File

@ -19,7 +19,7 @@ import { supportChatState } from '@/client-config/states/supportChatState';
import { telemetryState } from '@/client-config/states/telemetryState';
import { iconsState } from '@/ui/display/icon/states/iconsState';
import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
import { REACT_APP_SERVER_AUTH_URL } from '~/config';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import {
useChallengeMutation,
useCheckUserExistsLazyQuery,
@ -204,9 +204,9 @@ export const useAuth = () => {
);
const handleGoogleLogin = useCallback((workspaceInviteHash?: string) => {
const authServerUrl = REACT_APP_SERVER_AUTH_URL;
const authServerUrl = REACT_APP_SERVER_BASE_URL;
window.location.href =
`${authServerUrl}/google/${
`${authServerUrl}/auth/google/${
workspaceInviteHash ? '?inviteHash=' + workspaceInviteHash : ''
}` || '';
}, []);

6
packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
View File

@ -6,7 +6,7 @@ import { Button } from '@/ui/input/button/components/Button';
import { Card } from '@/ui/layout/card/components/Card';
import { CardContent } from '@/ui/layout/card/components/CardContent';
import { CardHeader } from '@/ui/layout/card/components/CardHeader';
import { REACT_APP_SERVER_AUTH_URL } from '~/config';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useGenerateTransientTokenMutation } from '~/generated/graphql';
const StyledHeader = styled(CardHeader)`
@ -30,14 +30,14 @@ export const SettingsAccountsListEmptyStateCard = ({
const [generateTransientToken] = useGenerateTransientTokenMutation();
const handleGmailLogin = useCallback(async () => {
const authServerUrl = REACT_APP_SERVER_AUTH_URL;
const authServerUrl = REACT_APP_SERVER_BASE_URL;
const transientToken = await generateTransientToken();
const token =
transientToken.data?.generateTransientToken.transientToken.token;
window.location.href = `${authServerUrl}/google-gmail?transientToken=${token}`;
window.location.href = `${authServerUrl}/auth/google-gmail?transientToken=${token}`;
}, [generateTransientToken]);
return (

6
packages/twenty-front/src/modules/users/utils/getProfilePictureAbsoluteURI.ts
View File

@ -1,4 +1,4 @@
import { REACT_APP_SERVER_FILES_URL } from '~/config';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
export const getImageAbsoluteURIOrBase64 = (imageUrl?: string | null) => {
if (!imageUrl) {
@ -13,7 +13,7 @@ export const getImageAbsoluteURIOrBase64 = (imageUrl?: string | null) => {
return imageUrl;
}
const serverFilesUrl = REACT_APP_SERVER_FILES_URL;
const serverFilesUrl = REACT_APP_SERVER_BASE_URL;
return `${serverFilesUrl}/${imageUrl}`;
return `${serverFilesUrl}/files/${imageUrl}`;
};