Przeglądaj źródła

delete user args

ryoji-s 2 lat temu
rodzic
commit
1a1b43d114

+ 2 - 2
apps/app/src/server/events/user.ts

@@ -27,8 +27,8 @@ class UserEvent extends EventEmitter {
 
     let page = await Page.findByPath(userHomepagePath, true);
 
-    if (page !== null && page.creator !== null && page.creator.toString() !== user._id.toString()) {
-      await this.crowi.pageService.deleteCompletelyUserHomeBySystem(user, userHomepagePath);
+    if (page != null && page.creator != null && page.creator.toString() !== user._id.toString()) {
+      await this.crowi.pageService.deleteCompletelyUserHomeBySystem(userHomepagePath);
       page = null;
     }
 

+ 1 - 1
apps/app/src/server/models/page-operation.ts

@@ -96,7 +96,7 @@ const schema = new Schema<PageOperationDocument, PageOperationModel>({
   toPath: { type: String, index: true },
   page: { type: pageSchemaForResuming, required: true },
   exPage: { type: pageSchemaForResuming, required: false },
-  user: { type: userSchemaForResuming, required: true },
+  user: { type: userSchemaForResuming },
   options: { type: optionsSchemaForResuming },
   incForUpdatingDescendantCount: { type: Number },
   unprocessableExpiryDate: { type: Date, default: () => addSeconds(new Date(), 10) },

+ 1 - 1
apps/app/src/server/routes/apiv3/users.js

@@ -801,7 +801,7 @@ module.exports = (crowi) => {
       activityEvent.emit('update', res.locals.activity._id, { action: SupportedAction.ACTION_ADMIN_USERS_REMOVE });
 
       if (isUsersHomepageDeletionEnabled) {
-        crowi.pageService.deleteCompletelyUserHomeBySystem(req.user, userHomepagePath);
+        crowi.pageService.deleteCompletelyUserHomeBySystem(userHomepagePath);
       }
 
       return res.apiv3({ user: serializedUser });

+ 2 - 4
apps/app/src/server/service/page.ts

@@ -1966,12 +1966,11 @@ class PageService {
    * @description This function is intended to be used exclusively for forcibly deleting the user homepage by the system.
    * It should only be called from within the appropriate context and with caution as it performs a system-level operation.
    *
-   * @param {IUserHasId} user - The user object.
    * @param {string} userHomepagePath - The path of the user's homepage.
    * @returns {Promise<void>} - A Promise that resolves when the deletion is complete.
    * @throws {Error} - If an error occurs during the deletion process.
    */
-  async deleteCompletelyUserHomeBySystem(user: IUserHasId, userHomepagePath: string): Promise<void> {
+  async deleteCompletelyUserHomeBySystem(userHomepagePath: string): Promise<void> {
     const Page = this.crowi.model('Page');
     const userHomepage = await Page.findByPath(userHomepagePath, true);
 
@@ -2003,7 +2002,7 @@ class PageService {
 
       if (!userHomepage.isEmpty) {
         // Emit an event for the search service
-        this.pageEvent.emit('deleteCompletely', userHomepage, user);
+        this.pageEvent.emit('deleteCompletely', userHomepage);
       }
 
       // Create a PageOperation model
@@ -2011,7 +2010,6 @@ class PageService {
         actionType: PageActionType.DeleteCompletely,
         actionStage: PageActionStage.Main,
         page: userHomepage,
-        user,
         fromPath: userHomepage.path,
       });