Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export function useAccessTokenRefresh() {
const navigate = useNavigate();
const { user, signOut } = useAuth();

const mutation = useMutation({
mutationFn: async (params?: RefreshAccessTokenParams) => {
return useMutation({
mutationFn: async (params: RefreshAccessTokenParams = {}) => {
const throwExpirationModalOnSignOut =
params?.throwExpirationModalOnSignOut ?? true;
params.throwExpirationModalOnSignOut ?? true;

try {
await authService.refreshAccessToken();
Expand All @@ -37,18 +37,4 @@ export function useAccessTokenRefresh() {
id: 'refresh-access-token',
},
});

return {
refreshAccessToken: (
params?: RefreshAccessTokenParams,
options?: Parameters<typeof mutation.mutate>[1]
) => {
mutation.mutate(params, options);
},
refreshAccessTokenAsync: (
params?: RefreshAccessTokenParams,
options?: Parameters<typeof mutation.mutateAsync>[1]
) => mutation.mutateAsync(params, options),
isRefreshingAccessToken: mutation.isPending,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import * as hCaptchaLabelingService from '../services/hcaptcha-labeling.service'

export function useEnableHCaptchaLabelingMutation() {
const navigate = useNavigate();
const { refreshAccessTokenAsync } = useAccessTokenRefresh();
const { mutateAsync: refreshAccessTokenAsync } = useAccessTokenRefresh();

const mutation = useMutation({
mutationFn: async () => {
const result = await hCaptchaLabelingService.enableHCaptchaLabeling();
await refreshAccessTokenAsync();
await refreshAccessTokenAsync({});
return result;
},
onSuccess: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interface RegisterAddressCallbacks {

function useRegisterAddressMutation(callbacks: RegisterAddressCallbacks) {
const { user, updateUserData } = useAuth();
const { refreshAccessTokenAsync } = useAccessTokenRefresh();
const { mutateAsync: refreshAccessTokenAsync } = useAccessTokenRefresh();
const { address, chainId, signMessage } = useWalletConnect();
const { prepareSignature } = usePrepareSignature(
PrepareSignatureType.REGISTER_ADDRESS
Expand All @@ -37,7 +37,7 @@ function useRegisterAddressMutation(callbacks: RegisterAddressCallbacks) {
// wallet address is part of the JWT payload
// so we need to refresh the token after the address is registered
await profileService.registerAddress({ address, chainId, signature });
await refreshAccessTokenAsync();
await refreshAccessTokenAsync({});
updateUserData({
wallet_address: address,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ export function IdentityVerificationControl({
const { t } = useTranslation();
const { isIdvAlreadyInProgress, idvStarted, idvStartIsPending, startIdv } =
useStartIdv();
const { refreshAccessTokenAsync, isRefreshingAccessToken } =
useAccessTokenRefresh();
const {
mutateAsync: refreshAccessTokenAsync,
isPending: isRefreshingAccessToken,
} = useAccessTokenRefresh();
const { updateUserData } = useAuth();
const { colorPalette } = useColorMode();

Expand All @@ -64,7 +66,7 @@ export function IdentityVerificationControl({
}, CHECK_STATUS_COOLDOWN_TIME);

try {
await refreshAccessTokenAsync();
await refreshAccessTokenAsync({});
const accessToken = browserAuthProvider.getAccessToken();

if (!accessToken) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ export function createAuthProvider<T extends UserData>(config: {

const validUserData = schema.parse(userData);

queryClient.setDefaultOptions({ queries: { enabled: true } });

setAuthState({ user: validUserData, status: 'success' });

browserAuthProvider.signOutSubscription = displayExpirationModal;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function JWTExpirationCheck({
const checksOnProfile = useRef(0);
const auth = useAuth();
const location = useLocation();
const { refreshAccessToken } = useAccessTokenRefresh();
const { mutate: refreshAccessToken } = useAccessTokenRefresh();

useEffect(() => {
if (location.pathname.includes('profile') && auth.user) {
Expand Down
Loading