Merge branch 'master' into support/use-jotai

apps/app/src/interfaces/crowi-request.ts

@@ -10,9 +10,6 @@ export interface CrowiProperties {
   crowi: Crowi;
 
   session: any;
-
-  // provided by csurf
-  csrfToken: () => string;
 }
 
 export interface CrowiRequest extends CrowiProperties, Request {}

apps/app/src/pages/common-props/commons.ts

@@ -85,7 +85,6 @@ export type CommonEachProps = {
   currentPathname: string;
   nextjsRoutingPage?: string; // must be set by each page
   currentUser?: IUserHasId;
-  csrfToken: string;
   isMaintenanceMode: boolean;
   redirectDestination?: string | null;
 };
@@ -127,12 +126,6 @@ function isValidCommonEachRouteProps(
     );
     return false;
   }
-  if (typeof p.csrfToken !== 'string') {
-    logger.warn('isValidCommonEachRouteProps: csrfToken is not a string', {
-      csrfToken: p.csrfToken,
-    });
-    return false;
-  }
   if (typeof p.isMaintenanceMode !== 'boolean') {
     logger.warn(
       'isValidCommonEachRouteProps: isMaintenanceMode is not a boolean',
@@ -183,7 +176,6 @@ export const getServerSideCommonEachProps = async (
     currentPathname,
     nextjsRoutingPage,
     currentUser,
-    csrfToken: req.csrfToken(),
     isMaintenanceMode,
     redirectDestination,
   };

apps/app/src/states/global/global.ts

@@ -130,7 +130,6 @@ const forcedColorSchemeAtom = atom<ColorScheme | undefined>(undefined);
 export const useForcedColorScheme = () => useAtomValue(forcedColorSchemeAtom);
 
 export const _atomsForHydration = {
-  csrfTokenAtom,
   currentPathnameAtom,
   currentUserAtom,
   appTitleAtom,

apps/app/src/states/global/hydrate.ts

@@ -7,7 +7,6 @@ import { _atomsForHydration } from './global';
 const {
   appTitleAtom,
   confidentialAtom,
-  csrfTokenAtom,
   currentPathnameAtom,
   currentUserAtom,
   customTitleTemplateAtom,
@@ -66,7 +65,6 @@ export const useHydrateGlobalEachAtoms = (
   // Hydrate global atoms with server-side data
   useHydrateAtoms(
     [
-      [csrfTokenAtom, commonEachProps.csrfToken],
       [currentPathnameAtom, commonEachProps.currentPathname],
       [currentUserAtom, commonEachProps.currentUser],
       [isMaintenanceModeAtom, commonEachProps.isMaintenanceMode],