@nocobase/plugin-users 1.6.0-alpha.2 → 1.6.0-alpha.21

package/dist/server/profile/edit-form-schema.js

@@ -0,0 +1,521 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var edit_form_schema_exports = {};
+__export(edit_form_schema_exports, {
+  adminProfileCreateFormSchema: () => adminProfileCreateFormSchema,
+  adminProfileEditFormSchema: () => adminProfileEditFormSchema,
+  userProfileEditFormSchema: () => userProfileEditFormSchema
+});
+module.exports = __toCommonJS(edit_form_schema_exports);
+const adminProfileCreateFormSchema = {
+  type: "void",
+  "x-uid": "nocobase-admin-profile-create-form",
+  properties: {
+    form: {
+      type: "void",
+      "x-decorator": "FormBlockProvider",
+      "x-decorator-props": {
+        collection: "users",
+        dataSource: "main"
+      },
+      "x-use-decorator-props": "useCreateFormBlockDecoratorProps",
+      properties: {
+        create: {
+          type: "void",
+          "x-component": "FormV2",
+          "x-use-component-props": "useCreateFormBlockProps",
+          properties: {
+            grid: {
+              type: "void",
+              "x-component": "Grid",
+              "x-initializer": "form:configureFields",
+              properties: {
+                nickname: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        nickname: {
+                          type: "string",
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.nickname"
+                        }
+                      }
+                    }
+                  }
+                },
+                username: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        username: {
+                          type: "string",
+                          required: true,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.username"
+                        }
+                      }
+                    }
+                  }
+                },
+                email: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        email: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.email"
+                        }
+                      }
+                    }
+                  }
+                },
+                phone: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        phone: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.phone"
+                        }
+                      }
+                    }
+                  }
+                },
+                password: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        password: {
+                          type: "string",
+                          required: true,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.password"
+                        }
+                      }
+                    }
+                  }
+                },
+                roles: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        roles: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.roles"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            footer: {
+              type: "void",
+              "x-component": "Action.Drawer.FootBar",
+              properties: {
+                cancel: {
+                  title: '{{ t("Cancel") }}',
+                  "x-component": "Action",
+                  "x-use-component-props": "useCancelActionProps"
+                },
+                submit: {
+                  title: '{{ t("Submit") }}',
+                  "x-component": "Action",
+                  "x-use-component-props": "useCreateActionProps",
+                  "x-component-props": {
+                    type: "primary",
+                    htmlType: "submit"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+};
+const adminProfileEditFormSchema = {
+  type: "void",
+  "x-uid": "nocobase-admin-profile-edit-form",
+  properties: {
+    form: {
+      type: "void",
+      "x-decorator": "FormBlockProvider",
+      "x-decorator-props": {
+        collection: "users",
+        dataSource: "main",
+        action: "get"
+      },
+      "x-use-decorator-props": "useEditFormBlockDecoratorProps",
+      properties: {
+        edit: {
+          type: "void",
+          "x-component": "FormV2",
+          "x-use-component-props": "useEditFormBlockProps",
+          properties: {
+            grid: {
+              type: "void",
+              "x-component": "Grid",
+              "x-initializer": "form:configureFields",
+              properties: {
+                nickname: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        nickname: {
+                          type: "string",
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.nickname"
+                        }
+                      }
+                    }
+                  }
+                },
+                username: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        username: {
+                          type: "string",
+                          required: true,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.username"
+                        }
+                      }
+                    }
+                  }
+                },
+                email: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        email: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.email"
+                        }
+                      }
+                    }
+                  }
+                },
+                phone: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        phone: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.phone"
+                        }
+                      }
+                    }
+                  }
+                },
+                roles: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        roles: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.roles"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            footer: {
+              type: "void",
+              "x-component": "Action.Drawer.FootBar",
+              properties: {
+                cancel: {
+                  title: '{{ t("Cancel") }}',
+                  "x-component": "Action",
+                  "x-use-component-props": "useCancelActionProps"
+                },
+                submit: {
+                  title: '{{ t("Submit") }}',
+                  "x-component": "Action",
+                  "x-use-component-props": "useUpdateActionProps",
+                  "x-component-props": {
+                    type: "primary",
+                    htmlType: "submit"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+};
+const userProfileEditFormSchema = {
+  type: "void",
+  "x-uid": "nocobase-user-profile-edit-form",
+  properties: {
+    form: {
+      type: "void",
+      "x-decorator": "FormBlockProvider",
+      "x-decorator-props": {
+        collection: "users",
+        dataSource: "main",
+        action: "get"
+      },
+      "x-use-decorator-props": "useEditFormBlockDecoratorProps",
+      properties: {
+        edit: {
+          type: "void",
+          "x-component": "FormV2",
+          "x-use-component-props": "useEditFormBlockProps",
+          properties: {
+            grid: {
+              type: "void",
+              "x-component": "Grid",
+              "x-initializer": "form:configureFields",
+              properties: {
+                nickname: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        nickname: {
+                          type: "string",
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.nickname"
+                        }
+                      }
+                    }
+                  }
+                },
+                username: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        username: {
+                          type: "string",
+                          required: true,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.username"
+                        }
+                      }
+                    }
+                  }
+                },
+                email: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        email: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.email"
+                        }
+                      }
+                    }
+                  }
+                },
+                phone: {
+                  type: "void",
+                  "x-component": "Grid.Row",
+                  properties: {
+                    col: {
+                      type: "void",
+                      "x-component": "Grid.Col",
+                      properties: {
+                        phone: {
+                          type: "string",
+                          required: false,
+                          "x-toolbar": "FormItemSchemaToolbar",
+                          "x-settings": "fieldSettings:FormItem",
+                          "x-component": "CollectionField",
+                          "x-decorator": "FormItem",
+                          "x-component-props": {},
+                          "x-collection-field": "users.phone"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            footer: {
+              type: "void",
+              "x-component": "Action.Drawer.FootBar",
+              properties: {
+                cancel: {
+                  title: '{{ t("Cancel") }}',
+                  "x-component": "Action",
+                  "x-use-component-props": "useCancelActionProps"
+                },
+                submit: {
+                  title: '{{ t("Submit") }}',
+                  "x-component": "Action",
+                  "x-use-component-props": "useUpdateProfileActionProps",
+                  "x-component-props": {
+                    type: "primary",
+                    htmlType: "submit"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  adminProfileCreateFormSchema,
+  adminProfileEditFormSchema,
+  userProfileEditFormSchema
+});

package/dist/server/server.d.ts

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@nocobase/server';
 export default class PluginUsersServer extends Plugin {
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
@@ -16,5 +16,7 @@ export default class PluginUsersServer extends Plugin {
         rootNickname: any;
         rootUsername: any;
     };
-    install(options: any): Promise<void>;
+    initUserCollection(options: InstallOptions): Promise<void>;
+    initProfileSchema(): Promise<void>;
+    install(options: InstallOptions): Promise<void>;
 }

package/dist/server/server.js

@@ -45,6 +45,7 @@ var import_utils = require("@nocobase/utils");
 var actions = __toESM(require("./actions/users"));
 var import_UserModel = require("./models/UserModel");
 var import_user_data_sync_resource = require("./user-data-sync-resource");
+var import_edit_form_schema = require("./profile/edit-form-schema");
 class PluginUsersServer extends import_server.Plugin {
   async beforeLoad() {
     this.db.registerModels({
@@ -169,7 +170,7 @@ class PluginUsersServer extends import_server.Plugin {
         }
       };
     });
-    const loggedInActions = ["updateProfile"];
+    const loggedInActions = ["updateProfile", "updateLang"];
     loggedInActions.forEach((action) => this.app.acl.allow("users", action, "loggedIn"));
     this.app.acl.registerSnippet({
       name: `pm.${this.name}`,
@@ -178,16 +179,10 @@ class PluginUsersServer extends import_server.Plugin {
     const getMetaDataForUpdateProfileAction = async (ctx) => {
       return {
         request: {
-          params: ctx.request.params,
-          query: ctx.request.query,
           body: {
             ...ctx.request.body,
             password: "******"
-          },
-          path: ctx.request.path
-        },
-        response: {
-          body: ctx.body
+          }
         }
       };
     };
@@ -220,6 +215,13 @@ class PluginUsersServer extends import_server.Plugin {
         await Promise.all(values.map((userId) => ctx.app.emitAsync("cache:del:roles", { userId })));
       }
     });
+    this.app.resourceManager.use(async (ctx, next) => {
+      const { resourceName, actionName } = ctx.action;
+      if (resourceName === "users" && actionName === "updateProfile") {
+        ctx.action.actionName = "update";
+      }
+      await next();
+    });
     const userDataSyncPlugin = this.app.pm.get("user-data-sync");
     if (userDataSyncPlugin && userDataSyncPlugin.enabled) {
       userDataSyncPlugin.resourceManager.registerResource(new import_user_data_sync_resource.UserDataSyncResource(this.db, this.app.logger));
@@ -249,7 +251,7 @@ class PluginUsersServer extends import_server.Plugin {
       rootUsername
     };
   }
-  async install(options) {
+  async initUserCollection(options) {
     const { rootNickname, rootPassword, rootEmail, rootUsername } = this.getInstallingData(options);
     const User = this.db.getCollection("users");
     if (await User.repository.findOne({ filter: { email: rootEmail } })) {
@@ -268,4 +270,17 @@ class PluginUsersServer extends import_server.Plugin {
       await repo.db2cm("users");
     }
   }
+  async initProfileSchema() {
+    const uiSchemas = this.db.getRepository("uiSchemas");
+    if (!uiSchemas) {
+      return;
+    }
+    await uiSchemas.insert(import_edit_form_schema.adminProfileCreateFormSchema);
+    await uiSchemas.insert(import_edit_form_schema.adminProfileEditFormSchema);
+    await uiSchemas.insert(import_edit_form_schema.userProfileEditFormSchema);
+  }
+  async install(options) {
+    await this.initUserCollection(options);
+    await this.initProfileSchema();
+  }
 }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "用户",
   "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "1.6.0-alpha.2",
+  "version": "1.6.0-alpha.21",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/users",
@@ -19,13 +19,14 @@
     "@nocobase/database": "1.x",
     "@nocobase/plugin-acl": "1.x",
     "@nocobase/plugin-auth": "1.x",
+    "@nocobase/plugin-ui-schema-storage": "1.x",
     "@nocobase/plugin-user-data-sync": "1.x",
     "@nocobase/resourcer": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "08bbc34c21727fc0ad0880f397a42bf7741091ee",
+  "gitHead": "873cbaec9554e684781b8dc6cfd4386bb5cfa5b0",
   "keywords": [
     "Users & permissions"
   ]