From 10d53836bfedf3bd91bde65c731f0d26a7e104e7 Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Wed, 28 Jun 2023 11:11:34 +0900 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E3=82=8A=E4=BB=A3=E3=82=8F=E3=82=8A?= =?UTF-8?q?=E6=99=82=E3=81=AE=E6=A8=A9=E9=99=90=E3=81=AB=E3=81=A4=E3=81=84?= =?UTF-8?q?=E3=81=A6=E3=80=80=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/contexts/AuthContext.tsx | 1 + src/routes/auth.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/contexts/AuthContext.tsx b/src/contexts/AuthContext.tsx index 4ea310a..d837116 100644 --- a/src/contexts/AuthContext.tsx +++ b/src/contexts/AuthContext.tsx @@ -198,6 +198,7 @@ function AuthContextProvider({ children }: Props) { })) && // 成り代わり条件 (authorization.allowChangedContract === undefined || + role !== UserRole.SUPER_ADMIN || isChangedContractId === authorization.allowChangedContract) ); }, diff --git a/src/routes/auth.ts b/src/routes/auth.ts index a2852a2..419469f 100644 --- a/src/routes/auth.ts +++ b/src/routes/auth.ts @@ -53,8 +53,12 @@ export const AUTH = { R.NORMAL_ADMIN, { custom: [C.HELLO_TECHNO] } ), - [P.DASHBOARD_LOGIN_USER_LIST]: setAuth("eq", R.CONTRACT_ADMIN), - [P.DASHBOARD_LOGIN_USER_CREATE]: setAuth("eq", R.CONTRACT_ADMIN), + [P.DASHBOARD_LOGIN_USER_LIST]: setAuth("ge", R.CONTRACT_ADMIN, { + allowChangedContract: true, + }), + [P.DASHBOARD_LOGIN_USER_CREATE]: setAuth("ge", R.CONTRACT_ADMIN, { + allowChangedContract: true, + }), [P.DASHBOARD_LOGIN_USER_CHANGE_PASSWORD]: setAuth("ge", R.NORMAL_ADMIN), [P.PAGE_403]: setAuth("all"),