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
4 changes: 4 additions & 0 deletions src/api/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ export const refresh = async () => {
return user;
};

export const establishSession = async () => {
await api.post("/auth/session");
};

// health check
export const healthCheck = async () => {
const res = await api.get("/health");
Expand Down
11 changes: 6 additions & 5 deletions src/api/axios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ api.interceptors.request.use(
(config) => {
const url = config.url ?? "";

const isAuthApi =
const skipsAuthorizationHeader =
url.includes("/auth/login") ||
url.includes("/auth/register") ||
url.includes("/auth/refresh");

if (isAuthApi) {
if (skipsAuthorizationHeader) {
delete config.headers.Authorization;
return config;
}
Expand All @@ -56,12 +56,13 @@ api.interceptors.response.use(
const originalRequest = error.config;
const url = originalRequest?.url ?? "";

const isAuthApi =
const skipsRefreshRecovery =
url.includes("/auth/login") ||
url.includes("/auth/register") ||
url.includes("/auth/refresh");
url.includes("/auth/refresh") ||
url.includes("/auth/session");

if (isAuthApi) {
if (skipsRefreshRecovery) {
return Promise.reject(error);
}

Expand Down
8 changes: 8 additions & 0 deletions src/contexts/AuthProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
const completeSocialLogin = useCallback(async (accessToken: string) => {
try {
TokenService.setToken(accessToken);
try {
await auth.establishSession();
} catch (sessionError) {
console.warn(
"Session cookie issuance failed after social login:",
sessionError,
);
}
const userData = await auth.getUser();
setUser(userData);
setIsAuthenticated(true);
Expand Down
Loading