Revert "Make processValidation method utility"

This reverts commit b0e3d277a2835fc7e99dd27ebb93c1cf109c76b0.

packages/app/src/server/service/page-grant.ts

@@ -5,11 +5,7 @@ import mongoose from 'mongoose';
 import { IRecordApplicableGrant } from '~/interfaces/page-grant';
 import { PageDocument, PageModel } from '~/server/models/page';
 import UserGroup from '~/server/models/user-group';
-
-import {
-  ComparableAncestor, ComparableTarget, ComparableDescendants,
-  processValidation,
-} from '../util/page-grant';
+import { isIncludesObjectId, excludeTestIdsFromTargetIds } from '~/server/util/compare-objectId';
 
 const { addTrailingSlash } = pathUtils;
 const { isTopPage } = pagePathUtils;
@@ -18,6 +14,27 @@ const LIMIT_FOR_MULTIPLE_PAGE_OP = 20;
 
 type ObjectIdLike = mongoose.Types.ObjectId | string;
 
+type ComparableTarget = {
+  grant: number,
+  grantedUserIds?: ObjectIdLike[],
+  grantedGroupId?: ObjectIdLike,
+  applicableUserIds?: ObjectIdLike[],
+  applicableGroupIds?: ObjectIdLike[],
+};
+
+type ComparableAncestor = {
+  grant: number,
+  grantedUserIds: ObjectIdLike[],
+  applicableUserIds?: ObjectIdLike[],
+  applicableGroupIds?: ObjectIdLike[],
+};
+
+type ComparableDescendants = {
+  isPublicExist: boolean,
+  grantedUserIds: ObjectIdLike[],
+  grantedGroupIds: ObjectIdLike[],
+};
+
 class PageGrantService {
 
   crowi!: any;
@@ -26,6 +43,129 @@ class PageGrantService {
     this.crowi = crowi;
   }
 
+  private validateComparableTarget(comparable: ComparableTarget) {
+    const Page = mongoose.model('Page') as unknown as PageModel;
+
+    const { grant, grantedUserIds, grantedGroupId } = comparable;
+
+    if (grant === Page.GRANT_OWNER && (grantedUserIds == null || grantedUserIds.length !== 1)) {
+      throw Error('grantedUserIds must not be null and must have 1 length');
+    }
+    if (grant === Page.GRANT_USER_GROUP && grantedGroupId == null) {
+      throw Error('grantedGroupId is not specified');
+    }
+  }
+
+  /**
+   * About the rule of validation, see: https://dev.growi.org/61b2cdabaa330ce7d8152844
+   * @returns boolean
+   */
+  private processValidation(target: ComparableTarget, ancestor: ComparableAncestor, descendants?: ComparableDescendants): boolean {
+    this.validateComparableTarget(target);
+
+    const Page = mongoose.model('Page') as unknown as PageModel;
+
+    /*
+     * ancestor side
+     */
+    // GRANT_PUBLIC
+    if (ancestor.grant === Page.GRANT_PUBLIC) { // any page can exist under public page
+      // do nothing
+    }
+    // GRANT_OWNER
+    else if (ancestor.grant === Page.GRANT_OWNER) {
+      if (target.grantedUserIds?.length !== 1) {
+        return false;
+      }
+
+      if (target.grant !== Page.GRANT_OWNER) { // only GRANT_OWNER page can exist under GRANT_OWNER page
+        return false;
+      }
+
+      if (ancestor.grantedUserIds[0].toString() !== target.grantedUserIds[0].toString()) { // the grantedUser must be the same as parent's under the GRANT_OWNER page
+        return false;
+      }
+    }
+    // GRANT_USER_GROUP
+    else if (ancestor.grant === Page.GRANT_USER_GROUP) {
+      if (ancestor.applicableGroupIds == null || ancestor.applicableUserIds == null) {
+        throw Error('applicableGroupIds and applicableUserIds are not specified');
+      }
+
+      if (target.grant === Page.GRANT_PUBLIC) { // public page must not exist under GRANT_USER_GROUP page
+        return false;
+      }
+
+      if (target.grant === Page.GRANT_OWNER) {
+        if (target.grantedUserIds?.length !== 1) {
+          throw Error('grantedUserIds must have one user');
+        }
+
+        if (!isIncludesObjectId(ancestor.applicableUserIds, target.grantedUserIds[0])) { // GRANT_OWNER pages under GRAND_USER_GROUP page must be owned by the member of the grantedGroup of the GRAND_USER_GROUP page
+          return false;
+        }
+      }
+
+      if (target.grant === Page.GRANT_USER_GROUP) {
+        if (target.grantedGroupId == null) {
+          throw Error('grantedGroupId must not be null');
+        }
+
+        if (!isIncludesObjectId(ancestor.applicableGroupIds, target.grantedGroupId)) { // only child groups or the same group can exist under GRANT_USER_GROUP page
+          return false;
+        }
+      }
+    }
+
+    if (descendants == null) {
+      return true;
+    }
+    /*
+     * descendant side
+     */
+
+    // GRANT_PUBLIC
+    if (target.grant === Page.GRANT_PUBLIC) { // any page can exist under public page
+      // do nothing
+    }
+    // GRANT_OWNER
+    else if (target.grant === Page.GRANT_OWNER) {
+      if (target.grantedUserIds?.length !== 1) {
+        throw Error('grantedUserIds must have one user');
+      }
+
+      if (descendants.isPublicExist) { // public page must not exist under GRANT_OWNER page
+        return false;
+      }
+
+      if (descendants.grantedGroupIds.length !== 0 || descendants.grantedUserIds.length > 1) { // groups or more than 2 grantedUsers must not be in descendants
+        return false;
+      }
+
+      if (descendants.grantedUserIds.length === 1 && descendants.grantedUserIds[0].toString() !== target.grantedUserIds[0].toString()) { // if Only me page exists, then all of them must be owned by the same user as the target page
+        return false;
+      }
+    }
+    // GRANT_USER_GROUP
+    else if (target.grant === Page.GRANT_USER_GROUP) {
+      if (target.applicableGroupIds == null || target.applicableUserIds == null) {
+        throw Error('applicableGroupIds and applicableUserIds must not be null');
+      }
+
+      if (descendants.isPublicExist) { // public page must not exist under GRANT_USER_GROUP page
+        return false;
+      }
+
+      const shouldNotExistGroupIds = excludeTestIdsFromTargetIds(descendants.grantedGroupIds, target.applicableGroupIds);
+      const shouldNotExistUserIds = excludeTestIdsFromTargetIds(descendants.grantedUserIds, target.applicableUserIds);
+      if (shouldNotExistGroupIds.length !== 0 || shouldNotExistUserIds.length !== 0) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
   /**
    * Prepare ComparableTarget
    * @returns Promise<ComparableAncestor>
@@ -217,13 +357,13 @@ class PageGrantService {
 
     if (!shouldCheckDescendants) { // checking the parent is enough
       const comparableTarget = await this.generateComparableTarget(grant, grantedUserIds, grantedGroupId, false);
-      return processValidation(comparableTarget, comparableAncestor);
+      return this.processValidation(comparableTarget, comparableAncestor);
     }
 
     const comparableTarget = await this.generateComparableTarget(grant, grantedUserIds, grantedGroupId, true);
     const comparableDescendants = await this.generateComparableDescendants(targetPath, user, includeNotMigratedPages);
 
-    return processValidation(comparableTarget, comparableAncestor, comparableDescendants);
+    return this.processValidation(comparableTarget, comparableAncestor, comparableDescendants);
   }
 
   /**

packages/app/src/server/util/page-grant.ts

@@ -1,142 +0,0 @@
-import { PageGrant } from '~/interfaces/page';
-
-import type { ObjectIdLike } from '../interfaces/mongoose-utils';
-
-
-import { excludeTestIdsFromTargetIds, isIncludesObjectId } from './compare-objectId';
-
-export type ComparableTarget = {
-  grant: number,
-  grantedUserIds?: ObjectIdLike[],
-  grantedGroupId?: ObjectIdLike,
-  applicableUserIds?: ObjectIdLike[],
-  applicableGroupIds?: ObjectIdLike[],
-};
-
-export type ComparableAncestor = {
-  grant: number,
-  grantedUserIds: ObjectIdLike[],
-  applicableUserIds?: ObjectIdLike[],
-  applicableGroupIds?: ObjectIdLike[],
-};
-
-export type ComparableDescendants = {
-  isPublicExist: boolean,
-  grantedUserIds: ObjectIdLike[],
-  grantedGroupIds: ObjectIdLike[],
-};
-
-export const validateComparableTarget = (comparable: ComparableTarget): void => {
-  const { grant, grantedUserIds, grantedGroupId } = comparable;
-
-  if (grant === PageGrant.GRANT_OWNER && (grantedUserIds == null || grantedUserIds.length !== 1)) {
-    throw Error('grantedUserIds must not be null and must have 1 length');
-  }
-  if (grant === PageGrant.GRANT_USER_GROUP && grantedGroupId == null) {
-    throw Error('grantedGroupId is not specified');
-  }
-};
-
-export const processValidation = (target: ComparableTarget, ancestor: ComparableAncestor, descendants?: ComparableDescendants): boolean => {
-  validateComparableTarget(target);
-
-  /*
-   * ancestor side
-   */
-  // GRANT_PUBLIC
-  if (ancestor.grant === PageGrant.GRANT_PUBLIC) { // any page can exist under public page
-    // do nothing
-  }
-  // GRANT_OWNER
-  else if (ancestor.grant === PageGrant.GRANT_OWNER) {
-    if (target.grantedUserIds?.length !== 1) {
-      return false;
-    }
-
-    if (target.grant !== PageGrant.GRANT_OWNER) { // only GRANT_OWNER page can exist under GRANT_OWNER page
-      return false;
-    }
-
-    if (ancestor.grantedUserIds[0].toString() !== target.grantedUserIds[0].toString()) { // the grantedUser must be the same as parent's under the GRANT_OWNER page
-      return false;
-    }
-  }
-  // GRANT_USER_GROUP
-  else if (ancestor.grant === PageGrant.GRANT_USER_GROUP) {
-    if (ancestor.applicableGroupIds == null || ancestor.applicableUserIds == null) {
-      throw Error('applicableGroupIds and applicableUserIds are not specified');
-    }
-
-    if (target.grant === PageGrant.GRANT_PUBLIC) { // public page must not exist under GRANT_USER_GROUP page
-      return false;
-    }
-
-    if (target.grant === PageGrant.GRANT_OWNER) {
-      if (target.grantedUserIds?.length !== 1) {
-        throw Error('grantedUserIds must have one user');
-      }
-
-      if (!isIncludesObjectId(ancestor.applicableUserIds, target.grantedUserIds[0])) { // GRANT_OWNER pages under GRAND_USER_GROUP page must be owned by the member of the grantedGroup of the GRAND_USER_GROUP page
-        return false;
-      }
-    }
-
-    if (target.grant === PageGrant.GRANT_USER_GROUP) {
-      if (target.grantedGroupId == null) {
-        throw Error('grantedGroupId must not be null');
-      }
-
-      if (!isIncludesObjectId(ancestor.applicableGroupIds, target.grantedGroupId)) { // only child groups or the same group can exist under GRANT_USER_GROUP page
-        return false;
-      }
-    }
-  }
-
-  if (descendants == null) {
-    return true;
-  }
-  /*
-   * descendant side
-   */
-
-  // GRANT_PUBLIC
-  if (target.grant === PageGrant.GRANT_PUBLIC) { // any page can exist under public page
-    // do nothing
-  }
-  // GRANT_OWNER
-  else if (target.grant === PageGrant.GRANT_OWNER) {
-    if (target.grantedUserIds?.length !== 1) {
-      throw Error('grantedUserIds must have one user');
-    }
-
-    if (descendants.isPublicExist) { // public page must not exist under GRANT_OWNER page
-      return false;
-    }
-
-    if (descendants.grantedGroupIds.length !== 0 || descendants.grantedUserIds.length > 1) { // groups or more than 2 grantedUsers must not be in descendants
-      return false;
-    }
-
-    if (descendants.grantedUserIds.length === 1 && descendants.grantedUserIds[0].toString() !== target.grantedUserIds[0].toString()) { // if Only me page exists, then all of them must be owned by the same user as the target page
-      return false;
-    }
-  }
-  // GRANT_USER_GROUP
-  else if (target.grant === PageGrant.GRANT_USER_GROUP) {
-    if (target.applicableGroupIds == null || target.applicableUserIds == null) {
-      throw Error('applicableGroupIds and applicableUserIds must not be null');
-    }
-
-    if (descendants.isPublicExist) { // public page must not exist under GRANT_USER_GROUP page
-      return false;
-    }
-
-    const shouldNotExistGroupIds = excludeTestIdsFromTargetIds(descendants.grantedGroupIds, target.applicableGroupIds);
-    const shouldNotExistUserIds = excludeTestIdsFromTargetIds(descendants.grantedUserIds, target.applicableUserIds);
-    if (shouldNotExistGroupIds.length !== 0 || shouldNotExistUserIds.length !== 0) {
-      return false;
-    }
-  }
-
-  return true;
-};