Merge pull request '261007_01_ENH: 메시지 API contact-back 경유 전환, 발송 경로 변경 및 발신 이메일 형식 검증 추가' (#46) from develop into master

Reviewed-on: #46
This commit is contained in:
2026-10-07 11:55:57 +09:00
11 changed files with 44 additions and 51 deletions

View File

@@ -4,7 +4,6 @@ NEXT_PUBLIC_API_BASE=https://test-contact.kric.com/api
ENV=dev ENV=dev
CONTACT_SERVER=http://127.0.0.1:4001 CONTACT_SERVER=http://127.0.0.1:4001
API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1
API_NOTIHUB_SERVER=https://noti-hub.kric.com/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
API_KART_SERVER=https://rapi.kric.com/api/v1 API_KART_SERVER=https://rapi.kric.com/api/v1
KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230 KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230

View File

@@ -4,8 +4,6 @@ NEXT_PUBLIC_API_BASE=http://localhost:4000/api
ENV=local ENV=local
CONTACT_SERVER=http://localhost:4001 CONTACT_SERVER=http://localhost:4001
API_CONTACT_SERVER=http://localhost:4001/api/v1 API_CONTACT_SERVER=http://localhost:4001/api/v1
API_NOTIHUB_SERVER=https://noti-hub.kric.com/api/v1
#API_NOTIHUB_SERVER=http://localhost:4011/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
API_KART_SERVER=https://rapi.kric.com/api/v1 API_KART_SERVER=https://rapi.kric.com/api/v1
KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230 KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230

View File

@@ -4,7 +4,6 @@ NEXT_PUBLIC_API_BASE=https://contact.kric.com/api
ENV=prod ENV=prod
CONTACT_SERVER=http://127.0.0.1:4001 CONTACT_SERVER=http://127.0.0.1:4001
API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1
API_NOTIHUB_SERVER=https://noti-hub.kric.com/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
API_KART_SERVER=https://rapi.kric.com/api/v1 API_KART_SERVER=https://rapi.kric.com/api/v1
KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230 KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230

View File

@@ -1,6 +1,6 @@
import {NextRequest, NextResponse} from "next/server"; import {NextRequest, NextResponse} from "next/server";
import {RouteContext} from "@/types/common"; import {RouteContext} from "@/types/common";
import {createNotihubApi} from "@/lib/http-server"; import {createContactApi} from "@/lib/http-server";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
import type {FileResponse, PageRequest, PageResponse} from "@kri/common"; import type {FileResponse, PageRequest, PageResponse} from "@kri/common";
import type {BulkSendInfo, SendResultSummaryRequest, SendResultSummaryResponse} from "@kri/common/noti-hub"; import type {BulkSendInfo, SendResultSummaryRequest, SendResultSummaryResponse} from "@kri/common/noti-hub";
@@ -10,11 +10,11 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
try { try {
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action, sendTy, reqstSvc, prjctCd] = slug; const [action, sendTy, reqstSvc, prjctCd] = slug;
const notihubApi = await createNotihubApi(); const contactApi = await createContactApi();
if (action === "bulk-list" && sendTy && reqstSvc && prjctCd) { if (action === "bulk-list" && sendTy && reqstSvc && prjctCd) {
const result = await notihubApi.get<BulkSendInfo[]>( const result = await contactApi.get<BulkSendInfo[]>(
`/report/bulk-list/${sendTy}/${reqstSvc}/${prjctCd}`, `/message-report/bulk-list/${sendTy}/${reqstSvc}/${prjctCd}`,
); );
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});
} }
@@ -23,8 +23,8 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
const [, sid, prjctCdParam, reqstSvcParam] = slug; const [, sid, prjctCdParam, reqstSvcParam] = slug;
const channelTy = req.nextUrl.searchParams.get("channelTy"); const channelTy = req.nextUrl.searchParams.get("channelTy");
const query = channelTy ? `?channelTy=${channelTy}` : ""; const query = channelTy ? `?channelTy=${channelTy}` : "";
const result = await notihubApi.get<SendResultInfo[]>( const result = await contactApi.get<SendResultInfo[]>(
`/report/send-result/${encodeURIComponent(sid)}/${prjctCdParam}/${reqstSvcParam}${query}`, `/message-report/send-result/${encodeURIComponent(sid)}/${prjctCdParam}/${reqstSvcParam}${query}`,
); );
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});
} }
@@ -39,7 +39,7 @@ export const POST = async (req: NextRequest, context: RouteContext) => {
try { try {
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action, bulkSendKey] = slug; const [action, bulkSendKey] = slug;
const notihubApi = await createNotihubApi(); const contactApi = await createContactApi();
if (action === "bulk-detail" && bulkSendKey) { if (action === "bulk-detail" && bulkSendKey) {
const body: PageRequest | null = await req.json().catch(() => null); const body: PageRequest | null = await req.json().catch(() => null);
@@ -47,16 +47,16 @@ export const POST = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json({message: "요청 바디가 없습니다."}, {status: 400}); return NextResponse.json({message: "요청 바디가 없습니다."}, {status: 400});
} }
const result = await notihubApi.post<PageResponse<SendResultInfo>>( const result = await contactApi.post<PageResponse<SendResultInfo>>(
`/report/bulk-detail/${bulkSendKey}`, `/message-report/bulk-detail/${bulkSendKey}`,
body, body,
); );
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});
} }
if (action === "bulk-detail-excel" && bulkSendKey) { if (action === "bulk-detail-excel" && bulkSendKey) {
const result = await notihubApi.post<FileResponse>( const result = await contactApi.post<FileResponse>(
`/report/bulk-detail/excel/${bulkSendKey}`, `/message-report/bulk-detail-excel/${bulkSendKey}`,
undefined, undefined,
); );
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});
@@ -68,8 +68,8 @@ export const POST = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json({message: "요청 바디가 없습니다."}, {status: 400}); return NextResponse.json({message: "요청 바디가 없습니다."}, {status: 400});
} }
const result = await notihubApi.post<SendResultSummaryResponse[]>( const result = await contactApi.post<SendResultSummaryResponse[]>(
`/report/send-result-summary`, `/message-report/send-result-summary`,
body, body,
); );
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});

View File

@@ -22,12 +22,12 @@ export const POST = async (req: NextRequest, context: RouteContext) => {
} }
if (action === "single") { if (action === "single") {
const result = await contactApi.post<SendSingleResponse>(`/message/${channel}/single/${prjctIdx}`, body); const result = await contactApi.post<SendSingleResponse>(`/message-send/${channel}/single/${prjctIdx}`, body);
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});
} }
if (action === "bulk") { if (action === "bulk") {
const result = await contactApi.post<MessageBulkSendResponse>(`/message/${channel}/bulk/${prjctIdx}`, body); const result = await contactApi.post<MessageBulkSendResponse>(`/message-send/${channel}/bulk/${prjctIdx}`, body);
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});
} }

View File

@@ -1,6 +1,6 @@
import {NextRequest, NextResponse} from "next/server"; import {NextRequest, NextResponse} from "next/server";
import {RouteContext} from "@/types/common"; import {RouteContext} from "@/types/common";
import {createNotihubApi} from "@/lib/http-server"; import {createContactApi} from "@/lib/http-server";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
import type { Template, TemplateSummary } from "@kri/common/noti-hub"; import type { Template, TemplateSummary } from "@kri/common/noti-hub";
@@ -9,7 +9,7 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
const { searchParams } = new URL(req.url); const { searchParams } = new URL(req.url);
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug; const [action] = slug;
const notihubApi = await createNotihubApi(); const contactApi = await createContactApi();
if(slug.length === 2 && slug[1] === "attachment"){ if(slug.length === 2 && slug[1] === "attachment"){
const fileName = searchParams.get("fileName"); const fileName = searchParams.get("fileName");
@@ -17,23 +17,23 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json({ message: "fileName은 필수입니다." }, { status: 400 }); return NextResponse.json({ message: "fileName은 필수입니다." }, { status: 400 });
} }
const result = await notihubApi.get<ArrayBuffer>( const result = await contactApi.get<ArrayBuffer>(
`/template/${slug[0]}/attachment?fileName=${encodeURIComponent(fileName)}`, `/message-template/${slug[0]}/attachment?fileName=${encodeURIComponent(fileName)}`,
{ expectBinary: true }, { expectBinary: true },
); );
return new NextResponse(result, { status: 200, headers: { "Content-Type": "application/octet-stream" } }); return new NextResponse(result, { status: 200, headers: { "Content-Type": "application/octet-stream" } });
} }
if(slug.length === 1){ if(slug.length === 1){
const result = await notihubApi.get<Template>( const result = await contactApi.get<Template>(
`/template/${slug[0]}`, `/message-template/${slug[0]}`,
); );
return NextResponse.json(result, { status: 200 }); return NextResponse.json(result, { status: 200 });
} }
if(action === "list" && slug.length === 3){ if(action === "list" && slug.length === 3){
const result = await notihubApi.get<TemplateSummary[]>( const result = await contactApi.get<TemplateSummary[]>(
`/template/list/${slug[1]}/${slug[2]}`, `/message-template/list/${slug[1]}/${slug[2]}`,
); );
return NextResponse.json(result, { status: 200 }); return NextResponse.json(result, { status: 200 });
} }
@@ -49,7 +49,7 @@ export const PUT = async (req: NextRequest, context: RouteContext) => {
const { searchParams } = new URL(req.url); const { searchParams } = new URL(req.url);
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug; const [action] = slug;
const notihubApi = await createNotihubApi(); const contactApi = await createContactApi();
if(action === "body-image" && slug.length === 2){ if(action === "body-image" && slug.length === 2){
const itrntPrjctCd = slug[1]; const itrntPrjctCd = slug[1];
@@ -64,8 +64,8 @@ export const PUT = async (req: NextRequest, context: RouteContext) => {
); );
} }
const result = await notihubApi.putForm<string>( const result = await contactApi.putForm<string>(
`/template/body-image/${itrntPrjctCd}`, `/message-template/body-image/${itrntPrjctCd}`,
formData formData
); );
@@ -81,7 +81,7 @@ export const PUT = async (req: NextRequest, context: RouteContext) => {
); );
} }
const result = await notihubApi.putForm<Template>(`/template`, formData); const result = await contactApi.putForm<Template>(`/message-template`, formData);
return NextResponse.json(result, { status: 200 }); return NextResponse.json(result, { status: 200 });
} }
@@ -96,7 +96,7 @@ export const PATCH = async (req: NextRequest, context: RouteContext) => {
const { searchParams } = new URL(req.url); const { searchParams } = new URL(req.url);
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug; const [action] = slug;
const notihubApi = await createNotihubApi(); const contactApi = await createContactApi();
if(!action){ if(!action){
const formData = await req.formData().catch(() => null); const formData = await req.formData().catch(() => null);
@@ -107,7 +107,7 @@ export const PATCH = async (req: NextRequest, context: RouteContext) => {
); );
} }
const result = await notihubApi.request<Template>(`/template`, { method: "PATCH", form: formData }); const result = await contactApi.request<Template>(`/message-template`, { method: "PATCH", form: formData });
return NextResponse.json(result, { status: 200 }); return NextResponse.json(result, { status: 200 });
} }

View File

@@ -33,7 +33,7 @@ import { downloadFile } from "@kri/common/browser";
import {cn} from "@/lib/utils"; import {cn} from "@/lib/utils";
import {ProjectMainTemplateUpdateRequest, ProjectSurvey} from "@/types/project"; import {ProjectMainTemplateUpdateRequest, ProjectSurvey} from "@/types/project";
import type { DataVerification } from "@kri/common"; import type { DataVerification } from "@kri/common";
import {COMMON_TEXT_REGEX} from "@/const/validationConst"; import {COMMON_TEXT_REGEX, EMAIL_REGEX} from "@/const/validationConst";
import {formatKoreanPhoneNumber} from "@/utils/phone"; import {formatKoreanPhoneNumber} from "@/utils/phone";
import type { import type {
TemplateAttachmentImage, TemplateAttachmentImage,
@@ -260,6 +260,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
if (isBlank(tpl.sendEml)) return fail("sendEml", "발신 이메일을 입력해 주세요."); if (isBlank(tpl.sendEml)) return fail("sendEml", "발신 이메일을 입력해 주세요.");
if (tpl.sendEml.length > 64) return fail("sendEml", "발신 이메일은 64자 이하로 입력해주세요."); if (tpl.sendEml.length > 64) return fail("sendEml", "발신 이메일은 64자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.sendEml)) return fail("sendEml", "발신 이메일에 허용되지 않는 문자가 포함되어 있습니다."); if (!COMMON_TEXT_REGEX.test(tpl.sendEml)) return fail("sendEml", "발신 이메일에 허용되지 않는 문자가 포함되어 있습니다.");
if (!EMAIL_REGEX.test(tpl.sendEml)) return fail("sendEml", "발신 이메일 형식이 올바르지 않습니다.");
return ok(); return ok();
} }

View File

@@ -6,6 +6,9 @@
// 그 외 문자(이모지, 다른 언어 문자, 제어문자 등)는 전부 거부한다. // 그 외 문자(이모지, 다른 언어 문자, 제어문자 등)는 전부 거부한다.
export const COMMON_TEXT_REGEX = /^[가-힣A-Za-z0-9 !@#$%^&*()_+\-={}\[\]:;"'<>,.?/·~]+$/ export const COMMON_TEXT_REGEX = /^[가-힣A-Za-z0-9 !@#$%^&*()_+\-={}\[\]:;"'<>,.?/·~]+$/
// 이메일 기본 형식(로컬@도메인.최상위도메인)만 확인한다. 세부 규칙은 백엔드 검증을 따른다.
export const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
// 한글/영문으로 시작하고, 한글/영문/숫자/언더스코어/공백/괄호만 허용 // 한글/영문으로 시작하고, 한글/영문/숫자/언더스코어/공백/괄호만 허용
export const USER_NAME_REGEX = /^[가-힣A-Za-z][가-힣A-Za-z0-9_ ()]*$/ export const USER_NAME_REGEX = /^[가-힣A-Za-z][가-힣A-Za-z0-9_ ()]*$/

View File

@@ -9,8 +9,6 @@ export const serverEnv = createEnv({
API_CONTACT_SERVER: env.required("API_CONTACT_SERVER", process.env.API_CONTACT_SERVER), API_CONTACT_SERVER: env.required("API_CONTACT_SERVER", process.env.API_CONTACT_SERVER),
API_NOTIHUB_SERVER: env.required("API_NOTIHUB_SERVER", process.env.API_NOTIHUB_SERVER),
API_INTRANET_SERVER: env.required("API_INTRANET_SERVER", process.env.API_INTRANET_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), API_KART_SERVER: env.required("API_KART_SERVER", process.env.API_KART_SERVER),

View File

@@ -28,11 +28,6 @@ export const createContactApiWithApiKey = (apiKey: string) => {
}); });
}; };
//Todo: Front에서 바로 붙지 말고 Backend를 통해서 처리 하도록 수정 필요
export const createNotihubApi = () => {
return createServerApi(serverEnv.API_NOTIHUB_SERVER);
};
//Todo: Front에서 바로 붙지 말고 Backend를 통해서 처리 하도록 수정 필요 //Todo: Front에서 바로 붙지 말고 Backend를 통해서 처리 하도록 수정 필요
export const createIntranetApi = () => { export const createIntranetApi = () => {
return createServerApi(serverEnv.API_INTRANET_SERVER); return createServerApi(serverEnv.API_INTRANET_SERVER);

View File

@@ -88,7 +88,7 @@ export function useSaveTemplateMutation(chnnlTy: ChannelType, itrntPrjctCd: stri
} }
/** /**
* 템플릿 첨부파일 단건 다운로드 (GET /template/{tmplatIdx}/attachment?fileName=...) * 템플릿 첨부파일 단건 다운로드 (GET /message-template/{tmplatIdx}/attachment?fileName=...)
*/ */
export function useDownloadTemplateAttachmentMutation(tmplatIdx: number) { export function useDownloadTemplateAttachmentMutation(tmplatIdx: number) {
return useMutation({ return useMutation({
@@ -165,7 +165,7 @@ export function useUploadTemplateBodyImageMutation(itrntPrjctCd: string) {
} }
/** /**
* 대량발송 리스트 조회 (GET /report/bulk-list/{sendTy}/{reqstSvc}/{prjctCd}) * 대량발송 리스트 조회 (GET /message-report/bulk-list/{sendTy}/{reqstSvc}/{prjctCd})
*/ */
export function useBulkSendListQuery(sendTy: number, reqstSvc: string, prjctCd: string, enabled: boolean) { export function useBulkSendListQuery(sendTy: number, reqstSvc: string, prjctCd: string, enabled: boolean) {
return useQuery({ return useQuery({
@@ -179,7 +179,7 @@ export function useBulkSendListQuery(sendTy: number, reqstSvc: string, prjctCd:
} }
/** /**
* 대량발송 상세 결과 조회 (POST /report/bulk-detail/{bulkSendKey}) * 대량발송 상세 결과 조회 (POST /message-report/bulk-detail/{bulkSendKey})
*/ */
export function useBulkSendDetailQuery(bulkSendKey: string, pageRequest: PageRequest, enabled: boolean) { export function useBulkSendDetailQuery(bulkSendKey: string, pageRequest: PageRequest, enabled: boolean) {
return useQuery({ return useQuery({
@@ -193,7 +193,7 @@ export function useBulkSendDetailQuery(bulkSendKey: string, pageRequest: PageReq
} }
/** /**
* 대량발송 결과 엑셀 다운로드 (POST /report/bulk-detail/excel/{bulkSendKey}) * 대량발송 결과 엑셀 다운로드 (POST /message-report/bulk-detail-excel/{bulkSendKey})
*/ */
export function useBulkSendDetailExcelMutation() { export function useBulkSendDetailExcelMutation() {
return useMutation({ return useMutation({
@@ -203,7 +203,7 @@ export function useBulkSendDetailExcelMutation() {
} }
/** /**
* 발송 결과 축약 조회 (POST /report/send-result-summary) * 발송 결과 축약 조회 (POST /message-report/send-result-summary)
*/ */
export function useSendResultSummaryQuery(request: SendResultSummaryRequest, enabled: boolean) { export function useSendResultSummaryQuery(request: SendResultSummaryRequest, enabled: boolean) {
return useQuery({ return useQuery({
@@ -216,14 +216,14 @@ export function useSendResultSummaryQuery(request: SendResultSummaryRequest, ena
} }
/** /**
* 단건 발송 (POST /message/{channel}/single/{prjctIdx}, contactServer 경유) * 단건 발송 (POST /message-send/{channel}/single/{prjctIdx}, contactServer 경유)
*/ */
export function useSendSingleMessageMutation(channel: MessageSendChannel, prjctIdx: number) { export function useSendSingleMessageMutation(channel: MessageSendChannel, prjctIdx: number) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: (req: MessageSendSingleRequest) => mutationFn: (req: MessageSendSingleRequest) =>
nextApi.post<SendSingleResponse>(`/message/${channel}/single/${prjctIdx}`, req), nextApi.post<SendSingleResponse>(`/message-send/${channel}/single/${prjctIdx}`, req),
onSuccess: (_data, req) => { onSuccess: (_data, req) => {
queryClient.invalidateQueries({ queryKey: ["message-report", "send-result", String(req.sid)] }); queryClient.invalidateQueries({ queryKey: ["message-report", "send-result", String(req.sid)] });
}, },
@@ -231,17 +231,17 @@ export function useSendSingleMessageMutation(channel: MessageSendChannel, prjctI
} }
/** /**
* 대량 발송 (POST /message/{channel}/bulk/{prjctIdx}, contactServer 경유) * 대량 발송 (POST /message-send/{channel}/bulk/{prjctIdx}, contactServer 경유)
*/ */
export function useSendBulkMessageMutation(channel: MessageSendChannel, prjctIdx: number) { export function useSendBulkMessageMutation(channel: MessageSendChannel, prjctIdx: number) {
return useMutation({ return useMutation({
mutationFn: (req: MessageSendBulkRequest) => mutationFn: (req: MessageSendBulkRequest) =>
nextApi.post<MessageBulkSendResponse>(`/message/${channel}/bulk/${prjctIdx}`, req), nextApi.post<MessageBulkSendResponse>(`/message-send/${channel}/bulk/${prjctIdx}`, req),
}); });
} }
/** /**
* SID 단위 발송 결과 목록 조회 (GET /report/send-result/{sid}/{prjctCd}/{reqstSvc}) * SID 단위 발송 결과 목록 조회 (GET /message-report/send-result/{sid}/{prjctCd}/{reqstSvc})
*/ */
export function useSendResultBySidQuery( export function useSendResultBySidQuery(
sid: string, sid: string,