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
55 changes: 35 additions & 20 deletions apps/admin/src/lib/auth/session.test.ts
Original file line number Diff line number Diff line change
@@ -1,44 +1,59 @@
import { beforeEach, describe, expect, it, vi } from "vitest";

const { removeAccessToken, removeAdminApiEnvironment, saveAdminApiEnvironment } = vi.hoisted(() => ({
const { removeAccessToken } = vi.hoisted(() => ({
removeAccessToken: vi.fn(),
removeAdminApiEnvironment: vi.fn(),
saveAdminApiEnvironment: vi.fn(),
}));

vi.mock("@/lib/api/auth", () => ({
reissueAccessTokenApi: vi.fn(),
}));

vi.mock("@/lib/utils/localStorage", () => ({
loadAccessToken: vi.fn(),
removeAccessToken,
removeAdminApiEnvironment,
saveAccessToken: vi.fn(),
saveAdminApiEnvironment,
}));
// ํ™˜๊ฒฝ(stage/prod) ์ €์žฅยท์กฐํšŒ ํ•จ์ˆ˜๋Š” ์‹ค์ œ ๊ตฌํ˜„(jsdom localStorage)์„ ๊ทธ๋Œ€๋กœ ์‚ฌ์šฉํ•ด,
// clearSession()์ด ์ €์žฅ๋œ ํ™˜๊ฒฝ ๊ฐ’์„ ๊ฑด๋“œ๋ฆฌ์ง€ ์•Š๋Š”์ง€ ํšŒ๊ท€ ํ…Œ์ŠคํŠธ๋กœ ๊ฒ€์ฆํ•œ๋‹ค.
vi.mock("@/lib/utils/localStorage", async (importOriginal) => {
const actual = await importOriginal<typeof import("@/lib/utils/localStorage")>();
return {
...actual,
loadAccessToken: vi.fn(),
removeAccessToken,
saveAccessToken: vi.fn(),
};
});

describe("switchAdminApiEnvironment", () => {
beforeEach(() => {
removeAccessToken.mockReset();
removeAdminApiEnvironment.mockReset();
saveAdminApiEnvironment.mockReset();
localStorage.clear();
});

it("์„ธ์…˜(access token, ํ™˜๊ฒฝ ๊ฐ’)์„ ๋ชจ๋‘ ์ง€์šด ๋’ค ์ƒˆ ํ™˜๊ฒฝ์„ ์ €์žฅํ•œ๋‹ค", async () => {
it("access token์„ ์ง€์šด ๋’ค ์ƒˆ ํ™˜๊ฒฝ์„ ์ €์žฅํ•˜๊ณ  ๋กœ๊ทธ์ธ ํŽ˜์ด์ง€๋กœ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธํ•œ๋‹ค", async () => {
const { switchAdminApiEnvironment } = await import("./session");
const { loadAdminApiEnvironment } = await import("@/lib/utils/localStorage");
const redirect = vi.fn();
const callOrder: string[] = [];

removeAdminApiEnvironment.mockImplementation(() => callOrder.push("removeAdminApiEnvironment"));
saveAdminApiEnvironment.mockImplementation(() => callOrder.push("saveAdminApiEnvironment"));

switchAdminApiEnvironment("prod", redirect);

expect(removeAccessToken).toHaveBeenCalledOnce();
expect(removeAdminApiEnvironment).toHaveBeenCalledOnce();
expect(saveAdminApiEnvironment).toHaveBeenCalledWith("prod");
expect(callOrder).toEqual(["removeAdminApiEnvironment", "saveAdminApiEnvironment"]);
expect(loadAdminApiEnvironment()).toBe("prod");
expect(redirect).toHaveBeenCalledWith("/auth/login");
});
});

describe("clearSession", () => {
beforeEach(() => {
removeAccessToken.mockReset();
localStorage.clear();
});

it("access token์€ ์ง€์šฐ์ง€๋งŒ ์ €์žฅ๋œ ์–ด๋“œ๋ฏผ API ํ™˜๊ฒฝ ๊ฐ’์€ ์œ ์ง€ํ•œ๋‹ค (ํšŒ๊ท€ ํ…Œ์ŠคํŠธ)", async () => {
const { clearSession } = await import("./session");
const { loadAdminApiEnvironment, saveAdminApiEnvironment } = await import("@/lib/utils/localStorage");

saveAdminApiEnvironment("stage");

clearSession();

expect(removeAccessToken).toHaveBeenCalledOnce();
expect(loadAdminApiEnvironment()).toBe("stage");
});
});
14 changes: 3 additions & 11 deletions apps/admin/src/lib/auth/session.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import { reissueAccessTokenApi } from "@/lib/api/auth";
import type { AdminApiEnvironment } from "@/lib/auth/environment";
import { isTokenExpired } from "@/lib/utils/jwtUtils";
import {
loadAccessToken,
removeAccessToken,
removeAdminApiEnvironment,
saveAccessToken,
saveAdminApiEnvironment,
} from "@/lib/utils/localStorage";
import { loadAccessToken, removeAccessToken, saveAccessToken, saveAdminApiEnvironment } from "@/lib/utils/localStorage";

let reissuePromise: Promise<string | null> | null = null;
let sessionVersion = 0;
Expand All @@ -30,13 +24,11 @@ export const clearSession = () => {
sessionVersion += 1;
reissuePromise = null;
removeAccessToken();
removeAdminApiEnvironment();
};

/**
* ์–ด๋“œ๋ฏผ API ํ™˜๊ฒฝ(stage/prod)์„ ์ „ํ™˜ํ•œ๋‹ค. clearSession()์ด ํ™˜๊ฒฝ ์ €์žฅ ํ‚ค๊นŒ์ง€ ํ•จ๊ป˜ ์ง€์šฐ๋ฏ€๋กœ,
* ๋ฐ˜๋“œ์‹œ clearSession โ†’ saveAdminApiEnvironment ์ˆœ์„œ๋กœ ์ฒ˜๋ฆฌํ•ด์•ผ ์ƒˆ ํ™˜๊ฒฝ ๊ฐ’์ด ์œ ์ง€๋œ๋‹ค.
* ์ดํ›„ react-query ์บ์‹œ ๋“ฑ ๋ฉ”๋ชจ๋ฆฌ ์ƒํƒœ๋ฅผ ํ™•์‹คํžˆ ๋น„์šฐ๊ธฐ ์œ„ํ•ด ์ „์ฒด ํŽ˜์ด์ง€ ์ด๋™์œผ๋กœ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธํ•œ๋‹ค.
* ์–ด๋“œ๋ฏผ API ํ™˜๊ฒฝ(stage/prod)์„ ์ „ํ™˜ํ•œ๋‹ค. ์„ธ์…˜(access token)์„ ์ •๋ฆฌํ•œ ๋’ค ์ƒˆ ํ™˜๊ฒฝ ๊ฐ’์„ ์ €์žฅํ•˜๊ณ ,
* react-query ์บ์‹œ ๋“ฑ ๋ฉ”๋ชจ๋ฆฌ ์ƒํƒœ๋ฅผ ํ™•์‹คํžˆ ๋น„์šฐ๊ธฐ ์œ„ํ•ด ์ „์ฒด ํŽ˜์ด์ง€ ์ด๋™์œผ๋กœ ๋ฆฌ๋‹ค์ด๋ ‰ํŠธํ•œ๋‹ค.
* redirect๋Š” ํ…Œ์ŠคํŠธ์—์„œ ์ฃผ์ž…ํ•  ์ˆ˜ ์žˆ๋„๋ก ๋งค๊ฐœ๋ณ€์ˆ˜๋กœ ๋ถ„๋ฆฌํ–ˆ๋‹ค.
*/
export const switchAdminApiEnvironment = (
Expand Down
9 changes: 0 additions & 9 deletions apps/admin/src/lib/utils/localStorage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
loadAccessToken,
loadAdminApiEnvironment,
removeAccessToken,
removeAdminApiEnvironment,
saveAccessToken,
saveAdminApiEnvironment,
} from "./localStorage";
Expand Down Expand Up @@ -55,14 +54,6 @@ describe("์–ด๋“œ๋ฏผ API ํ™˜๊ฒฝ localStorage ์ €์žฅ", () => {
expect(loadAdminApiEnvironment()).toBe("prod");
});

it("ํ™˜๊ฒฝ ๊ฐ’์„ ์ œ๊ฑฐํ•œ๋‹ค", () => {
saveAdminApiEnvironment("stage");

removeAdminApiEnvironment();

expect(loadAdminApiEnvironment()).toBeNull();
});

it("๋ ˆ๊ฑฐ์‹œ ๊ฐ’ 'dev'๋Š” 'stage'๋กœ ํ•ด์„ํ•œ๋‹ค", () => {
localStorage.setItem(ADMIN_API_ENVIRONMENT_KEY, "dev");

Expand Down
8 changes: 0 additions & 8 deletions apps/admin/src/lib/utils/localStorage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,3 @@ export const saveAdminApiEnvironment = (environment: AdminApiEnvironment) => {
console.error("Could not save admin api environment", err);
}
};

export const removeAdminApiEnvironment = () => {
try {
localStorage.removeItem(ADMIN_API_ENVIRONMENT_KEY);
} catch (err) {
console.error("Could not remove admin api environment", err);
}
};
Loading