Przeglądaj źródła

refactor can delete user homepage

ryoji-s 2 lat temu
rodzic
commit
016855732f
1 zmienionych plików z 10 dodań i 12 usunięć
  1. 10 12
      apps/app/src/server/service/page.ts

+ 10 - 12
apps/app/src/server/service/page.ts

@@ -188,21 +188,19 @@ class PageService {
   }
 
   async canDeleteUserHomepage(path: string): Promise<boolean> {
-    if (isUsersHomepage(path)) {
-      const isUsersHomepageDeletionEnabled = configManager.getConfig('crowi', 'security:user-homepage-deletion:isEnabled');
-      if (!isUsersHomepageDeletionEnabled) {
-        return false;
-      }
+    if (!isUsersHomepage(path)) {
+      return true;
+    }
 
-      const User = mongoose.model('User');
-      const username = getUsernameByPath(path);
-      const userHomepageOwner = await User.findOne<Promise<IUserHasId | null>>({ username });
-      if (userHomepageOwner != null) {
-        return false;
-      }
+    const isUsersHomepageDeletionEnabled = configManager.getConfig('crowi', 'security:user-homepage-deletion:isEnabled');
+    if (!isUsersHomepageDeletionEnabled) {
+      return false;
     }
 
-    return true;
+    const User = mongoose.model('User');
+    const username = getUsernameByPath(path);
+    const userHomepageOwner = await User.findOne<Promise<IUserHasId | null>>({ username });
+    return userHomepageOwner === null;
   }
 
   private canDeleteLogic(