From 1af3103cded2d5eb39ac0a0615bbb522262893bf Mon Sep 17 00:00:00 2001 From: chan Date: Wed, 18 Mar 2026 12:31:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20invalid=5Freq?= =?UTF-8?q?uest=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adminfront/src/components/layout/AppLayout.tsx | 1 + devfront/src/app/routes.tsx | 2 +- devfront/src/components/layout/AppLayout.tsx | 1 + devfront/src/features/auth/authApi.ts | 1 + devfront/src/lib/apiClient.ts | 2 +- devfront/src/lib/auth.ts | 4 ++-- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/adminfront/src/components/layout/AppLayout.tsx b/adminfront/src/components/layout/AppLayout.tsx index df69e221..1c2a3f59 100644 --- a/adminfront/src/components/layout/AppLayout.tsx +++ b/adminfront/src/components/layout/AppLayout.tsx @@ -297,3 +297,4 @@ function AppLayout() { } export default AppLayout; +// force reload diff --git a/devfront/src/app/routes.tsx b/devfront/src/app/routes.tsx index 1586062e..0a8c81d8 100644 --- a/devfront/src/app/routes.tsx +++ b/devfront/src/app/routes.tsx @@ -17,7 +17,7 @@ export const router = createBrowserRouter( element: , }, { - path: "/auth/callback", + path: "/callback", element: , }, { diff --git a/devfront/src/components/layout/AppLayout.tsx b/devfront/src/components/layout/AppLayout.tsx index 64ed2759..75e81537 100644 --- a/devfront/src/components/layout/AppLayout.tsx +++ b/devfront/src/components/layout/AppLayout.tsx @@ -392,3 +392,4 @@ function AppLayout() { } export default AppLayout; +// force reload diff --git a/devfront/src/features/auth/authApi.ts b/devfront/src/features/auth/authApi.ts index 9fa27955..2c399cad 100644 --- a/devfront/src/features/auth/authApi.ts +++ b/devfront/src/features/auth/authApi.ts @@ -11,6 +11,7 @@ export interface UserProfile { email: string; name: string; role: string; + phone?: string; companyCode?: string; tenantId?: string; tenant?: Tenant; diff --git a/devfront/src/lib/apiClient.ts b/devfront/src/lib/apiClient.ts index 49b83cee..1d231cb1 100644 --- a/devfront/src/lib/apiClient.ts +++ b/devfront/src/lib/apiClient.ts @@ -29,7 +29,7 @@ apiClient.interceptors.response.use( async (error) => { if (error.response?.status === 401) { // 401 발생 시 로그인 페이지로 리다이렉트 - const isAuthPath = window.location.pathname.startsWith("/auth/callback"); + const isAuthPath = window.location.pathname.startsWith("/callback"); const isLoginPath = window.location.pathname === "/login"; const user = await userManager.getUser(); // 인증 토큰이 없는 경우에만 로그인으로 보낸다. diff --git a/devfront/src/lib/auth.ts b/devfront/src/lib/auth.ts index f424d9d9..59670a04 100644 --- a/devfront/src/lib/auth.ts +++ b/devfront/src/lib/auth.ts @@ -5,11 +5,11 @@ export const oidcConfig: AuthProviderProps = { authority: import.meta.env.VITE_OIDC_AUTHORITY || "http://localhost:5000/oidc", // Gateway Proxy URL client_id: import.meta.env.VITE_OIDC_CLIENT_ID || "devfront", - redirect_uri: `${window.location.origin}/auth/callback`, + redirect_uri: `${window.location.origin}/callback`, response_type: "code", scope: "openid offline_access profile email", // offline_access for refresh token post_logout_redirect_uri: window.location.origin, - popup_redirect_uri: `${window.location.origin}/auth/callback`, + popup_redirect_uri: `${window.location.origin}/callback`, userStore: new WebStorageStateStore({ store: window.localStorage }), automaticSilentRenew: true, }; From a89b25f54cf5603270b7c7f8ee069f3caa65a00b Mon Sep 17 00:00:00 2001 From: chan Date: Wed, 18 Mar 2026 12:59:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=8A=88=20#335=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/sync_userfront_locales.sh | 2 +- userfront/assets/translations/en.toml | 21 +++++++++++++++++++++ userfront/assets/translations/ko.toml | 21 +++++++++++++++++++++ userfront/assets/translations/template.toml | 21 +++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/scripts/sync_userfront_locales.sh b/scripts/sync_userfront_locales.sh index 023fdf66..51ced75e 100755 --- a/scripts/sync_userfront_locales.sh +++ b/scripts/sync_userfront_locales.sh @@ -15,7 +15,7 @@ filter_toml() { dest_file="$2" awk ' function allowed(section) { - return section ~ /^(ui\.userfront|msg\.userfront|err\.userfront|ui\.common)(\.|$)/; + return section ~ /^(ui\.userfront|msg\.userfront|err\.userfront|ui\.common|domain)(\.|$)/; } BEGIN { keep = 0; } { diff --git a/userfront/assets/translations/en.toml b/userfront/assets/translations/en.toml index 76911a46..9bba6206 100644 --- a/userfront/assets/translations/en.toml +++ b/userfront/assets/translations/en.toml @@ -1,3 +1,23 @@ +[domain] + +[domain.affiliation] +affiliate = "Affiliate" +general = "General" + +[domain.company] +baron = "Baron" +halla = "Halla" +hanmac = "Hanmac" +jangheon = "Jangheon" +ptc = "PTC" +saman = "Saman" + +[domain.tenant_type] +company = "Company" +company_group = "Company Group" +personal = "Personal" +user_group = "User Group" + [err.userfront] [err.userfront.auth_proxy] @@ -299,6 +319,7 @@ add = "Add" admin_only = "Admin Only" assign = "Assign" back = "Back" +back_to_login = "Back to login" cancel = "Cancel" close = "Close" collapse = "Collapse" diff --git a/userfront/assets/translations/ko.toml b/userfront/assets/translations/ko.toml index 7c77d37e..db7e58dc 100644 --- a/userfront/assets/translations/ko.toml +++ b/userfront/assets/translations/ko.toml @@ -1,3 +1,23 @@ +[domain] + +[domain.affiliation] +affiliate = "가족사 임직원" +general = "일반 사용자" + +[domain.company] +baron = "바론" +halla = "한라" +hanmac = "한맥" +jangheon = "장헌" +ptc = "PTC" +saman = "삼안" + +[domain.tenant_type] +company = "COMPANY (일반 기업)" +company_group = "COMPANY_GROUP (그룹사/지주사)" +personal = "PERSONAL (개인 워크스페이스)" +user_group = "USER_GROUP (내부 부서/팀)" + [err.userfront] [err.userfront.auth_proxy] @@ -299,6 +319,7 @@ add = "추가" admin_only = "관리자 전용" assign = "할당" back = "돌아가기" +back_to_login = "로그인으로 돌아가기" cancel = "취소" close = "닫기" collapse = "접기" diff --git a/userfront/assets/translations/template.toml b/userfront/assets/translations/template.toml index 59330622..ef14789d 100644 --- a/userfront/assets/translations/template.toml +++ b/userfront/assets/translations/template.toml @@ -1,3 +1,17 @@ +[domain] + +[domain.affiliation] +affiliate = "" +general = "" + +[domain.company] +baron = "" +halla = "" +hanmac = "" +jangheon = "" +ptc = "" +saman = "" + [err.userfront] [err.userfront.auth_proxy] @@ -296,6 +310,7 @@ add = "" admin_only = "" assign = "" back = "" +back_to_login = "" cancel = "" close = "" collapse = "" @@ -565,3 +580,9 @@ action = "" # Auto-added missing keys +[domain.tenant_type] +company = "" +company_group = "" +personal = "" +user_group = "" +