diff --git a/.env.development b/.env.development
index 747ab96..82c4f5a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,5 +5,3 @@ ENV=dev
CONTACT_SERVER=http://127.0.0.1:4001
API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
-API_KART_SERVER=https://rapi.kric.com/api/v1
-KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230
\ No newline at end of file
diff --git a/.env.local b/.env.local
index 9df2538..8cacaa8 100644
--- a/.env.local
+++ b/.env.local
@@ -5,5 +5,3 @@ ENV=local
CONTACT_SERVER=http://localhost:4001
API_CONTACT_SERVER=http://localhost:4001/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
-API_KART_SERVER=https://rapi.kric.com/api/v1
-KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 0159299..d58e69e 100644
--- a/.env.production
+++ b/.env.production
@@ -5,5 +5,3 @@ ENV=prod
CONTACT_SERVER=http://127.0.0.1:4001
API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
-API_KART_SERVER=https://rapi.kric.com/api/v1
-KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230
\ No newline at end of file
diff --git a/src/app/(pages)/(main)/progress/survey/page.tsx b/src/app/(pages)/(main)/progress/survey/page.tsx
index dfc90c5..e7d4063 100644
--- a/src/app/(pages)/(main)/progress/survey/page.tsx
+++ b/src/app/(pages)/(main)/progress/survey/page.tsx
@@ -85,6 +85,15 @@ const SurveyProgressPage = () => {
)}
+ {redirectUrlEnabled && redirectUrlQuery.isError ? (
+
+ 설문 현황 링크를 불러오지 못했습니다.
+
+
+ ) : null}
+
{openedUrl ? (
새 창에서 열립니다. 열리지 않았다면{" "}
diff --git a/src/app/(pages)/(main)/project/info/page.tsx b/src/app/(pages)/(main)/project/info/page.tsx
index 563ee58..fcea01f 100644
--- a/src/app/(pages)/(main)/project/info/page.tsx
+++ b/src/app/(pages)/(main)/project/info/page.tsx
@@ -279,6 +279,14 @@ const SurveyCard = ({ survey, index, itrntPrjctCd, userTeam, invalidField, onReg
heightClassName="h-9"
widthClassName="w-full"
/>
+ {kartProjectListQuery.isError && (
+
+ 프로젝트 목록을 불러오지 못했습니다.
+
+
+ )}
)}
diff --git a/src/app/api/kart/[[...slug]]/route.ts b/src/app/api/kart/[[...slug]]/route.ts
index 1ed6241..5cb7db0 100644
--- a/src/app/api/kart/[[...slug]]/route.ts
+++ b/src/app/api/kart/[[...slug]]/route.ts
@@ -1,6 +1,6 @@
import {NextRequest, NextResponse} from "next/server";
import {RouteContext} from "@/types/common";
-import {createKartApi} from "@/lib/http-server";
+import {createContactApi} from "@/lib/http-server";
import {KonKiwiProjectInfo} from "@/types/project";
import {errorToResponse} from "@kri/common/http";
@@ -9,30 +9,39 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
const { searchParams } = new URL(req.url);
const {slug = []} = await context.params;
const [action] = slug;
- const kartApi = await createKartApi();
+ const contactApi = await createContactApi();
- if(action === "project-list" && slug.length === 4){
+ if(action === "project-list" && slug.length === 3){
const keyword = (searchParams.get("keyword") ?? "").trim();
- const result = await kartApi.get(
- `/project/list/${slug[1]}/${slug[2]}/${slug[3]}`,
- { query: keyword ? { keyword } : {} }
- );
+ const [, intranetCode, projectType] = slug;
+ if (!intranetCode.trim() || intranetCode.length > 32 || !["0", "1"].includes(projectType)) {
+ return NextResponse.json({ message: "프로젝트 정보를 확인해 주세요." }, { status: 400 });
+ }
+ const result = await contactApi.get(`/kart/project/list`, {
+ query: { intranetCode, projectType, ...(keyword ? { keyword } : {}) },
+ });
return NextResponse.json(result, { status: 200 });
}
if(action === "survey-redirect-url" && slug.length === 3){
const [, isKiwi, pkey] = slug;
+ if (!["0", "1"].includes(isKiwi)) {
+ return NextResponse.json({ message: "프로젝트 정보를 확인해 주세요." }, { status: 400 });
+ }
- const skey = await kartApi.get(`/encrypt/pkey`, {
- headers: { pkey, iskiwi: isKiwi },
- });
-
- const shortUrl = await kartApi.post(
- `/uri/short`,
- { realURI: "/Report/Current", mode: "U" },
- { headers: { skey } },
+ // Contact backend를 거쳐 KON/KIWI 현황 공유 링크를 발급한다.
+ const result = await contactApi.post(
+ `/kart/project/${isKiwi}/${encodeURIComponent(pkey)}/share`,
+ {},
+ { expectText: true },
);
+ const shortUrl = typeof result === "string" && /^https?:\/\//.test(result)
+ ? result
+ : null;
+ if (!shortUrl) {
+ return NextResponse.json({ message: "KART 공유 링크 응답을 확인해 주세요." }, { status: 502 });
+ }
return NextResponse.json(shortUrl, { status: 200 });
}
diff --git a/src/lib/env.server.ts b/src/lib/env.server.ts
index 6e4396a..ba9b650 100644
--- a/src/lib/env.server.ts
+++ b/src/lib/env.server.ts
@@ -10,8 +10,4 @@ export const serverEnv = createEnv({
API_CONTACT_SERVER: env.required("API_CONTACT_SERVER", process.env.API_CONTACT_SERVER),
API_INTRANET_SERVER: env.required("API_INTRANET_SERVER", process.env.API_INTRANET_SERVER),
-
- API_KART_SERVER: env.required("API_KART_SERVER", process.env.API_KART_SERVER),
-
- KART_API_KEY: env.required("KART_API_KEY", process.env.KART_API_KEY),
});
diff --git a/src/lib/http-server.ts b/src/lib/http-server.ts
index 851597d..fd659bd 100644
--- a/src/lib/http-server.ts
+++ b/src/lib/http-server.ts
@@ -32,10 +32,3 @@ export const createContactApiWithApiKey = (apiKey: string) => {
export const createIntranetApi = () => {
return createServerApi(serverEnv.API_INTRANET_SERVER);
};
-
-//Todo: Front에서 바로 붙지 말고 Backend를 통해서 처리 하도록 수정 필요
-export const createKartApi = () => {
- return createServerApi(serverEnv.API_KART_SERVER, {
- "X-API-Key": serverEnv.KART_API_KEY,
- });
-};
diff --git a/src/query/project.ts b/src/query/project.ts
index 611bb27..18ad9fb 100644
--- a/src/query/project.ts
+++ b/src/query/project.ts
@@ -121,8 +121,8 @@ export function useKartProjectListQuery(args: {
queryKey: qk.kartProjectList(args.itrntPrjctCd, args.userTeam, args.isKiwi, kw),
queryFn: () =>
nextApi.get(
- `/kart/project-list/${args.itrntPrjctCd}/${args.userTeam}/${args.isKiwi}`,
- { query: kw ? { keyword: kw } : {} }
+ `/kart/project-list/${encodeURIComponent(args.itrntPrjctCd)}/${args.isKiwi}`,
+ { query: kw ? { keyword: kw } : {}, skipForbiddenHandler: true }
),
enabled: args.enabled,
staleTime: 0,
@@ -137,7 +137,7 @@ export function useKartProjectListQuery(args: {
export function useSurveyRedirectUrlQuery(isKiwi: number, pkey: string, enabled: boolean) {
return useQuery({
queryKey: qk.surveyRedirectUrl(isKiwi, pkey),
- queryFn: () => nextApi.get(`/kart/survey-redirect-url/${isKiwi}/${encodeURIComponent(pkey)}`),
+ queryFn: () => nextApi.get(`/kart/survey-redirect-url/${isKiwi}/${encodeURIComponent(pkey)}`, { skipForbiddenHandler: true }),
enabled: enabled && !!pkey,
staleTime: 0,
meta: { ignoreGlobalLoading: true },