@ruiapp/rapid-core 0.1.28 → 0.1.30

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export { default as MetaManagePlugin } from "./plugins/metaManage/MetaManagePlug
 export { default as DataManagePlugin } from "./plugins/dataManage/DataManagePlugin";
 export { default as RouteManagePlugin } from "./plugins/routeManage/RouteManagePlugin";
 export { default as SequencePlugin } from "./plugins/sequence/SequencePlugin";
+export * from "./plugins/sequence/SequencePluginTypes";
 export { default as WebhooksPlugin } from "./plugins/webhooks/WebhooksPlugin";
 export { default as AuthPlugin } from "./plugins/auth/AuthPlugin";
 export { default as FileManagePlugin } from "./plugins/fileManage/FileManagePlugin";

package/dist/index.js

@@ -2784,32 +2784,32 @@ async function generateJwtSecretKey() {
     return encode(exportedKey);
 }
 
-const code$m = "listMetaModels";
-async function handler$m(plugin, ctx, options) {
+const code$n = "listMetaModels";
+async function handler$n(plugin, ctx, options) {
     const { applicationConfig } = ctx;
     ctx.output = { list: applicationConfig.models };
 }
 
 var listMetaModels = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$m,
-  handler: handler$m
+  code: code$n,
+  handler: handler$n
 });
 
-const code$l = "listMetaRoutes";
-async function handler$l(plugin, ctx, options) {
+const code$m = "listMetaRoutes";
+async function handler$m(plugin, ctx, options) {
     const { applicationConfig } = ctx;
     ctx.output = { list: applicationConfig.routes };
 }
 
 var listMetaRoutes = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$l,
-  handler: handler$l
+  code: code$m,
+  handler: handler$m
 });
 
-const code$k = "getMetaModelDetail";
-async function handler$k(plugin, ctx, options) {
+const code$l = "getMetaModelDetail";
+async function handler$l(plugin, ctx, options) {
     const { server, input } = ctx;
     const model = server.getModel(input);
     ctx.output = model;
@@ -2817,8 +2817,8 @@ async function handler$k(plugin, ctx, options) {
 
 var getMetaModelDetail = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$k,
-  handler: handler$k
+  code: code$l,
+  handler: handler$l
 });
 
 /**
@@ -3170,9 +3170,9 @@ function transformFilterWithSubFilters(filter) {
     return filter;
 }
 
-const code$j = "findCollectionEntities";
-async function handler$j(plugin, ctx, options) {
-    await runCollectionEntityActionHandler(ctx, options, code$j, async (entityManager, input) => {
+const code$k = "findCollectionEntities";
+async function handler$k(plugin, ctx, options) {
+    await runCollectionEntityActionHandler(ctx, options, code$k, async (entityManager, input) => {
         input.filters = removeFiltersWithNullValue(input.filters);
         const entities = await entityManager.findEntities(input);
         const result = { list: entities };
@@ -3187,14 +3187,14 @@ async function handler$j(plugin, ctx, options) {
 
 var findCollectionEntities = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$j,
-  handler: handler$j
+  code: code$k,
+  handler: handler$k
 });
 
-const code$i = "findCollectionEntityById";
-async function handler$i(plugin, ctx, options) {
+const code$j = "findCollectionEntityById";
+async function handler$j(plugin, ctx, options) {
     const { logger, server, input } = ctx;
-    logger.debug(`Running ${code$i} handler...`, { input });
+    logger.debug(`Running ${code$j} handler...`, { input });
     const { id } = input;
     const entityManager = server.getEntityManager(options.singularCode);
     const entity = await entityManager.findById(id);
@@ -3206,13 +3206,13 @@ async function handler$i(plugin, ctx, options) {
 
 var findCollectionEntityById = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$i,
-  handler: handler$i
+  code: code$j,
+  handler: handler$j
 });
 
-const code$h = "countCollectionEntities";
-async function handler$h(plugin, ctx, options) {
-    await runCollectionEntityActionHandler(ctx, options, code$h, (entityManager, input) => {
+const code$i = "countCollectionEntities";
+async function handler$i(plugin, ctx, options) {
+    await runCollectionEntityActionHandler(ctx, options, code$i, (entityManager, input) => {
         input.filters = removeFiltersWithNullValue(input.filters);
         return entityManager.count(input);
     });
@@ -3220,16 +3220,16 @@ async function handler$h(plugin, ctx, options) {
 
 var countCollectionEntities = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$h,
-  handler: handler$h
+  code: code$i,
+  handler: handler$i
 });
 
-const code$g = "createCollectionEntity";
-async function handler$g(plugin, ctx, options) {
+const code$h = "createCollectionEntity";
+async function handler$h(plugin, ctx, options) {
     const { logger, server, input } = ctx;
     const { defaultInput, fixedInput } = options;
     const mergedInput = mergeInput(defaultInput, input, fixedInput);
-    logger.debug(`Running ${code$g} handler...`, { defaultInput, fixedInput, mergedInput });
+    logger.debug(`Running ${code$h} handler...`, { defaultInput, fixedInput, mergedInput });
     const userId = ctx.routerContext.state?.userId;
     if (userId) {
         input.createdBy = userId;
@@ -3243,15 +3243,15 @@ async function handler$g(plugin, ctx, options) {
 
 var createCollectionEntity = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$g,
-  handler: handler$g
+  code: code$h,
+  handler: handler$h
 });
 
-const code$f = "createCollectionEntitiesBatch";
-async function handler$f(plugin, ctx, options) {
+const code$g = "createCollectionEntitiesBatch";
+async function handler$g(plugin, ctx, options) {
     const { logger, server, input } = ctx;
     const { defaultInput, fixedInput } = options;
-    logger.debug(`Running ${code$f} handler...`, { defaultInput, fixedInput, input });
+    logger.debug(`Running ${code$g} handler...`, { defaultInput, fixedInput, input });
     const { entities } = input;
     if (!lodash.isArray(entities)) {
         throw new Error("input.entities should be an array.");
@@ -3274,16 +3274,16 @@ async function handler$f(plugin, ctx, options) {
 
 var createCollectionEntitiesBatch = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$f,
-  handler: handler$f
+  code: code$g,
+  handler: handler$g
 });
 
-const code$e = "updateCollectionEntityById";
-async function handler$e(plugin, ctx, options) {
+const code$f = "updateCollectionEntityById";
+async function handler$f(plugin, ctx, options) {
     const { logger, server, input } = ctx;
     const { defaultInput, fixedInput } = options;
     const mergedInput = mergeInput(defaultInput, input, fixedInput);
-    logger.debug(`Running ${code$e} handler...`, { defaultInput, fixedInput, mergedInput });
+    logger.debug(`Running ${code$f} handler...`, { defaultInput, fixedInput, mergedInput });
     const entityManager = server.getEntityManager(options.singularCode);
     const output = await entityManager.updateEntityById({ id: mergedInput.id, entityToSave: mergedInput }, plugin);
     ctx.output = output;
@@ -3291,14 +3291,14 @@ async function handler$e(plugin, ctx, options) {
 
 var updateCollectionEntityById = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$e,
-  handler: handler$e
+  code: code$f,
+  handler: handler$f
 });
 
-const code$d = "deleteCollectionEntityById";
-async function handler$d(plugin, ctx, options) {
+const code$e = "deleteCollectionEntityById";
+async function handler$e(plugin, ctx, options) {
     const { logger, server, input } = ctx;
-    logger.debug(`Running ${code$d} handler...`);
+    logger.debug(`Running ${code$e} handler...`);
     const entityManager = server.getEntityManager(options.singularCode);
     await entityManager.deleteById(input.id, plugin);
     ctx.status = 200;
@@ -3307,16 +3307,16 @@ async function handler$d(plugin, ctx, options) {
 
 var deleteCollectionEntityById = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$d,
-  handler: handler$d
+  code: code$e,
+  handler: handler$e
 });
 
-const code$c = "addEntityRelations";
-async function handler$c(plugin, ctx, options) {
+const code$d = "addEntityRelations";
+async function handler$d(plugin, ctx, options) {
     const { logger, server, input } = ctx;
     const { defaultInput, fixedInput } = options;
     const mergedInput = mergeInput(defaultInput, input, fixedInput);
-    logger.debug(`Running ${code$c} handler...`, { defaultInput, fixedInput, mergedInput });
+    logger.debug(`Running ${code$d} handler...`, { defaultInput, fixedInput, mergedInput });
     const entityManager = server.getEntityManager(options.singularCode);
     await entityManager.addRelations(mergedInput, plugin);
     ctx.output = {};
@@ -3324,16 +3324,16 @@ async function handler$c(plugin, ctx, options) {
 
 var addEntityRelations = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$c,
-  handler: handler$c
+  code: code$d,
+  handler: handler$d
 });
 
-const code$b = "removeEntityRelations";
-async function handler$b(plugin, ctx, options) {
+const code$c = "removeEntityRelations";
+async function handler$c(plugin, ctx, options) {
     const { logger, server, input } = ctx;
     const { defaultInput, fixedInput } = options;
     const mergedInput = mergeInput(defaultInput, input, fixedInput);
-    logger.debug(`Running ${code$b} handler...`, { defaultInput, fixedInput, mergedInput });
+    logger.debug(`Running ${code$c} handler...`, { defaultInput, fixedInput, mergedInput });
     const entityManager = server.getEntityManager(options.singularCode);
     await entityManager.removeRelations(mergedInput, plugin);
     ctx.output = {};
@@ -3341,16 +3341,16 @@ async function handler$b(plugin, ctx, options) {
 
 var removeEntityRelations = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$b,
-  handler: handler$b
+  code: code$c,
+  handler: handler$c
 });
 
-const code$a = "queryDatabase";
-async function handler$a(plugin, ctx, options) {
+const code$b = "queryDatabase";
+async function handler$b(plugin, ctx, options) {
     const { logger, server, input } = ctx;
     const { sql, querySingle, defaultInput, fixedInput } = options;
     const mergedInput = mergeInput(defaultInput, input, fixedInput);
-    logger.debug(`Running ${code$a} handler...`, { defaultInput, fixedInput, mergedInput });
+    logger.debug(`Running ${code$b} handler...`, { defaultInput, fixedInput, mergedInput });
     const result = await server.queryDatabaseObject(sql, mergedInput);
     if (querySingle) {
         ctx.output = lodash.first(result);
@@ -3362,8 +3362,8 @@ async function handler$a(plugin, ctx, options) {
 
 var queryDatabase = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$a,
-  handler: handler$a
+  code: code$b,
+  handler: handler$b
 });
 
 /**
@@ -3534,17 +3534,17 @@ async function sendSourceResponse(proxyCtx, targetRes) {
     srcRes.body = targetRes.body;
 }
 
-const code$9 = "httpProxy";
-async function handler$9(plugin, ctx, options) {
+const code$a = "httpProxy";
+async function handler$a(plugin, ctx, options) {
     const { logger } = ctx;
-    logger.debug(`Running ${code$9} handler...`);
+    logger.debug(`Running ${code$a} handler...`);
     await doProxy(ctx.routerContext, options);
 }
 
 var httpProxy = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$9,
-  handler: handler$9
+  code: code$a,
+  handler: handler$a
 });
 
 /**
@@ -3783,8 +3783,8 @@ async function generateSn$2(server, input) {
     return sequenceNumbers;
 }
 
-const code$8 = "generateSn";
-async function handler$8(plugin, ctx, options) {
+const code$9 = "generateSn";
+async function handler$9(plugin, ctx, options) {
     const { server, routerContext } = ctx;
     const input = ctx.input;
     if (options?.ruleCode) {
@@ -3801,8 +3801,8 @@ async function handler$8(plugin, ctx, options) {
 
 var generateSn$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  code: code$8,
-  handler: handler$8
+  code: code$9,
+  handler: handler$9
 });
 
 var pluginActionHandlers$2 = [
@@ -3989,7 +3989,6 @@ class SequencePlugin {
         }
     }
     async beforeCreateEntity(server, model, options) {
-        debugger;
         const entity = options.entity;
         for (const property of model.properties) {
             const sequenceConfig = property.config?.sequence;
@@ -4192,6 +4191,53 @@ class WebhooksPlugin {
     }
 }
 
+const code$8 = "changePassword";
+async function handler$8(plugin, ctx, options) {
+    const { server, input, routerContext } = ctx;
+    const { id, oldPassword, newPassword } = input;
+    const userId = routerContext.state.userId;
+    if (!userId) {
+        ctx.status = 401;
+        ctx.output = {
+            error: {
+                message: "You are not signed in."
+            }
+        };
+        return;
+    }
+    const userDataAccessor = server.getDataAccessor({
+        singularCode: "oc_user",
+    });
+    const user = await userDataAccessor.findOne({
+        filters: [
+            {
+                operator: "eq",
+                field: "id",
+                value: userId,
+            }
+        ]
+    });
+    if (!user) {
+        throw new Error("User not found.");
+    }
+    const isMatch = await bcrypt__default["default"].compare(oldPassword, user.password);
+    if (!isMatch) {
+        throw new Error("旧密码错误。");
+    }
+    const saltRounds = 10;
+    const passwordHash = await bcrypt__default["default"].hash(newPassword, saltRounds);
+    await userDataAccessor.updateById(user.id, {
+        password: passwordHash,
+    });
+    ctx.output = {};
+}
+
+var changePassword$1 = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  code: code$8,
+  handler: handler$8
+});
+
 const code$7 = "createSession";
 async function handler$7(plugin, ctx, options) {
     const { server, input, routerContext } = ctx;
@@ -4320,17 +4366,18 @@ async function handler$4(plugin, ctx, options) {
     ctx.output = {};
 }
 
-var resetPassword = /*#__PURE__*/Object.freeze({
+var resetPassword$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   code: code$4,
   handler: handler$4
 });
 
 var pluginActionHandlers$1 = [
+    changePassword$1,
     createSession,
     deleteSession,
     getMyProfile$2,
-    resetPassword,
+    resetPassword$1,
 ];
 
 var AccessToken = {
@@ -4392,6 +4439,20 @@ var pluginModels = [
     AccessToken,
 ];
 
+var changePassword = {
+    namespace: "auth",
+    name: "auth.changePassword",
+    code: "auth.changePassword",
+    type: "RESTful",
+    method: "POST",
+    endpoint: "/changePassword",
+    actions: [
+        {
+            code: "changePassword",
+        },
+    ],
+};
+
 var getMyProfile$1 = {
     namespace: "auth",
     name: "auth.getMyProfile",
@@ -4406,6 +4467,20 @@ var getMyProfile$1 = {
     ],
 };
 
+var resetPassword = {
+    namespace: "auth",
+    name: "auth.resetPassword",
+    code: "auth.resetPassword",
+    type: "RESTful",
+    method: "POST",
+    endpoint: "/resetPassword",
+    actions: [
+        {
+            code: "resetPassword",
+        },
+    ],
+};
+
 var signin$1 = {
     namespace: "auth",
     name: "auth.signin",
@@ -4435,7 +4510,9 @@ var signout$1 = {
 };
 
 var pluginRoutes$1 = [
+    changePassword,
     getMyProfile$1,
+    resetPassword,
     signin$1,
     signout$1,
 ];

package/dist/plugins/auth/actionHandlers/index.d.ts

@@ -1,6 +1,7 @@
+import * as changePassword from "./changePassword";
 import * as createSession from "./createSession";
 import * as deleteSession from "./deleteSession";
 import * as getMyProfile from "./getMyProfile";
 import * as resetPassword from "./resetPassword";
-declare const _default: (typeof createSession | typeof deleteSession | typeof getMyProfile | typeof resetPassword)[];
+declare const _default: (typeof changePassword | typeof createSession | typeof deleteSession | typeof getMyProfile | typeof resetPassword)[];
 export default _default;

package/dist/plugins/auth/routes/changePassword.d.ts

@@ -0,0 +1,12 @@
+declare const _default: {
+    namespace: string;
+    name: string;
+    code: string;
+    type: "RESTful";
+    method: "POST";
+    endpoint: string;
+    actions: {
+        code: string;
+    }[];
+};
+export default _default;

package/dist/plugins/auth/routes/index.d.ts

@@ -3,7 +3,7 @@ declare const _default: ({
     name: string;
     code: string;
     type: "RESTful";
-    method: "GET";
+    method: "POST";
     endpoint: string;
     actions: {
         code: string;
@@ -13,7 +13,7 @@ declare const _default: ({
     name: string;
     code: string;
     type: "RESTful";
-    method: "POST";
+    method: "GET";
     endpoint: string;
     actions: {
         code: string;

package/dist/plugins/auth/routes/resetPassword.d.ts

@@ -0,0 +1,12 @@
+declare const _default: {
+    namespace: string;
+    name: string;
+    code: string;
+    type: "RESTful";
+    method: "POST";
+    endpoint: string;
+    actions: {
+        code: string;
+    }[];
+};
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -18,6 +18,7 @@ export { default as MetaManagePlugin } from "./plugins/metaManage/MetaManagePlug
 export { default as DataManagePlugin } from "./plugins/dataManage/DataManagePlugin";
 export { default as RouteManagePlugin } from "./plugins/routeManage/RouteManagePlugin";
 export { default as SequencePlugin } from "./plugins/sequence/SequencePlugin";
+export * from "./plugins/sequence/SequencePluginTypes";
 export { default as WebhooksPlugin } from "./plugins/webhooks/WebhooksPlugin";
 export { default as AuthPlugin } from "./plugins/auth/AuthPlugin";
 export { default as FileManagePlugin } from "./plugins/fileManage/FileManagePlugin";
@@ -25,4 +26,4 @@ export { default as ServerOperationPlugin } from "./plugins/serverOperation/Serv
 export * from "./plugins/serverOperation/ServerOperationPluginTypes";
 export { default as EntityWatchPlugin } from "./plugins/entityWatch/EntityWatchPlugin";
 export * from "./plugins/entityWatch/EntityWatchPluginTypes";
-export { default as EntityAccessControlPlugin } from "./plugins/entityAccessControl/EntityAccessControlPlugin";
+export { default as EntityAccessControlPlugin } from "./plugins/entityAccessControl/EntityAccessControlPlugin";

package/src/plugins/auth/actionHandlers/index.ts

@@ -1,10 +1,12 @@
 import { IPluginActionHandler } from "~/core/actionHandler";
+import * as changePassword from "./changePassword";
 import * as createSession from "./createSession";
 import * as deleteSession from "./deleteSession";
 import * as getMyProfile from "./getMyProfile";
 import * as resetPassword from "./resetPassword";
 
 export default [
+  changePassword,
   createSession,
   deleteSession,
   getMyProfile,

package/src/plugins/auth/routes/changePassword.ts

@@ -0,0 +1,15 @@
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "auth",
+  name: "auth.changePassword",
+  code: "auth.changePassword",
+  type: "RESTful",
+  method: "POST",
+  endpoint: "/changePassword",
+  actions: [
+    {
+      code: "changePassword",
+    },
+  ],
+} satisfies RpdRoute;

package/src/plugins/auth/routes/index.ts

@@ -1,9 +1,13 @@
+import changePassword from "./changePassword";
 import getMyProfile from "./getMyProfile";
+import resetPassword from "./resetPassword";
 import signin from "./signin";
 import signout from "./signout";
 
 export default [
+  changePassword,
   getMyProfile,
+  resetPassword,
   signin,
   signout,
 ]

package/src/plugins/auth/routes/resetPassword.ts

@@ -0,0 +1,15 @@
+import { RpdRoute } from "~/types";
+
+export default {
+  namespace: "auth",
+  name: "auth.resetPassword",
+  code: "auth.resetPassword",
+  type: "RESTful",
+  method: "POST",
+  endpoint: "/resetPassword",
+  actions: [
+    {
+      code: "resetPassword",
+    },
+  ],
+} satisfies RpdRoute;

package/src/plugins/sequence/SequencePlugin.ts

@@ -13,8 +13,7 @@ import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginCo
 import pluginActionHandlers from "./actionHandlers";
 import pluginModels from "./models";
 import pluginRoutes from "./routes";
-import { RouteContext } from "~/core/routeContext";
-import { PropertySequenceConfig } from "./sequence-types";
+import { PropertySequenceConfig } from "./SequencePluginTypes";
 import { isNull, isUndefined } from "lodash";
 import { generateSn } from "./SequenceService";
 
@@ -94,7 +93,6 @@ class SequencePlugin implements RapidPlugin {
   }
 
   async beforeCreateEntity(server: IRpdServer, model: RpdDataModel, options: CreateEntityOptions) {
-    debugger;
     const entity = options.entity;
     for (const property of model.properties) {
       const sequenceConfig: PropertySequenceConfig = property.config?.sequence;

package/src/plugins/sequence/SequenceService.ts

@@ -2,7 +2,7 @@ import { IRpdServer } from "~/core/server";
 import { SequenceSegmentConfig } from "~/types";
 import segmentResolvers from "./segments";
 import { find } from "lodash";
-import { SequenceRuleConfig } from "./sequence-types";
+import { SequenceRuleConfig } from "./SequencePluginTypes";
 
 export interface GenerateSequenceNumbersInput {
   ruleCode: string;