Shun Miyazawa 8 months ago
parent
commit
b7967e7b49
1 changed files with 3 additions and 3 deletions
  1. 3 3
      apps/app/src/server/service/page-grant.ts

+ 3 - 3
apps/app/src/server/service/page-grant.ts

@@ -1,4 +1,4 @@
-import type { IPage, IUserHasId } from '@growi/core';
+import type { IPage, IUserHasId, IUser } from '@growi/core';
 import {
 import {
   type IGrantedGroup,
   type IGrantedGroup,
   PageGrant, GroupType, getIdForRef,
   PageGrant, GroupType, getIdForRef,
@@ -7,7 +7,7 @@ import {
   pagePathUtils, pathUtils, pageUtils,
   pagePathUtils, pathUtils, pageUtils,
 } from '@growi/core/dist/utils';
 } from '@growi/core/dist/utils';
 import escapeStringRegexp from 'escape-string-regexp';
 import escapeStringRegexp from 'escape-string-regexp';
-import mongoose from 'mongoose';
+import mongoose, { type HydratedDocument } from 'mongoose';
 
 
 import type { ExternalGroupProviderType } from '~/features/external-user-group/interfaces/external-user-group';
 import type { ExternalGroupProviderType } from '~/features/external-user-group/interfaces/external-user-group';
 import ExternalUserGroup from '~/features/external-user-group/server/models/external-user-group';
 import ExternalUserGroup from '~/features/external-user-group/server/models/external-user-group';
@@ -101,7 +101,7 @@ export interface IPageGrantService {
   validateGrantChangeSyncronously:(
   validateGrantChangeSyncronously:(
     userRelatedGroups: PopulatedGrantedGroup[], previousGrantedGroups: IGrantedGroup[], grant?: PageGrant, grantedGroups?: IGrantedGroup[],
     userRelatedGroups: PopulatedGrantedGroup[], previousGrantedGroups: IGrantedGroup[], grant?: PageGrant, grantedGroups?: IGrantedGroup[],
   ) => boolean,
   ) => boolean,
-  getUserRelatedGroups: (user?: IUserHasId | null) => Promise<PopulatedGrantedGroup[]>,
+  getUserRelatedGroups: (user?: IUserHasId | HydratedDocument<IUser> | null) => Promise<PopulatedGrantedGroup[]>,
   getPopulatedGrantedGroups: (grantedGroups: IGrantedGroup[]) => Promise<PopulatedGrantedGroup[]>,
   getPopulatedGrantedGroups: (grantedGroups: IGrantedGroup[]) => Promise<PopulatedGrantedGroup[]>,
   getUserRelatedGrantedGroups: (page: PageDocument, user) => Promise<IGrantedGroup[]>,
   getUserRelatedGrantedGroups: (page: PageDocument, user) => Promise<IGrantedGroup[]>,
   getUserRelatedGrantedGroupsSyncronously: (userRelatedGroups: PopulatedGrantedGroup[], page: PageDocument) => IGrantedGroup[],
   getUserRelatedGrantedGroupsSyncronously: (userRelatedGroups: PopulatedGrantedGroup[], page: PageDocument) => IGrantedGroup[],