@adminforth/user-soft-delete 1.0.0 → 1.1.0

package/dist/index.js

@@ -48,6 +48,17 @@ export default class UserSoftDelete extends AdminForthPlugin {
                     return rejectResult;
                 }
             }));
+            const adminUserAuthorize = this.adminforth.config.auth.adminUserAuthorize;
+            const adminUserAuthorizeArray = Array.isArray(adminUserAuthorize) ? adminUserAuthorize : [adminUserAuthorize];
+            adminUserAuthorizeArray.unshift((_a) => __awaiter(this, [_a], void 0, function* ({ extra, adminUser }) {
+                const rejectResult = {
+                    error: 'Your account is deactivated',
+                    allowed: false,
+                };
+                if (adminUser.dbUser[this.options.activeFieldName] === false) {
+                    return rejectResult;
+                }
+            }));
             if (!resourceConfig.options.pageInjections) {
                 resourceConfig.options.pageInjections = {};
             }
@@ -88,9 +99,6 @@ export default class UserSoftDelete extends AdminForthPlugin {
                 if (typeof this.allowDisableFunc === "function") {
                     isAllowedToDeactivate = yield this.allowDisableFunc(adminUser);
                 }
-                else if (typeof this.allowDisableFunc === "boolean") {
-                    isAllowedToDeactivate = this.allowDisableFunc;
-                }
                 if (isAllowedToDeactivate === false) {
                     return { ok: false, error: "Not allowed to deactivate user" };
                 }

package/index.ts

@@ -44,6 +44,20 @@ export default class UserSoftDelete extends AdminForthPlugin {
       }
     );
 
+    const adminUserAuthorize = this.adminforth.config.auth.adminUserAuthorize;
+    const adminUserAuthorizeArray = Array.isArray(adminUserAuthorize) ? adminUserAuthorize : [adminUserAuthorize];
+    adminUserAuthorizeArray.unshift(
+      async({ extra, adminUser }: { adminUser: AdminUser, response: IAdminForthHttpResponse, extra?: any} )=> {
+        const rejectResult = {
+          error: 'Your account is deactivated',
+          allowed: false,
+        };
+        if (adminUser.dbUser[this.options.activeFieldName] === false) {
+          return rejectResult;
+        }
+      }
+    );
+
     if ( !resourceConfig.options.pageInjections ) {
       resourceConfig.options.pageInjections = {};
     }
@@ -88,8 +102,6 @@ export default class UserSoftDelete extends AdminForthPlugin {
         let isAllowedToDeactivate = false;
         if ( typeof this.allowDisableFunc === "function" ) {
           isAllowedToDeactivate = await this.allowDisableFunc(adminUser);
-        } else if (typeof this.allowDisableFunc === "boolean") {
-          isAllowedToDeactivate = this.allowDisableFunc;
         }
         if ( isAllowedToDeactivate === false ) {
           return {ok: false, error: "Not allowed to deactivate user"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/user-soft-delete",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -16,12 +16,12 @@
   "description": "",
   "devDependencies": {
     "@types/node": "latest",
-    "typescript": "^5.7.3",
     "semantic-release": "^24.2.1",
-    "semantic-release-slack-bot": "^4.0.2"
+    "semantic-release-slack-bot": "^4.0.2",
+    "typescript": "^5.7.3"
   },
   "dependencies": {
-    "adminforth": "^2.4.0-next.191"
+    "adminforth": "^2.4.0-next.227"
   },
   "release": {
     "plugins": [

package/types.ts

@@ -2,5 +2,5 @@ import type { AdminUser } from "adminforth";
 
 export interface PluginOptions {
     activeFieldName: string; 
-    canDeactivate?: (adminUser: AdminUser) => Promise<boolean>;
+    canDeactivate: (adminUser: AdminUser) => Promise<boolean>;
 }