Shun Miyazawa 2 лет назад
Родитель
Сommit
6da1c7fe22

+ 1 - 1
apps/app/src/components/Admin/page403.tsx → apps/app/src/components/Admin/ForbiddenPage.tsx

@@ -4,7 +4,7 @@ import DefaultErrorPage from 'next/error';
 import { useTranslation } from 'react-i18next';
 
 
-export const Page403 = (): JSX.Element => {
+export const ForbiddenPage = (): JSX.Element => {
   const { t } = useTranslation('commons');
 
   const errorMessage = t('forbidden_page.do_not_have_admin_permission', { ns: 'commons' });

+ 2 - 2
apps/app/src/pages/admin/[...path].page.tsx

@@ -11,7 +11,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const AdminNotFoundPage = dynamic(() => import('~/components/Admin/NotFoundPage').then(mod => mod.AdminNotFoundPage), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 const AdminAppPage: NextPage<CommonProps> = (props) => {
@@ -19,7 +19,7 @@ const AdminAppPage: NextPage<CommonProps> = (props) => {
   useCurrentUser(props.currentUser ?? null);
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/app.page.tsx

@@ -17,7 +17,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const AppSettingsPageContents = dynamic(() => import('~/components/Admin/App/AppSettingsPageContents'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 const AdminAppPage: NextPage<CommonProps> = (props) => {
@@ -35,7 +35,7 @@ const AdminAppPage: NextPage<CommonProps> = (props) => {
   const title = generateCustomTitle(props, t('headers.app_settings'));
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/audit-log.page.tsx

@@ -14,7 +14,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const AuditLogManagement = dynamic(() => import('~/components/Admin/AuditLogManagement').then(mod => mod.AuditLogManagement), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -33,7 +33,7 @@ const AdminAuditLogPage: NextPage<Props> = (props) => {
   const headTitle = generateCustomTitle(props, title);
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/customize.page.tsx

@@ -16,7 +16,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const CustomizeSettingContents = dynamic(() => import('~/components/Admin/Customize/Customize'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -42,7 +42,7 @@ const AdminCustomizeSettingsPage: NextPage<Props> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/data-transfer.page.tsx

@@ -15,7 +15,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const G2GDataTransferPage = dynamic(() => import('~/components/Admin/G2GDataTransfer'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps;
@@ -34,7 +34,7 @@ const DataTransferPage: NextPage<Props> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/export.page.tsx

@@ -15,7 +15,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const ExportArchiveDataPage = dynamic(() => import('~/components/Admin/ExportArchiveDataPage'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 const AdminExportDataArchivePage: NextPage<CommonProps> = (props) => {
@@ -32,7 +32,7 @@ const AdminExportDataArchivePage: NextPage<CommonProps> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/importer.page.tsx

@@ -15,7 +15,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const DataImportPageContents = dynamic(() => import('~/components/Admin/ImportData/ImportDataPageContents'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 const AdminDataImportPage: NextPage<CommonProps> = (props) => {
@@ -32,7 +32,7 @@ const AdminDataImportPage: NextPage<CommonProps> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
 

+ 2 - 8
apps/app/src/pages/admin/index.page.tsx

@@ -5,7 +5,6 @@ import {
 import { useTranslation } from 'next-i18next';
 import dynamic from 'next/dynamic';
 import Head from 'next/head';
-import { useRouter } from 'next/router';
 import { Container, Provider } from 'unstated';
 
 import AdminHomeContainer from '~/client/services/AdminHomeContainer';
@@ -20,7 +19,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const AdminHome = dynamic(() => import('~/components/Admin/AdminHome/AdminHome'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -38,11 +37,6 @@ const AdminHomePage: NextPage<Props> = (props) => {
   useGrowiCloudUri(props.growiCloudUri);
   useGrowiAppIdForGrowiCloud(props.growiAppIdForGrowiCloud);
   const { data: isAdmin } = useIsAdmin();
-  const router = useRouter();
-
-  if (!isAdmin) {
-    router.push('/page403');
-  }
 
   const { t } = useTranslation('admin');
 
@@ -57,7 +51,7 @@ const AdminHomePage: NextPage<Props> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
 

+ 2 - 2
apps/app/src/pages/admin/markdown.page.tsx

@@ -16,7 +16,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const MarkDownSettingContents = dynamic(() => import('~/components/Admin/MarkdownSetting/MarkDownSettingContents'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 const AdminMarkdownPage: NextPage<CommonProps> = (props) => {
@@ -34,7 +34,7 @@ const AdminMarkdownPage: NextPage<CommonProps> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/notification.page.tsx

@@ -15,7 +15,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const NotificationSetting = dynamic(() => import('~/components/Admin/Notification/NotificationSetting'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 const AdminExternalNotificationPage: NextPage<CommonProps> = (props) => {
@@ -33,7 +33,7 @@ const AdminExternalNotificationPage: NextPage<CommonProps> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
 

+ 2 - 2
apps/app/src/pages/admin/plugins.page.tsx

@@ -21,7 +21,7 @@ const PluginsExtensionPageContents = dynamic(
   () => import('~/features/growi-plugin/client/components/Admin').then(mod => mod.PluginsExtensionPageContents),
   { ssr: false },
 );
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 const AdminAppPage: NextPage<CommonProps> = (props) => {
@@ -38,7 +38,7 @@ const AdminAppPage: NextPage<CommonProps> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/search.page.tsx

@@ -15,7 +15,7 @@ const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { s
 const FullTextSearchManagement = dynamic(
   () => import('~/components/Admin//FullTextSearchManagement').then(mod => mod.FullTextSearchManagement), { ssr: false },
 );
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -32,7 +32,7 @@ const AdminFullTextSearchManagementPage: NextPage<Props> = (props) => {
   const headTitle = generateCustomTitle(props, title);
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/security.page.tsx

@@ -22,7 +22,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const SecurityManagement = dynamic(() => import('~/components/Admin/Security/SecurityManagement'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -66,7 +66,7 @@ const AdminSecuritySettingsPage: NextPage<Props> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/slack-integration-legacy.page.tsx

@@ -15,7 +15,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const LegacySlackIntegration = dynamic(() => import('~/components/Admin/LegacySlackIntegration/LegacySlackIntegration'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 const AdminLegacySlackIntegrationPage: NextPage<CommonProps> = (props) => {
   const { t } = useTranslation('admin');
@@ -31,7 +31,7 @@ const AdminLegacySlackIntegrationPage: NextPage<CommonProps> = (props) => {
   }
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
 

+ 2 - 2
apps/app/src/pages/admin/slack-integration.page.tsx

@@ -14,7 +14,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const SlackIntegration = dynamic(() => import('~/components/Admin/SlackIntegration/SlackIntegration'), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -31,7 +31,7 @@ const AdminSlackIntegrationPage: NextPage<Props> = (props) => {
   const pageTitle = generateCustomTitle(props, componentTitle);
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (

+ 2 - 2
apps/app/src/pages/admin/user-groups.page.tsx

@@ -13,7 +13,7 @@ import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const UserGroupPage = dynamic(() => import('~/components/Admin/UserGroup/UserGroupPage').then(mod => mod.UserGroupPage), { ssr: false });
-const Page403 = dynamic(() => import('~/components/Admin/page403').then(mod => mod.Page403), { ssr: false });
+const ForbiddenPage = dynamic(() => import('~/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -30,7 +30,7 @@ const AdminUserGroupPage: NextPage<Props> = (props) => {
   const headTitle = generateCustomTitle(props, title);
 
   if (props.isAccessDeniedForNonAdminUser) {
-    return <Page403 />;
+    return <ForbiddenPage />;
   }
 
   return (