First merge from develop to main (WIP) #7

Merged
sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00
2 changed files with 21 additions and 9 deletions
Showing only changes of commit a060901cc3 - Show all commits

View File

@@ -30,9 +30,16 @@ export function clearTokens() {
} }
export async function doSetTokenByCode(code: string) { export async function doSetTokenByCode(code: string) {
const { data } = await axiosClient.post<{ access_token: string; refresh_token: string }>('/auth/token', { code }, { headers: HEADER_API_VERSION }); return new Promise<void>((resolve, reject) => {
setToken(data.access_token); axiosClient.post<{ access_token: string; refresh_token: string }>('/auth/token', { code }, { headers: HEADER_API_VERSION }).then(({ data }) => {
setRefreshToken(data.refresh_token); console.log(data);
setToken(data.access_token);
setRefreshToken(data.refresh_token);
resolve();
}).catch((error) => {
reject(error);
});
});
} }
export async function doRefreshToken() { export async function doRefreshToken() {

View File

@@ -1,5 +1,5 @@
import { createFileRoute, useNavigate } from '@tanstack/react-router'; import { createFileRoute, useNavigate } from '@tanstack/react-router';
import { useState } from 'react'; import { useEffect, useState } from 'react';
import z from 'zod'; import z from 'zod';
import { doSetTokenByCode } from '@/lib/token'; import { doSetTokenByCode } from '@/lib/token';
@@ -16,10 +16,15 @@ function RouteComponent() {
const { code } = Route.useSearch(); const { code } = Route.useSearch();
const [status, setStatus] = useState('Loading...'); const [status, setStatus] = useState('Loading...');
const navigate = useNavigate(); const navigate = useNavigate();
doSetTokenByCode(code).then(() => {
void navigate({ to: '/' }); useEffect(() => {
}).catch((_) => { doSetTokenByCode(code).then(() => {
setStatus('Error getting token'); void navigate({ to: '/' });
}); }).catch((_) => {
setStatus('Error getting token');
});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
return <div>{status}</div>; return <div>{status}</div>;
} }