@drax/identity-back 0.0.27 → 0.0.29

package/src/routes/UserAvatarRoutes.ts

@@ -0,0 +1,80 @@
+import {join} from "path";
+import {UnauthorizedError} from "@drax/identity-back";
+import {StoreManager, UploadFileError} from "@drax/common-back";
+import UserServiceFactory from "../factory/UserServiceFactory.js";
+
+const FILE_DIR = process.env.DRAX_AVATAR_DIR || 'avatars';
+const BASE_URL = process.env.DRAX_BASE_URL.replace(/\/$/, '') || ''
+
+async function UserAvatarRoutes(fastify, options) {
+
+
+    fastify.post('/api/user/avatar', async (request, reply): Promise<any> => {
+        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(FILE_DIR)
+            const storedFile = await StoreManager.saveFile(file, destinationPath)
+            const urlFile = BASE_URL + '/api/user/avatar/' + storedFile.filename
+
+            //Save into DB
+            const userService = UserServiceFactory()
+            return 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): Promise<any> => {
+        try {
+            const filename = request.params.filename
+            const [year, month] = filename.split('-')
+            const fileDir = join(FILE_DIR, year, month)
+            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/src/services/UserService.ts

@@ -44,7 +44,14 @@ class UserService {
 
     async changeOwnPassword(userId : string, currentPassword : string, newPassword : string){
         const user = await this.findById(userId)
+
+
         if(user && user.active){
+
+            if(currentPassword === newPassword){
+                throw new ValidationError([{field: 'newPassword', reason: 'validation.password.currentDifferent'}])
+            }
+
             if (AuthUtils.checkPassword(currentPassword, user.password)) {
                 newPassword =  AuthUtils.hashPassword(newPassword)
                 await this._repository.changePassword(userId, newPassword)
@@ -58,6 +65,16 @@ class UserService {
         }
     }
 
+    async changeAvatar(userId : string, avatar: string){
+        const user = await this.findById(userId)
+        if(user && user.active){
+                await this._repository.changeAvatar(userId, avatar)
+                return true
+        }else{
+            throw new BadCredentialsError()
+        }
+    }
+
 
     async create(userData: IUserCreate): Promise<IUser> {
         try{

package/test/data-obj/roles/admin-mongo-role.ts

@@ -3,7 +3,7 @@ import {IRole} from "../../../../identity-share/src/interfaces/IRole"
 
 
 const role = {
-  _id: new mongoose.Types.ObjectId("646a661e44c93567c23d8d62"),
+  _id: "646a661e44c93567c23d8d62",
   name: "Admin",
   permissions: [],
   childRoles: [],

package/test/repository/mongo/role-mongo-repository.test.ts

@@ -3,8 +3,7 @@ import {equal} from "assert";
 import RoleMongoRepository from "../../../src/repository/mongo/RoleMongoRepository";
 import MongoInMemory from "../../db/MongoInMemory";
 import {IRole} from "../../../../identity-share/src/interfaces/IRole";
-import {PaginateResult} from "mongoose";
-import {IPaginateResult} from "@drax/common-back";
+import {IDraxPaginateResult} from "@drax/common-share";
 
 describe("RoleRepositoryTest",  function() {
 
@@ -48,7 +47,7 @@ describe("RoleRepositoryTest",  function() {
     })
 
     it("Paginate roles successfully.",  async function() {
-        let paginateRoles: IPaginateResult = await roleReposirory.paginate(1,5)
+        let paginateRoles: IDraxPaginateResult<IRole> = await roleReposirory.paginate({page: 1, limit: 5})
         equal(paginateRoles.items.length,1)
         equal(paginateRoles.total,1)
         equal(paginateRoles.page,1)

package/test/repository/mongo/user-mongo-repository.test.ts

@@ -4,7 +4,7 @@ import UserMongoRepository from "../../../src/repository/mongo/UserMongoReposito
 import MongoInMemory from "../../db/MongoInMemory";
 import RoleMongoInitializer from "../../initializers/RoleMongoInitializer";
 import {IUser} from "../../../../identity-share/src/interfaces/IUser";
-import type {IPaginateResult} from "@drax/common-back";
+import type {IDraxPaginateResult} from "@drax/common-share";
 import {mongoose, ValidationError} from "@drax/common-back";
 
 
@@ -113,7 +113,7 @@ test.describe("UserRepositoryTest", function () {
 
 
     test("Paginate mongo users successfully.",  async function() {
-        let paginateUsers: IPaginateResult = await userRepository.paginate()
+        let paginateUsers: IDraxPaginateResult<IUser> = await userRepository.paginate({page: 1, limit: 5})
         equal(paginateUsers.items.length,1)
         equal(paginateUsers.total,1)
         equal(paginateUsers.page,1)

package/test/repository/sqlite/role-sqlite-repository.test.ts

@@ -1,7 +1,7 @@
 import  {describe,it, before, after} from "node:test"
 import {equal} from "assert";
 import {IRole} from "../../../../identity-share/src/interfaces/IRole";
-import {IPaginateResult} from "@drax/common-back";
+import {IDraxPaginateResult} from "@drax/common-share";
 import RoleSqliteRepository from "../../../src/repository/sqlite/RoleSqliteRepository";
 import {UUID} from "crypto";
 
@@ -45,7 +45,7 @@ describe("RoleRepositoryTest",  function() {
     })
 
     it("Paginate roles successfully.",  async function() {
-        let paginateRoles: IPaginateResult = await roleReposirory.paginate(1,5)
+        let paginateRoles: IDraxPaginateResult<IRole> = await roleReposirory.paginate({page: 1, limit: 5})
         console.log(paginateRoles)
         equal(paginateRoles.items.length,2)
         equal(paginateRoles.total,2)

package/test/repository/sqlite/user-sqlite-repository.test.ts

@@ -114,7 +114,7 @@ test.describe("UserRepositoryTest", function () {
     })
 
     test("Paginate users successfully.",  async function() {
-        let paginateUsers = await userRepository.paginate()
+        let paginateUsers = await userRepository.paginate({page: 1, limit:5})
 
         equal(paginateUsers.total,1)
         equal(paginateUsers.page,1)

package/tsconfig.json

@@ -4,18 +4,8 @@
     "rootDir": "src",
     "outDir": "dist",
     "declarationDir": "./types",
-    "moduleResolution": "node"
   },
-  "exclude": [
-    "test",
-    "types",
-    "dist"
-  ],
-  "references": [
-    {
-      "path": "../../common/common-back"
-    }
-  ],
+  "exclude": ["test", "types","dist"],
   "ts-node": {
     "esm": true
   },