@drax/identity-back 0.4.0 → 0.5.2

package/src/routes/UserAvatarRoutes.ts

@@ -1,10 +1,10 @@
 import {join} from "path";
-import UnauthorizedError from "../errors/UnauthorizedError.js";
-import {StoreManager, UploadFileError, DraxConfig, CommonConfig} from "@drax/common-back";
+import {StoreManager, UploadFileError, DraxConfig, CommonConfig, UnauthorizedError} from "@drax/common-back";
 import UserServiceFactory from "../factory/UserServiceFactory.js";
 import IdentityConfig from "../config/IdentityConfig.js";
 
-const FILE_DIR = DraxConfig.getOrLoad(IdentityConfig.AvatarDir) || 'avatars';
+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(/\/$/, '') : ''
 
 
@@ -24,13 +24,13 @@ async function UserAvatarRoutes(fastify, options) {
                 mimetype: data.mimetype
             }
 
-            const destinationPath = join(FILE_DIR)
+            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()
-            return await userService.changeAvatar(userId, urlFile)
+            await userService.changeAvatar(userId, urlFile)
 
             return {
                 filename: storedFile.filename,
@@ -58,9 +58,9 @@ async function UserAvatarRoutes(fastify, options) {
     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)
+            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)

package/src/routes/UserRoutes.ts

@@ -1,10 +1,9 @@
 import UserServiceFactory from "../factory/UserServiceFactory.js";
 import {IUser} from "@drax/identity-share";
-import {ValidationError} from "@drax/common-back";
+import {ValidationError, UnauthorizedError} from "@drax/common-back";
 import {IdentityPermissions} from "../permissions/IdentityPermissions.js";
-import UnauthorizedError from "../errors/UnauthorizedError.js";
 import BadCredentialsError from "../errors/BadCredentialsError.js";
-import {IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateResult} from "@drax/crud-share";
 
 async function UserRoutes(fastify, options) {
     fastify.post('/api/auth', async (request, reply) => {

package/src/services/RoleService.ts

@@ -2,7 +2,7 @@ import {IRoleRepository} from "../interfaces/IRoleRepository";
 import { ZodErrorToValidationError} from "@drax/common-back"
 import {roleSchema} from "../zod/RoleZod.js";
 import {ZodError} from "zod";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 import type {IRoleBase, IRole} from "@drax/identity-share";
 
 class RoleService {

package/src/services/TenantService.ts

@@ -3,13 +3,15 @@ import {ValidationError, ZodErrorToValidationError} from "@drax/common-back"
 import {tenantSchema} from "../zod/TenantZod.js";
 import {ZodError} from "zod";
 import {ITenantBase, ITenant} from "@drax/identity-share";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
+import {AbstractService} from "@drax/crud-back";
 
-class TenantService {
+class TenantService extends AbstractService<ITenant,ITenantBase,ITenantBase> {
 
     _repository: ITenantRepository
 
     constructor(tenantRepostitory: ITenantRepository) {
+        super(tenantRepostitory, tenantSchema)
         this._repository = tenantRepostitory
         console.log("TenantService constructor")
     }

package/src/services/UserApiKeyService.ts

@@ -3,7 +3,7 @@ import {DraxConfig, ValidationError, ZodErrorToValidationError} from "@drax/comm
 import {userApiKeySchema} from "../zod/UserApiKeyZod.js";
 import {ZodError} from "zod";
 import {IUserApiKeyBase, IUserApiKey} from "@drax/identity-share";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 import crypto from "node:crypto";
 import AuthUtils from "../utils/AuthUtils.js";
 import IdentityConfig from "../config/IdentityConfig.js";

package/src/services/UserService.ts

@@ -5,7 +5,7 @@ import {ValidationError, ZodErrorToValidationError} from "@drax/common-back";
 import AuthUtils from "../utils/AuthUtils.js";
 import {createUserSchema, editUserSchema,} from "../zod/UserZod.js";
 import BadCredentialsError from "../errors/BadCredentialsError.js";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 
 class UserService {
 

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

@@ -3,7 +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 {IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateResult} from "@drax/crud-share";
 
 describe("RoleRepositoryTest",  function() {
 

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

@@ -5,7 +5,7 @@ import MongoInMemory from "../../db/MongoInMemory";
 import RoleMongoInitializer from "../../initializers/RoleMongoInitializer";
 import UserMongoInitializer from "../../initializers/UserMongoInitializer";
 import {IUserApiKey} from "../../../../identity-share/src/interfaces/IUserApiKey";
-import type {IDraxPaginateResult} from "@drax/common-share";
+import type {IDraxPaginateResult} from "@drax/crud-share";
 import {mongoose, ValidationError} from "@drax/common-back";
 
 

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 {IDraxPaginateResult} from "@drax/common-share";
+import type {IDraxPaginateResult} from "@drax/crud-share";
 import {mongoose, ValidationError} from "@drax/common-back";
 
 

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 {IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateResult} from "@drax/crud-share";
 import RoleSqliteRepository from "../../../src/repository/sqlite/RoleSqliteRepository";
 import {UUID} from "crypto";
 

package/tsconfig.json

@@ -3,9 +3,9 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist",
-    "declarationDir": "./types",
+    "declarationDir": "types"
   },
-  "exclude": ["types", "test", "dist","node_modules"],
+  "exclude": ["types", "test", "dist","node_modules","tmp"],
   "ts-node": {
     "esm": true
   },