@drax/identity-back 0.33.1 → 0.34.0

package/dist/controllers/UserController.js

@@ -301,7 +301,7 @@ class UserController extends AbstractFastifyController {
     }
     async changePassword(request, reply) {
         try {
-            request.rbac.assertPermission(UserPermissions.Update);
+            request.rbac.assertPermission(UserPermissions.ChangePassword);
             const userId = request.params.id;
             if (!userId) {
                 throw new UnauthorizedError();

package/dist/factory/UserRegistryServiceFactory.js

@@ -0,0 +1,24 @@
+import UserRegistryService from "../services/UserRegistryService.js";
+import { COMMON, CommonConfig, DraxConfig } from "@drax/common-back";
+import UserRegistrySqliteRepository from "../repository/sqlite/UserRegistrySqliteRepository.js";
+import UserRegistryMongoRepository from "../repository/mongo/UserRegistryMongoRepository.js";
+let userRegistryService;
+const UserRegistryServiceFactory = (verbose = false) => {
+    if (!userRegistryService) {
+        let repository;
+        switch (DraxConfig.getOrLoad(CommonConfig.DbEngine)) {
+            case COMMON.DB_ENGINES.MONGODB:
+                repository = new UserRegistryMongoRepository();
+                break;
+            case COMMON.DB_ENGINES.SQLITE:
+                const dbFile = DraxConfig.getOrLoad(CommonConfig.SqliteDbFile);
+                repository = new UserRegistrySqliteRepository(dbFile, verbose);
+                break;
+            default:
+                throw new Error("DraxConfig.DB_ENGINE must be one of " + Object.values(COMMON.DB_ENGINES).join(", "));
+        }
+        userRegistryService = new UserRegistryService(repository);
+    }
+    return userRegistryService;
+};
+export default UserRegistryServiceFactory;

package/dist/interfaces/IRbac.js

@@ -0,0 +1 @@
+export {};

package/dist/routes/UserAvatarRoutes.js

@@ -0,0 +1,70 @@
+import { join } from "path";
+import { StoreManager, UploadFileError, DraxConfig, CommonConfig, UnauthorizedError } from "@drax/common-back";
+import UserServiceFactory from "../factory/UserServiceFactory.js";
+import IdentityConfig from "../config/IdentityConfig.js";
+const BASE_FILE_DIR = DraxConfig.getOrLoad(CommonConfig.FileDir) || 'files';
+const AVATAR_DIR = DraxConfig.getOrLoad(IdentityConfig.AvatarDir) || 'avatar';
+const BASE_URL = DraxConfig.getOrLoad(CommonConfig.BaseUrl) ? DraxConfig.get(CommonConfig.BaseUrl).replace(/\/$/, '') : '';
+async function UserAvatarRoutes(fastify, options) {
+    fastify.post('/api/user/avatar', async (request, reply) => {
+        try {
+            request.rbac.assertAuthenticated();
+            const userId = request.rbac.getAuthUser.id;
+            const data = await request.file();
+            const file = {
+                filename: data.filename,
+                fileStream: data.file,
+                mimetype: data.mimetype
+            };
+            const destinationPath = join(BASE_FILE_DIR, AVATAR_DIR);
+            const storedFile = await StoreManager.saveFile(file, destinationPath);
+            const urlFile = BASE_URL + '/api/user/avatar/' + storedFile.filename;
+            //Save into DB
+            const userService = UserServiceFactory();
+            await userService.changeAvatar(userId, urlFile);
+            return {
+                filename: storedFile.filename,
+                size: storedFile.size,
+                mimetype: storedFile.mimetype,
+                url: urlFile,
+            };
+        }
+        catch (e) {
+            console.error(e);
+            if (e instanceof UploadFileError) {
+                reply.statusCode = e.statusCode;
+                reply.send({ error: e.message });
+            }
+            else if (e instanceof UnauthorizedError) {
+                reply.statusCode = e.statusCode;
+                reply.send({ error: e.message });
+            }
+            else {
+                reply.statusCode = 500;
+                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
+            }
+        }
+    });
+    fastify.get('/api/user/avatar/:filename', async (request, reply) => {
+        try {
+            const filename = request.params.filename;
+            const subPath = 'avatar';
+            const fileDir = join(BASE_FILE_DIR, subPath);
+            console.log("FILE_DIR: ", fileDir, " FILENAME:", filename);
+            return reply.sendFile(filename, fileDir);
+        }
+        catch (e) {
+            console.error(e);
+            if (e instanceof UnauthorizedError) {
+                reply.statusCode = e.statusCode;
+                reply.send({ error: e.message });
+            }
+            else {
+                reply.statusCode = 500;
+                reply.send({ error: 'INTERNAL_SERVER_ERROR' });
+            }
+        }
+    });
+}
+export default UserAvatarRoutes;
+export { UserAvatarRoutes };

package/dist/schemas/TenantSchema.js

@@ -2,7 +2,7 @@ import { object, string, date, record, any } from "zod";
 const TenantBaseSchema = object({
     name: string({ required_error: "validation.required" })
         .min(1, "validation.required")
-        .regex(/^[A-Z]/, "validation.startWithUpperCase"),
+    //.regex(/^[A-Z]/, "validation.startWithUpperCase"),
 });
 const TenantSchema = TenantBaseSchema.extend({
     _id: string(),

package/dist/zod/EndpointZod.js

@@ -0,0 +1,9 @@
+import z from "zod";
+const loginBodyRequestSchema = z.object({
+    username: z.string(),
+    password: z.string(),
+});
+const loginBodyResponseSchema = z.object({
+    accessToken: z.string()
+});
+export { loginBodyRequestSchema, loginBodyResponseSchema };

package/dist/zod/RoleZod.js

@@ -0,0 +1,8 @@
+import { object, string } from "zod";
+const roleSchema = object({
+    name: string({ required_error: "validation.required" })
+        .min(1, "validation.required")
+        .regex(/^[A-Z]/, "validation.startWithUpperCase"),
+});
+export default roleSchema;
+export { roleSchema };

package/dist/zod/TenantSchema.js

@@ -0,0 +1,12 @@
+import { object, string, date } from "zod";
+const TenantBaseSchema = object({
+    name: string({ required_error: "validation.required" })
+        .min(1, "validation.required")
+        .regex(/^[A-Z]/, "validation.startWithUpperCase"),
+});
+const TenantSchema = TenantBaseSchema.extend({
+    id: string(),
+    createdAt: date(),
+    updatedAt: date()
+});
+export { TenantSchema, TenantBaseSchema };

package/dist/zod/TenantZod.js

@@ -0,0 +1,10 @@
+import { object, string } from "zod";
+const TenantBaseSchema = object({
+    name: string({ required_error: "validation.required" })
+        .min(1, "validation.required")
+        .regex(/^[A-Z]/, "validation.startWithUpperCase"),
+});
+const TenantSchema = TenantBaseSchema.extend({
+    id: string(),
+});
+export { TenantSchema, TenantBaseSchema };

package/dist/zod/UserApiKeyZod.js

@@ -0,0 +1,13 @@
+import { array, object, string } from "zod";
+const userApiKeyBaseSchema = object({
+    name: string({ required_error: "validation.required" })
+        .min(1, "validation.required"),
+    ipv4: array(string().ip({ version: "v4", message: 'validation.invalidIpv4' })),
+    ipv6: array(string().ip({ version: "v6", message: 'validation.invalidIpv6' })),
+});
+const userApiKeySchema = userApiKeyBaseSchema.extend({
+    id: string(),
+    createdBy: string(),
+});
+export default userApiKeyBaseSchema;
+export { userApiKeyBaseSchema, userApiKeySchema };

package/dist/zod/UserZod.js

@@ -0,0 +1,18 @@
+import { object, string } from "zod";
+export const userBaseSchema = object({
+    name: string({ required_error: "validation.required" })
+        .min(1, "validation.required"),
+    username: string({ required_error: "validation.required" })
+        .min(1, "validation.required"),
+    email: string({ required_error: "validation.required" })
+        .email("validation.email.invalid"),
+    role: string({ required_error: "validation.required" })
+        .min(1, "validation.required")
+});
+export const createUserSchema = userBaseSchema.extend({
+    password: string({ required_error: "validation.required" })
+        .min(1, "validation.required")
+        .min(8, "validation.password.min8")
+        .max(64, "validation.password.max64"),
+});
+export const editUserSchema = userBaseSchema.extend({});

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.33.1",
+  "version": "0.34.0",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -28,11 +28,11 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.33.0",
-    "@drax/crud-back": "^0.33.1",
-    "@drax/crud-share": "^0.33.0",
-    "@drax/email-back": "^0.33.0",
-    "@drax/identity-share": "^0.33.0",
+    "@drax/common-back": "^0.34.0",
+    "@drax/crud-back": "^0.34.0",
+    "@drax/crud-share": "^0.34.0",
+    "@drax/email-back": "^0.34.0",
+    "@drax/identity-share": "^0.34.0",
     "bcryptjs": "^2.4.3",
     "graphql": "^16.8.2",
     "jsonwebtoken": "^9.0.2"
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "bb0468049ef3388a464c991fa170226739a6f2d2"
+  "gitHead": "3a121099fcdd0814fd232d90aeac0b2086e2e625"
 }

package/src/controllers/UserController.ts

@@ -346,7 +346,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
 
     async changePassword(request, reply) {
         try {
-            request.rbac.assertPermission(UserPermissions.Update)
+            request.rbac.assertPermission(UserPermissions.ChangePassword)
             const userId = request.params.id
             if (!userId) {
                 throw new UnauthorizedError()

package/src/schemas/TenantSchema.ts

@@ -3,7 +3,7 @@ import { object, string, date, record, any } from "zod"
 const TenantBaseSchema = object({
     name: string({ required_error: "validation.required" })
         .min(1, "validation.required")
-        .regex(/^[A-Z]/, "validation.startWithUpperCase"),
+        //.regex(/^[A-Z]/, "validation.startWithUpperCase"),
 })