Почетна Преглед Помоћ
Пријавите се
wiki
/
weseek__growi
огледало од https://github.com/weseek/growi
2
0
Креирај огранак 0
Датотеке Дискусије 0 Вики
Преглед изворни кода

apply Page403

Shun Miyazawa пре 2 година
родитељ
14698bf932
комит
2f8ffd852f
19 измењених фајлова са 86 додато и 4 уклоњено
Подељен поглед Покажи статистику Diff
  1. 3 1
      apps/app/src/components/Admin/page403.tsx
  2. 5 0
      apps/app/src/pages/admin/[...path].page.tsx
  3. 5 1
      apps/app/src/pages/admin/app.page.tsx
  4. 5 1
      apps/app/src/pages/admin/audit-log.page.tsx
  5. 5 0
      apps/app/src/pages/admin/customize.page.tsx
  6. 5 0
      apps/app/src/pages/admin/data-transfer.page.tsx
  7. 5 0
      apps/app/src/pages/admin/export.page.tsx
  8. 5 0
      apps/app/src/pages/admin/importer.page.tsx
  9. 6 0
      apps/app/src/pages/admin/index.page.tsx
  10. 4 0
      apps/app/src/pages/admin/markdown.page.tsx
  11. 5 0
      apps/app/src/pages/admin/notification.page.tsx
  12. 5 0
      apps/app/src/pages/admin/plugins.page.tsx
  13. 5 0
      apps/app/src/pages/admin/search.page.tsx
  14. 5 0
      apps/app/src/pages/admin/security.page.tsx
  15. 5 1
      apps/app/src/pages/admin/slack-integration-legacy.page.tsx
  16. 5 0
      apps/app/src/pages/admin/slack-integration.page.tsx
  17. 5 0
      apps/app/src/pages/admin/user-groups.page.tsx
  18. 1 0
      apps/app/src/pages/utils/commons.ts
  19. 2 0
      apps/app/src/utils/admin-page-util.ts

+ 3 - 1
apps/app/src/components/Admin/page403.tsx
Прегледај датотеку 

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

+ 5 - 0
apps/app/src/pages/admin/[...path].page.tsx
Прегледај датотеку 

@@ -11,12 +11,17 @@ 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'), { ssr: false });
 
 
 
 const AdminAppPage: NextPage<CommonProps> = (props) => {
 
   useIsMaintenanceMode(props.isMaintenanceMode);
 
   useCurrentUser(props.currentUser ?? null);
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <AdminLayout>
 
       <AdminNotFoundPage />

+ 5 - 1
apps/app/src/pages/admin/app.page.tsx
Прегледај датотеку 

@@ -7,7 +7,6 @@ import dynamic from 'next/dynamic';
 
 import Head from 'next/head';
 
 import { Container, Provider } from 'unstated';
 
 
-
 
 import AdminAppContainer from '~/client/services/AdminAppContainer';
 
 import { CommonProps, generateCustomTitle } from '~/pages/utils/commons';
 
 import { useCurrentUser } from '~/stores/context';
 
@@ -18,6 +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'), { ssr: false });
 
 
 
 const AdminAppPage: NextPage<CommonProps> = (props) => {
 
@@ -34,6 +34,10 @@ const AdminAppPage: NextPage<CommonProps> = (props) => {
 
 
   const title = generateCustomTitle(props, t('headers.app_settings'));
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <Provider inject={[...injectableContainers]}>
 
       <AdminLayout componentTitle={title}>

+ 5 - 1
apps/app/src/pages/admin/audit-log.page.tsx
Прегледај датотеку 

@@ -13,8 +13,8 @@ import { useCurrentUser, useAuditLogEnabled, useAuditLogAvailableActions } from
 
 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'), { ssr: false });
 
 
 
 type Props = CommonProps & {
 
@@ -32,6 +32,10 @@ const AdminAuditLogPage: NextPage<Props> = (props) => {
 
   const title = t('audit_log_management.audit_log');
 
   const headTitle = generateCustomTitle(props, title);
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <AdminLayout componentTitle={title}>
 
       <Head>

+ 5 - 0
apps/app/src/pages/admin/customize.page.tsx
Прегледај датотеку 

@@ -6,6 +6,7 @@ import { useTranslation } from 'next-i18next';
 
 import dynamic from 'next/dynamic';
 
 import Head from 'next/head';
 
 import { Container, Provider } from 'unstated';
 
+// import { Page403 } from '~/components/Admin/page403';
 
 
 import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 
 import { CrowiRequest } from '~/interfaces/crowi-request';
 
@@ -16,6 +17,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'), { ssr: false });
 
 
 
 type Props = CommonProps & {
 
@@ -40,6 +42,9 @@ const AdminCustomizeSettingsPage: NextPage<Props> = (props) => {
 
     injectableContainers.push(adminCustomizeContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
 
   return (
 
     <Provider inject={[...injectableContainers]}>

+ 5 - 0
apps/app/src/pages/admin/data-transfer.page.tsx
Прегледај датотеку 

@@ -15,6 +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'), { ssr: false });
 
 
 
 type Props = CommonProps;
 
@@ -32,6 +33,10 @@ const DataTransferPage: NextPage<Props> = (props) => {
 
     injectableContainers.push(adminAppContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <Provider inject={[...injectableContainers]}>
 
       <AdminLayout componentTitle={title}>

+ 5 - 0
apps/app/src/pages/admin/export.page.tsx
Прегледај датотеку 

@@ -15,6 +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'), { ssr: false });
 
 
 
 const AdminExportDataArchivePage: NextPage<CommonProps> = (props) => {
 
@@ -30,6 +31,10 @@ const AdminExportDataArchivePage: NextPage<CommonProps> = (props) => {
 
     injectableContainers.push(adminAppContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <Provider inject={[...injectableContainers]}>
 
       <AdminLayout componentTitle={componentTitle}>

+ 5 - 0
apps/app/src/pages/admin/importer.page.tsx
Прегледај датотеку 

@@ -15,6 +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'), { ssr: false });
 
 
 
 const AdminDataImportPage: NextPage<CommonProps> = (props) => {
 
@@ -30,6 +31,10 @@ const AdminDataImportPage: NextPage<CommonProps> = (props) => {
 
     injectableContainers.push(adminImportContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
 
   return (
 
     <Provider inject={[...injectableContainers]}>

+ 6 - 0
apps/app/src/pages/admin/index.page.tsx
Прегледај датотеку 

@@ -9,12 +9,14 @@ import { useRouter } from 'next/router';
 
 import { Container, Provider } from 'unstated';
 
 
 import AdminHomeContainer from '~/client/services/AdminHomeContainer';
 
+import { Page403 } from '~/components/Admin/page403';
 
 import { CrowiRequest } from '~/interfaces/crowi-request';
 
 import { CommonProps, generateCustomTitle } from '~/pages/utils/commons';
 
 import {
 
   useCurrentUser, useGrowiCloudUri, useGrowiAppIdForGrowiCloud, useIsAdmin,
 
 } from '~/stores/context';
 
 
+
 
 import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 
@@ -54,6 +56,10 @@ const AdminHomePage: NextPage<Props> = (props) => {
 
     injectableContainers.push(adminHomeContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
 
   return (
 
     <Provider inject={[...injectableContainers]}>

+ 4 - 0
apps/app/src/pages/admin/markdown.page.tsx
Прегледај датотеку 

@@ -16,6 +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'), { ssr: false });
 
 
 
 const AdminMarkdownPage: NextPage<CommonProps> = (props) => {
 
@@ -32,6 +33,9 @@ const AdminMarkdownPage: NextPage<CommonProps> = (props) => {
 
     injectableContainers.push(adminMarkDownContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
 
   return (
 
     <Provider inject={[...injectableContainers]}>

+ 5 - 0
apps/app/src/pages/admin/notification.page.tsx
Прегледај датотеку 

@@ -15,6 +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'), { ssr: false });
 
 
 
 const AdminExternalNotificationPage: NextPage<CommonProps> = (props) => {
 
@@ -31,6 +32,10 @@ const AdminExternalNotificationPage: NextPage<CommonProps> = (props) => {
 
     injectableContainers.push(adminNotificationContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
 
   return (
 
     <Provider inject={[...injectableContainers]}>

+ 5 - 0
apps/app/src/pages/admin/plugins.page.tsx
Прегледај датотеку 

@@ -21,6 +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'), { ssr: false });
 
 
 
 const AdminAppPage: NextPage<CommonProps> = (props) => {
 
@@ -36,6 +37,10 @@ const AdminAppPage: NextPage<CommonProps> = (props) => {
 
     injectableContainers.push(adminAppContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <Provider inject={[...injectableContainers]}>
 
       <AdminLayout componentTitle={title} >

+ 5 - 0
apps/app/src/pages/admin/search.page.tsx
Прегледај датотеку 

@@ -15,6 +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'), { ssr: false });
 
 
 
 type Props = CommonProps & {
 
@@ -30,6 +31,10 @@ const AdminFullTextSearchManagementPage: NextPage<Props> = (props) => {
 
   const title = t('full_text_search_management.full_text_search_management');
 
   const headTitle = generateCustomTitle(props, title);
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <AdminLayout componentTitle={title}>
 
       <Head>

+ 5 - 0
apps/app/src/pages/admin/security.page.tsx
Прегледај датотеку 

@@ -22,6 +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'), { ssr: false });
 
 
 
 type Props = CommonProps & {
 
@@ -64,6 +65,10 @@ const AdminSecuritySettingsPage: NextPage<Props> = (props) => {
 
     }
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <Provider inject={[...adminSecurityContainers]}>
 
       <AdminLayout componentTitle={componentTitle}>

+ 5 - 1
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'), { ssr: false });
 
 
 const AdminLegacySlackIntegrationPage: NextPage<CommonProps> = (props) => {
 
   const { t } = useTranslation('admin');
 
@@ -30,6 +30,10 @@ const AdminLegacySlackIntegrationPage: NextPage<CommonProps> = (props) => {
 
     injectableContainers.push(adminSlackIntegrationLegacyContainer);
 
   }
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
 
   return (
 
     <Provider inject={[...injectableContainers]}>

+ 5 - 0
apps/app/src/pages/admin/slack-integration.page.tsx
Прегледај датотеку 

@@ -14,6 +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'), { ssr: false });
 
 
 
 type Props = CommonProps & {
 
@@ -29,6 +30,10 @@ const AdminSlackIntegrationPage: NextPage<Props> = (props) => {
 
   const componentTitle = t('slack_integration.slack_integration');
 
   const pageTitle = generateCustomTitle(props, componentTitle);
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <AdminLayout componentTitle={componentTitle}>
 
       <Head>

+ 5 - 0
apps/app/src/pages/admin/user-groups.page.tsx
Прегледај датотеку 

@@ -13,6 +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'), { ssr: false });
 
 
 
 type Props = CommonProps & {
 
@@ -28,6 +29,10 @@ const AdminUserGroupPage: NextPage<Props> = (props) => {
 
   const title = t('user_group_management.user_group_management');
 
   const headTitle = generateCustomTitle(props, title);
 
 
+  if (props.isAccessDeniedForNonAdminUser) {
 
+    return <Page403 />;
 
+  }
 
+
 
   return (
 
     <AdminLayout componentTitle={title}>
 
       <Head>

+ 1 - 0
apps/app/src/pages/utils/commons.ts
Прегледај датотеку 

@@ -31,6 +31,7 @@ export type CommonProps = {
 
   redirectDestination: string | null,
 
   isDefaultLogo: boolean,
 
   growiCloudUri: string,
 
+  isAccessDeniedForNonAdminUser?: boolean,
 
   currentUser?: IUserHasId,
 
   forcedColorScheme?: ColorScheme,
 
   sidebarConfig: ISidebarConfig,

+ 2 - 0
apps/app/src/utils/admin-page-util.ts
Прегледај датотеку 

@@ -44,6 +44,8 @@ export const retrieveServerSideProps: any = async(
 
     props.currentUser = user.toObject();
 
   }
 
 
+  props.isAccessDeniedForNonAdminUser = props.currentUser != null && !props.currentUser.admin;
 
+
 
   await injectNextI18NextConfigurations(context, props, ['admin', 'commons']);
 
 
   return {