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

Fix comment creation bug (#371)

Browse Source
This commit is contained in:
Charles Bochet
2023-06-24 11:18:13 -07:00
committed by GitHub
parent 31145c5518
commit 9c21975d2b
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
front/src/modules/auth/hooks/useFetchCurrentUser.ts
View File

@ -1,26 +1,13 @@
import { useEffect } from 'react';
import jwt from 'jwt-decode';
import { useRecoilState } from 'recoil';
import { useGetCurrentUserQuery } from '~/generated/graphql';
import { AuthTokenPair, useGetCurrentUserQuery } from '~/generated/graphql';
import { currentUserState } from '../states/currentUserState';
import { tokenPairState } from '../states/tokenPairState';
export function useFetchCurrentUser() {
const [, setCurrentUser] = useRecoilState(currentUserState);
const [tokenPair] = useRecoilState(tokenPairState);
export function useFetchCurrentUser(tokenPair: AuthTokenPair | null) {
const userId = tokenPair?.accessToken.token
? jwt<{ sub: string }>(tokenPair.accessToken.token).sub
: null;
const { data } = useGetCurrentUserQuery({
variables: { uuid: userId },
});
const user = data?.users?.[0];
useEffect(() => {
if (user) {
setCurrentUser(user);
}
}, [user, setCurrentUser]);
return data?.users?.[0];
}

2
front/src/modules/auth/states/tokenPairState.ts
View File

@ -7,7 +7,7 @@ const cookieStorageEffect =
(key: string): AtomEffect<AuthTokenPair | null> =>
({ setSelf, onSet }) => {
const savedValue = cookieStorage.getItem(key);
if (savedValue != null) {
if (savedValue != null && JSON.parse(savedValue)['accessToken']) {
setSelf(JSON.parse(savedValue));
}