@ruiapp/rapid-core 0.9.8 → 0.10.0

package/dist/bootstrapApplicationConfig.d.ts

@@ -435,6 +435,57 @@ declare const _default: {
             description?: undefined;
         })[];
         indexes?: undefined;
+    } | {
+        maintainedBy: string;
+        namespace: string;
+        name: string;
+        code: string;
+        singularCode: string;
+        pluralCode: string;
+        schema: string;
+        tableName: string;
+        properties: ({
+            name: string;
+            code: string;
+            columnName: string;
+            type: "integer";
+            required: true;
+            autoIncrement: true;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "text";
+            required: true;
+            autoIncrement?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "text";
+            required: false;
+            autoIncrement?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "json";
+            required: false;
+            autoIncrement?: undefined;
+        })[];
+        indexes: ({
+            name: string;
+            properties: {
+                code: string;
+            }[];
+            unique: true;
+        } | {
+            name: string;
+            properties: {
+                code: string;
+            }[];
+            unique?: undefined;
+        })[];
     })[];
     dataDictionaries: any[];
     routes: {

package/dist/index.js

@@ -1968,6 +1968,114 @@ var bootstrapApplicationConfig = {
                 },
             ],
         },
+        {
+            maintainedBy: "metaManager",
+            namespace: "meta",
+            name: "page",
+            code: "Page",
+            singularCode: "page",
+            pluralCode: "pages",
+            schema: "public",
+            tableName: "meta_pages",
+            properties: [
+                {
+                    name: "id",
+                    code: "id",
+                    columnName: "id",
+                    type: "integer",
+                    required: true,
+                    autoIncrement: true,
+                },
+                {
+                    name: "code",
+                    code: "code",
+                    columnName: "code",
+                    type: "text",
+                    required: true,
+                },
+                {
+                    name: "parentCode",
+                    code: "parentCode",
+                    columnName: "parent_code",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "subSystem",
+                    code: "subSystem",
+                    columnName: "sub_system",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "appCode",
+                    code: "appCode",
+                    columnName: "app_code",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "routePath",
+                    code: "routePath",
+                    columnName: "route_path",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "name",
+                    code: "name",
+                    columnName: "name",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "title",
+                    code: "title",
+                    columnName: "title",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "config",
+                    code: "config",
+                    columnName: "config",
+                    type: "json",
+                    required: false,
+                },
+                {
+                    name: "permissionCheck",
+                    code: "permissionCheck",
+                    columnName: "permission_check",
+                    type: "json",
+                    required: false,
+                },
+            ],
+            indexes: [
+                {
+                    name: "meta_pages_code_uindex",
+                    properties: [
+                        {
+                            code: "code",
+                        },
+                    ],
+                    unique: true,
+                },
+                {
+                    name: "meta_pages_subsystem_appcode_code_idx",
+                    properties: [
+                        {
+                            code: "subSystem",
+                        },
+                        {
+                            code: "appCode",
+                        },
+                        {
+                            code: "code",
+                        },
+                    ],
+                },
+            ],
+        },
     ],
     dataDictionaries: [],
     routes: [
@@ -5582,7 +5690,7 @@ class MetaService {
         const tablesInDb = await server.queryDatabaseObject(sqlQueryTableInformations);
         const { queryBuilder } = server;
         for (const model of applicationConfig.models) {
-            logger.debug(`Checking data table for '${model.namespace}.${model.singularCode}'...`);
+            logger.info(`Checking data table for '${model.namespace}.${model.singularCode}'...`);
             const expectedTableSchema = model.schema || server.databaseConfig.dbDefaultSchema;
             const expectedTableName = model.tableName;
             const tableInDb = lodash.find(tablesInDb, { table_schema: expectedTableSchema, table_name: expectedTableName });
@@ -5599,7 +5707,7 @@ class MetaService {
       LEFT JOIN pg_catalog.pg_description d ON (d.objoid = st.relid and d.objsubid = c.ordinal_position);`;
         const columnsInDb = await server.queryDatabaseObject(sqlQueryColumnInformations, []);
         for (const model of applicationConfig.models) {
-            logger.debug(`Checking data columns for '${model.namespace}.${model.singularCode}'...`);
+            logger.info(`Checking data columns for '${model.namespace}.${model.singularCode}'...`);
             for (const property of model.properties) {
                 let columnDDL = "";
                 if (isRelationProperty(property)) {
@@ -5740,7 +5848,7 @@ class MetaService {
             const expectedTableSchema = model.schema || server.databaseConfig.dbDefaultSchema;
             const expectedTableName = model.tableName;
             const expectedContraintName = `${expectedTableName}_pk`;
-            logger.debug(`Checking pk for '${expectedTableSchema}.${expectedTableName}'...`);
+            logger.info(`Checking pk for '${expectedTableSchema}.${expectedTableName}'...`);
             const constraintInDb = lodash.find(constraintsInDb, {
                 table_schema: expectedTableSchema,
                 table_name: expectedTableName,
@@ -5756,7 +5864,7 @@ class MetaService {
             if (!model.indexes || !model.indexes.length) {
                 continue;
             }
-            logger.debug(`Creating indexes of table ${queryBuilder.quoteTable(model)}`);
+            logger.info(`Creating indexes of table ${queryBuilder.quoteTable(model)}`);
             for (const index of model.indexes) {
                 const sqlCreateIndex = generateTableIndexDDL(queryBuilder, server, model, index);
                 try {
@@ -7216,19 +7324,8 @@ async function handler$c(plugin, ctx, options) {
         };
         return;
     }
-    const userEntitySingularCode = plugin.options?.userEntitySingularCode || "oc_user";
-    const profilePropertyCodes = plugin.options?.profilePropertyCodes || ["id", "name", "login", "email", "department", "roles", "state", "createdAt"];
-    const entityManager = server.getEntityManager(userEntitySingularCode);
-    const user = await entityManager.findEntity({
-        filters: [
-            {
-                operator: "eq",
-                field: "id",
-                value: userId,
-            },
-        ],
-        properties: profilePropertyCodes,
-    });
+    const authService = server.getService("authService");
+    const user = await authService.getProfileOfUser(userId);
     ctx.output = {
         user,
     };
@@ -7407,9 +7504,13 @@ var pluginRoutes$7 = [changePassword, getMyProfile$1, resetPassword, signin$1, s
 class AuthService {
     #server;
     #jwtKey;
-    constructor(server, jwtKey) {
+    #userEntitySingularCode;
+    #profilePropertyCodes;
+    constructor(server, options) {
         this.#server = server;
-        this.#jwtKey = jwtKey;
+        this.#jwtKey = options.jwtKey;
+        this.#userEntitySingularCode = options.userEntitySingularCode;
+        this.#profilePropertyCodes = options.profilePropertyCodes;
     }
     createUserAccessToken(options) {
         const secretKey = Buffer.from(this.#jwtKey, "base64");
@@ -7422,6 +7523,22 @@ class AuthService {
         }, secretKey);
         return token;
     }
+    async getProfileOfUser(userId) {
+        const userEntitySingularCode = this.#userEntitySingularCode || "oc_user";
+        const profilePropertyCodes = this.#profilePropertyCodes || ["id", "name", "login", "email", "department", "roles", "state", "createdAt"];
+        const entityManager = this.#server.getEntityManager(userEntitySingularCode);
+        const user = await entityManager.findEntity({
+            filters: [
+                {
+                    operator: "eq",
+                    field: "id",
+                    value: userId,
+                },
+            ],
+            properties: profilePropertyCodes,
+        });
+        return user;
+    }
 }
 
 /**
@@ -7460,7 +7577,11 @@ class AuthPlugin {
         server.appendApplicationConfig({ models: pluginModels$6 });
     }
     async configureServices(server, applicationConfig) {
-        this.#authService = new AuthService(server, server.config.jwtKey);
+        this.#authService = new AuthService(server, {
+            jwtKey: server.config.jwtKey,
+            userEntitySingularCode: this.#options.userEntitySingularCode,
+            profilePropertyCodes: this.#options.profilePropertyCodes,
+        });
         server.registerService("authService", this.#authService);
     }
     async configureRoutes(server, applicationConfig) {

package/dist/plugins/auth/services/AuthService.d.ts

@@ -1,4 +1,9 @@
 import { IRpdServer } from "../../../core/server";
+export type AuthServiceOptions = {
+    jwtKey: string;
+    userEntitySingularCode?: string;
+    profilePropertyCodes?: string[];
+};
 export interface UserAccessToken {
     sub: "userAccessToken";
     aud: string;
@@ -10,6 +15,7 @@ export interface CreateUserAccessTokenOptions {
 }
 export default class AuthService {
     #private;
-    constructor(server: IRpdServer, jwtKey: string);
+    constructor(server: IRpdServer, options: AuthServiceOptions);
     createUserAccessToken(options: CreateUserAccessTokenOptions): string;
+    getProfileOfUser(userId: number): Promise<any>;
 }

package/package.json

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

package/src/bootstrapApplicationConfig.ts

@@ -736,6 +736,114 @@ export default {
         },
       ],
     },
+    {
+      maintainedBy: "metaManager",
+      namespace: "meta",
+      name: "page",
+      code: "Page",
+      singularCode: "page",
+      pluralCode: "pages",
+      schema: "public",
+      tableName: "meta_pages",
+      properties: [
+        {
+          name: "id",
+          code: "id",
+          columnName: "id",
+          type: "integer",
+          required: true,
+          autoIncrement: true,
+        },
+        {
+          name: "code",
+          code: "code",
+          columnName: "code",
+          type: "text",
+          required: true,
+        },
+        {
+          name: "parentCode",
+          code: "parentCode",
+          columnName: "parent_code",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "subSystem",
+          code: "subSystem",
+          columnName: "sub_system",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "appCode",
+          code: "appCode",
+          columnName: "app_code",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "routePath",
+          code: "routePath",
+          columnName: "route_path",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "name",
+          code: "name",
+          columnName: "name",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "title",
+          code: "title",
+          columnName: "title",
+          type: "text",
+          required: false,
+        },
+        {
+          name: "config",
+          code: "config",
+          columnName: "config",
+          type: "json",
+          required: false,
+        },
+        {
+          name: "permissionCheck",
+          code: "permissionCheck",
+          columnName: "permission_check",
+          type: "json",
+          required: false,
+        },
+      ],
+      indexes: [
+        {
+          name: "meta_pages_code_uindex",
+          properties: [
+            {
+              code: "code",
+            },
+          ],
+          unique: true,
+        },
+        {
+          name: "meta_pages_subsystem_appcode_code_idx",
+          properties: [
+            {
+              code: "subSystem",
+            },
+            {
+              code: "appCode",
+            },
+            {
+              code: "code",
+            },
+          ],
+        },
+      ],
+    },
   ],
   dataDictionaries: [],
   routes: [

package/src/plugins/auth/AuthPlugin.ts

@@ -62,7 +62,11 @@ class AuthPlugin implements RapidPlugin {
   }
 
   async configureServices(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-    this.#authService = new AuthService(server, server.config.jwtKey);
+    this.#authService = new AuthService(server, {
+      jwtKey: server.config.jwtKey,
+      userEntitySingularCode: this.#options.userEntitySingularCode,
+      profilePropertyCodes: this.#options.profilePropertyCodes,
+    });
     server.registerService("authService", this.#authService);
   }
 

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

@@ -1,6 +1,7 @@
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 import AuthPlugin from "../AuthPlugin";
+import AuthService from "../services/AuthService";
 
 export const code = "getMyProfile";
 
@@ -18,19 +19,8 @@ export async function handler(plugin: AuthPlugin, ctx: ActionHandlerContext, opt
     return;
   }
 
-  const userEntitySingularCode = plugin.options?.userEntitySingularCode || "oc_user";
-  const profilePropertyCodes = plugin.options?.profilePropertyCodes || ["id", "name", "login", "email", "department", "roles", "state", "createdAt"];
-  const entityManager = server.getEntityManager(userEntitySingularCode);
-  const user = await entityManager.findEntity({
-    filters: [
-      {
-        operator: "eq",
-        field: "id",
-        value: userId,
-      },
-    ],
-    properties: profilePropertyCodes,
-  });
+  const authService = server.getService<AuthService>("authService");
+  const user = await authService.getProfileOfUser(userId);
 
   ctx.output = {
     user,

package/src/plugins/auth/services/AuthService.ts

@@ -1,6 +1,12 @@
 import { IRpdServer } from "~/core/server";
 import { createJwt } from "~/utilities/jwtUtility";
 
+export type AuthServiceOptions = {
+  jwtKey: string;
+  userEntitySingularCode?: string;
+  profilePropertyCodes?: string[];
+};
+
 export interface UserAccessToken {
   sub: "userAccessToken";
   aud: string;
@@ -15,10 +21,14 @@ export interface CreateUserAccessTokenOptions {
 export default class AuthService {
   #server: IRpdServer;
   #jwtKey: string;
+  #userEntitySingularCode?: string;
+  #profilePropertyCodes?: string[];
 
-  constructor(server: IRpdServer, jwtKey: string) {
+  constructor(server: IRpdServer, options: AuthServiceOptions) {
     this.#server = server;
-    this.#jwtKey = jwtKey;
+    this.#jwtKey = options.jwtKey;
+    this.#userEntitySingularCode = options.userEntitySingularCode;
+    this.#profilePropertyCodes = options.profilePropertyCodes;
   }
 
   createUserAccessToken(options: CreateUserAccessTokenOptions): string {
@@ -36,4 +46,21 @@ export default class AuthService {
 
     return token;
   }
+
+  async getProfileOfUser(userId: number) {
+    const userEntitySingularCode = this.#userEntitySingularCode || "oc_user";
+    const profilePropertyCodes = this.#profilePropertyCodes || ["id", "name", "login", "email", "department", "roles", "state", "createdAt"];
+    const entityManager = this.#server.getEntityManager(userEntitySingularCode);
+    const user = await entityManager.findEntity({
+      filters: [
+        {
+          operator: "eq",
+          field: "id",
+          value: userId,
+        },
+      ],
+      properties: profilePropertyCodes,
+    });
+    return user;
+  }
 }

package/src/plugins/metaManage/services/MetaService.ts

@@ -156,7 +156,7 @@ export default class MetaService {
     const { queryBuilder } = server;
 
     for (const model of applicationConfig.models) {
-      logger.debug(`Checking data table for '${model.namespace}.${model.singularCode}'...`);
+      logger.info(`Checking data table for '${model.namespace}.${model.singularCode}'...`);
 
       const expectedTableSchema = model.schema || server.databaseConfig.dbDefaultSchema;
       const expectedTableName = model.tableName;
@@ -176,7 +176,7 @@ export default class MetaService {
     const columnsInDb: ColumnInformation[] = await server.queryDatabaseObject(sqlQueryColumnInformations, []);
 
     for (const model of applicationConfig.models) {
-      logger.debug(`Checking data columns for '${model.namespace}.${model.singularCode}'...`);
+      logger.info(`Checking data columns for '${model.namespace}.${model.singularCode}'...`);
 
       for (const property of model.properties) {
         let columnDDL = "";
@@ -336,7 +336,7 @@ export default class MetaService {
       const expectedTableSchema = model.schema || server.databaseConfig.dbDefaultSchema;
       const expectedTableName = model.tableName;
       const expectedContraintName = `${expectedTableName}_pk`;
-      logger.debug(`Checking pk for '${expectedTableSchema}.${expectedTableName}'...`);
+      logger.info(`Checking pk for '${expectedTableSchema}.${expectedTableName}'...`);
       const constraintInDb = find(constraintsInDb, {
         table_schema: expectedTableSchema,
         table_name: expectedTableName,
@@ -357,7 +357,7 @@ export default class MetaService {
         continue;
       }
 
-      logger.debug(`Creating indexes of table ${queryBuilder.quoteTable(model)}`);
+      logger.info(`Creating indexes of table ${queryBuilder.quoteTable(model)}`);
       for (const index of model.indexes) {
         const sqlCreateIndex = generateTableIndexDDL(queryBuilder, server, model, index);
         try {