From e1b1b57b6bfcd18ba4daa44230e8a915b4e93a15 Mon Sep 17 00:00:00 2001 From: joonhoekim <26rote@gmail.com> Date: Tue, 22 Jul 2025 03:45:58 +0000 Subject: (김준회) knox 동기화 로직 개선 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/knox-api/approval/approval.ts | 122 +++++++++------------ lib/knox-api/common.ts | 43 ++++++++ lib/knox-api/employee/employee.ts | 34 ++---- .../realtime-notification/realtime-notification.ts | 20 +--- 4 files changed, 107 insertions(+), 112 deletions(-) create mode 100644 lib/knox-api/common.ts (limited to 'lib/knox-api') diff --git a/lib/knox-api/approval/approval.ts b/lib/knox-api/approval/approval.ts index 6a21e113..75066478 100644 --- a/lib/knox-api/approval/approval.ts +++ b/lib/knox-api/approval/approval.ts @@ -1,5 +1,7 @@ "use server" +import { getKnoxConfig, createJsonHeaders, createFormHeaders } from '../common'; + // Knox API Approval 서버 액션들 // 가이드: lib/knox-api/approval/guide.html @@ -63,8 +65,8 @@ export interface ApprovalDetailResponse extends BaseResponse { status: string; // 암호화실패(-3), 암호화중(-2), 예약상신(-1), 보류(0), 진행중(1), 완결(2), 반려(3), 상신취소(4), 전결(5), 후완결(6) timeZone: string; subject: string; - aplns: any[]; - attachments?: any[]; + aplns: ApprovalLine[]; + attachments?: File[]; }; } @@ -100,27 +102,27 @@ export interface CancelApprovalResponse extends BaseResponse { // 개인 결재경로 목록 조회 응답 타입 export interface OwnApprovalLineListResponse extends BaseResponse { - data: any[]; + data: ApprovalLine[]; } // 개인 결재경로 상세 조회 응답 타입 export interface OwnApprovalLineDetailResponse extends BaseResponse { - data: any; + data: ApprovalLine; } // 상신함 리스트 조회 응답 타입 export interface SubmissionListResponse extends BaseResponse { - data: any[]; + data: SubmitApprovalRequest[]; } // 연계 이력 조회 응답 타입 export interface ApprovalHistoryResponse extends BaseResponse { - data: any[]; + data: SubmitApprovalRequest[]; } // 연계 ID 조회 응답 타입 export interface ApprovalIdsResponse extends BaseResponse { - data: any[]; + data: string[]; } // ========== 서버 액션 함수들 ========== @@ -130,10 +132,10 @@ export interface ApprovalIdsResponse extends BaseResponse { * POST /approval/api/v2.0/approvals/submit */ export async function submitApproval( - request: SubmitApprovalRequest, - systemId: string + request: SubmitApprovalRequest ): Promise { try { + const config = await getKnoxConfig(); const formData = new FormData(); // JSON 데이터 생성 @@ -162,11 +164,9 @@ export async function submitApproval( }); } - const response = await fetch(`${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/submit`, { + const response = await fetch(`${config.baseUrl}/approval/api/v2.0/approvals/submit`, { method: 'POST', - headers: { - 'System-ID': systemId, - }, + headers: await createFormHeaders(), body: formData, }); @@ -186,10 +186,10 @@ export async function submitApproval( * POST /approval/api/v2.0/approvals/secu-submit */ export async function submitSecurityApproval( - request: SubmitApprovalRequest, - systemId: string + request: SubmitApprovalRequest ): Promise { try { + const config = await getKnoxConfig(); const formData = new FormData(); // JSON 데이터 생성 @@ -218,11 +218,9 @@ export async function submitSecurityApproval( }); } - const response = await fetch(`${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/secu-submit`, { + const response = await fetch(`${config.baseUrl}/approval/api/v2.0/approvals/secu-submit`, { method: 'POST', - headers: { - 'System-ID': systemId, - }, + headers: await createFormHeaders(), body: formData, }); @@ -242,15 +240,13 @@ export async function submitSecurityApproval( * GET /approval/api/v2.0/approvals/{apInfId}/detail */ export async function getApprovalDetail( - apInfId: string, - systemId: string + apInfId: string ): Promise { try { - const response = await fetch(`${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/${apInfId}/detail`, { + const config = await getKnoxConfig(); + const response = await fetch(`${config.baseUrl}/approval/api/v2.0/approvals/${apInfId}/detail`, { method: 'GET', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -269,15 +265,13 @@ export async function getApprovalDetail( * GET /approval/api/v2.0/approvals/{apInfId}/content */ export async function getApprovalContent( - apInfId: string, - systemId: string + apInfId: string ): Promise { try { - const response = await fetch(`${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/${apInfId}/content`, { + const config = await getKnoxConfig(); + const response = await fetch(`${config.baseUrl}/approval/api/v2.0/approvals/${apInfId}/content`, { method: 'GET', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -296,16 +290,13 @@ export async function getApprovalContent( * POST /approval/api/v2.0/approvals/status */ export async function getApprovalStatus( - request: ApprovalStatusRequest, - systemId: string + request: ApprovalStatusRequest ): Promise { try { - const response = await fetch(`${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/status`, { + const config = await getKnoxConfig(); + const response = await fetch(`${config.baseUrl}/approval/api/v2.0/approvals/status`, { method: 'POST', - headers: { - 'System-ID': systemId, - 'Content-Type': 'application/json', - }, + headers: await createJsonHeaders(), body: JSON.stringify(request.apinfids), }); @@ -325,11 +316,11 @@ export async function getApprovalStatus( * GET /approval/api/v2.0/approvals/apinfids */ export async function getApprovalIds( - systemId: string, apIds?: string[] ): Promise { try { - let url = `${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/apinfids`; + const config = await getKnoxConfig(); + let url = `${config.baseUrl}/approval/api/v2.0/approvals/apinfids`; if (apIds && apIds.length > 0) { const params = new URLSearchParams(); @@ -339,9 +330,7 @@ export async function getApprovalIds( const response = await fetch(url, { method: 'GET', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -360,11 +349,11 @@ export async function getApprovalIds( * GET /approval/api/v2.0/approvals/submission */ export async function getSubmissionList( - systemId: string, params?: Record ): Promise { try { - let url = `${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/submission`; + const config = await getKnoxConfig(); + let url = `${config.baseUrl}/approval/api/v2.0/approvals/submission`; if (params) { const searchParams = new URLSearchParams(params); @@ -373,9 +362,7 @@ export async function getSubmissionList( const response = await fetch(url, { method: 'GET', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -394,11 +381,11 @@ export async function getSubmissionList( * GET /approval/api/v2.0/approvals/apinfidinfos */ export async function getApprovalHistory( - systemId: string, params?: Record ): Promise { try { - let url = `${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/apinfidinfos`; + const config = await getKnoxConfig(); + let url = `${config.baseUrl}/approval/api/v2.0/approvals/apinfidinfos`; if (params) { const searchParams = new URLSearchParams(params); @@ -407,9 +394,7 @@ export async function getApprovalHistory( const response = await fetch(url, { method: 'GET', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -428,15 +413,13 @@ export async function getApprovalHistory( * POST /approval/api/v2.0/approvals/{apInfId}/cancel */ export async function cancelApproval( - apInfId: string, - systemId: string + apInfId: string ): Promise { try { - const response = await fetch(`${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/${apInfId}/cancel`, { + const config = await getKnoxConfig(); + const response = await fetch(`${config.baseUrl}/approval/api/v2.0/approvals/${apInfId}/cancel`, { method: 'POST', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -455,11 +438,11 @@ export async function cancelApproval( * GET /approval/api/v2.0/approvals/ownaplnlist */ export async function getOwnApprovalLineList( - systemId: string, params?: Record ): Promise { try { - let url = `${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/ownaplnlist`; + const config = await getKnoxConfig(); + let url = `${config.baseUrl}/approval/api/v2.0/approvals/ownaplnlist`; if (params) { const searchParams = new URLSearchParams(params); @@ -468,9 +451,7 @@ export async function getOwnApprovalLineList( const response = await fetch(url, { method: 'GET', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -489,15 +470,13 @@ export async function getOwnApprovalLineList( * GET /approval/api/v2.0/approvals/{pslAplnId}/ownaplndetail */ export async function getOwnApprovalLineDetail( - pslAplnId: string, - systemId: string + pslAplnId: string ): Promise { try { - const response = await fetch(`${process.env.KNOX_API_BASE_URL}/approval/api/v2.0/approvals/${pslAplnId}/ownaplndetail`, { + const config = await getKnoxConfig(); + const response = await fetch(`${config.baseUrl}/approval/api/v2.0/approvals/${pslAplnId}/ownaplndetail`, { method: 'GET', - headers: { - 'System-ID': systemId, - }, + headers: await createJsonHeaders(), }); if (!response.ok) { @@ -522,9 +501,10 @@ export async function createSubmitApprovalRequest( approvalLines: ApprovalLine[], options: Partial = {} ): Promise { + const config = await getKnoxConfig(); const now = new Date(); const sbmDt = now.toISOString().replace(/[-:T]/g, '').slice(0, 14); - const apInfId = `${process.env.KNOX_SYSTEM_ID || 'DEFAULT'}${sbmDt}${Math.random().toString(36).substr(2, 9)}`.padEnd(32, '0'); + const apInfId = `${config.systemId}${sbmDt}${Math.random().toString(36).substr(2, 9)}`.padEnd(32, '0'); return { contents, diff --git a/lib/knox-api/common.ts b/lib/knox-api/common.ts new file mode 100644 index 00000000..4c037e56 --- /dev/null +++ b/lib/knox-api/common.ts @@ -0,0 +1,43 @@ +"use server" + +// Knox API 공통 설정 및 유틸리티 + +// 기본 설정 타입 +export interface KnoxConfig { + baseUrl: string; + systemId: string; + bearerToken: string; +} + +// 설정 가져오기 (환경변수 또는 설정에서) +export const getKnoxConfig = async (): Promise => { + return { + baseUrl: process.env.KNOX_API_BASE_URL || 'https://openapi.samsung.net', + systemId: process.env.KNOX_SYSTEM_ID || 'KCD60REST00046', + bearerToken: process.env.KNOX_API_BEARER || '', + }; +}; + +// 공통 헤더 생성 +export const createHeaders = async (contentType: string = 'application/json'): Promise> => { + const config = await getKnoxConfig(); + return { + 'Content-Type': contentType, + 'System-ID': config.systemId, + Authorization: `Bearer ${config.bearerToken}`, + }; +}; + +// JSON 전용 헤더 +export const createJsonHeaders = async (): Promise> => { + return await createHeaders('application/json'); +}; + +// FormData 전용 헤더 (Content-Type 자동 설정) +export const createFormHeaders = async (): Promise> => { + const config = await getKnoxConfig(); + return { + 'System-ID': config.systemId, + Authorization: `Bearer ${config.bearerToken}`, + }; +}; \ No newline at end of file diff --git a/lib/knox-api/employee/employee.ts b/lib/knox-api/employee/employee.ts index 885b5a3f..d9e66555 100644 --- a/lib/knox-api/employee/employee.ts +++ b/lib/knox-api/employee/employee.ts @@ -1,12 +1,8 @@ "use server" -// Knox API 임직원 관련 서버 액션들 +import { getKnoxConfig, createJsonHeaders } from '../common'; -// 기본 설정 타입 -interface KnoxConfig { - baseUrl: string; - systemId: string; -} +// Knox API 임직원 관련 서버 액션들 // 공통 응답 타입 interface BaseResponse { @@ -184,28 +180,14 @@ interface TitleResponse extends BaseResponse { titles: Title[]; } -// 설정 가져오기 (환경변수 또는 설정에서) -const getKnoxConfig = (): KnoxConfig => { - return { - baseUrl: process.env.KNOX_API_BASE_URL || "https://api.knox.samsung.com", - systemId: process.env.KNOX_SYSTEM_ID || "C60REST0001" - }; -}; -// 공통 헤더 생성 -const createHeaders = (systemId: string): Record => { - return { - "Content-Type": "application/json", - "System-ID": systemId - }; -}; /** * 임직원 조회 API * POST /employee/api/v2.0/employees */ export async function searchEmployees(params: EmployeeSearchParams): Promise { - const config = getKnoxConfig(); + const config = await getKnoxConfig(); try { // URL 파라미터 구성 @@ -232,7 +214,7 @@ export async function searchEmployees(params: EmployeeSearchParams): Promise { - const config = getKnoxConfig(); + const config = await getKnoxConfig(); try { // URL 파라미터 구성 @@ -270,7 +252,7 @@ export async function searchOrganizations(params: OrganizationSearchParams): Pro `${config.baseUrl}/employee/api/v2.0/organizations?${searchParams.toString()}`, { method: "GET", - headers: createHeaders(config.systemId) + headers: await createJsonHeaders() } ); @@ -291,7 +273,7 @@ export async function searchOrganizations(params: OrganizationSearchParams): Pro * GET /employee/api/v2.0/titles */ export async function searchTitles(params: TitleSearchParams): Promise { - const config = getKnoxConfig(); + const config = await getKnoxConfig(); try { // URL 파라미터 구성 @@ -302,7 +284,7 @@ export async function searchTitles(params: TitleSearchParams): Promise { - const baseUrl = process.env.KNOX_API_BASE_URL - const systemId = process.env.KNOX_SYSTEM_ID - - if (!baseUrl || !systemId) { - throw new Error("Knox API configuration missing: KNOX_API_BASE_URL and KNOX_SYSTEM_ID are required") - } - - return { baseUrl, systemId } -} + /** * Knox Suite 실시간 토스트 알림 전송 @@ -95,13 +86,12 @@ export async function sendNotification( // 요청 데이터 검증 const validatedRequest = NotificationRequestSchema.parse(request) - const { baseUrl, systemId } = getApiConfig() + const config = await getKnoxConfig() - const response = await fetch(`${baseUrl}/notification/api/v2.0/sendnotification`, { + const response = await fetch(`${config.baseUrl}/notification/api/v2.0/sendnotification`, { method: "POST", headers: { - "Content-Type": "application/json", - "System-ID": systemId, + ...(await createJsonHeaders()), "hint": validatedRequest.exActionsVO.hint || "multibrowser", }, body: JSON.stringify(validatedRequest), -- cgit v1.2.3