@drax/identity-back 0.4.0 → 0.5.1

package/dist/routes/UserAvatarRoutes.js

@@ -3,7 +3,8 @@ import UnauthorizedError from "../errors/UnauthorizedError.js";
 import { StoreManager, UploadFileError, DraxConfig, CommonConfig } 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(/\/$/, '') : '';
 async function UserAvatarRoutes(fastify, options) {
     fastify.post('/api/user/avatar', async (request, reply) => {
@@ -16,12 +17,12 @@ async function UserAvatarRoutes(fastify, options) {
                 fileStream: data.file,
                 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,
                 size: storedFile.size,
@@ -48,9 +49,9 @@ async function UserAvatarRoutes(fastify, options) {
     fastify.get('/api/user/avatar/:filename', async (request, reply) => {
         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) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -28,9 +28,9 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.4.0",
-    "@drax/common-share": "^0.4.0",
-    "@drax/identity-share": "^0.4.0",
+    "@drax/common-back": "^0.5.1",
+    "@drax/crud-share": "^0.5.1",
+    "@drax/identity-share": "^0.5.1",
     "bcryptjs": "^2.4.3",
     "express-jwt": "^8.4.1",
     "graphql": "^16.8.2",
@@ -61,5 +61,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "481b302fe72f403abf092806ceca540dd2765dfa"
+  "gitHead": "6f507c8b52e134f10839fd7698c2466ff65a3d08"
 }

package/src/interfaces/IRoleRepository.ts

@@ -1,5 +1,5 @@
 import {IRole, IRoleBase} from "@drax/identity-share";
-import {IDraxCrud} from "@drax/common-share";
+import {IDraxCrud} from "@drax/crud-share";
 
 interface IRoleRepository extends IDraxCrud<IRole, IRoleBase, IRoleBase> {
     findById(id: string): Promise<IRole | null>;

package/src/interfaces/ITenantRepository.ts

@@ -1,5 +1,5 @@
 import {ITenant, ITenantBase} from '@drax/identity-share'
-import {IDraxCrud} from "@drax/common-share";
+import {IDraxCrud} from "@drax/crud-share";
 interface ITenantRepository extends IDraxCrud<ITenant,ITenantBase,ITenantBase>{
     findById(id: string): Promise<ITenant | null>;
     findByName(name: string): Promise<ITenant | null>;

package/src/interfaces/IUserApiKeyRepository.ts

@@ -1,5 +1,5 @@
 import {IUserApiKey, IUserApiKeyBase} from '@drax/identity-share'
-import {IDraxCrud} from "@drax/common-share";
+import {IDraxCrud} from "@drax/crud-share";
 
 interface IUserApiKeyRepository extends IDraxCrud<IUserApiKey, IUserApiKeyBase, IUserApiKeyBase>{
     findBySecret(username: string): Promise<IUserApiKey | null>;

package/src/interfaces/IUserRepository.ts

@@ -1,5 +1,5 @@
 import {IUser, IUserCreate, IUserUpdate} from '@drax/identity-share'
-import {IDraxCrud} from "@drax/common-share";
+import {IDraxCrud} from "@drax/crud-share";
 
 interface IUserRepository extends IDraxCrud<IUser, IUserCreate, IUserUpdate>{
     findById(id: string): Promise<IUser | null>;

package/src/repository/mongo/RoleMongoRepository.ts

@@ -3,7 +3,7 @@ import {IRoleRepository} from '../../interfaces/IRoleRepository'
 import {mongoose, MongooseQueryFilter, MongooseSort} from "@drax/common-back";
 import {PaginateOptions, PaginateResult} from "mongoose";
 import {DeleteResult} from "mongodb";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 import {IRoleBase, IRole} from "@drax/identity-share";
 
 class RoleMongoRepository implements IRoleRepository{

package/src/repository/mongo/TenantMongoRepository.ts

@@ -3,7 +3,7 @@ import {ITenantRepository} from '../../interfaces/ITenantRepository'
 import {mongoose, MongooseSort, MongooseQueryFilter} from "@drax/common-back";
 import { PaginateOptions, PaginateResult} from "mongoose";
 import {DeleteResult} from "mongodb";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 import {ITenant, ITenantBase} from "@drax/identity-share";
 
 class TenantMongoRepository implements ITenantRepository{

package/src/repository/mongo/UserApiKeyMongoRepository.ts

@@ -8,7 +8,7 @@ import {
 import type {IUserApiKey, IUserApiKeyBase, IUserApiKeySoftDelete} from "@drax/identity-share";
 import {DeleteResult, MongoServerError} from "mongodb";
 import {PaginateResult} from "mongoose";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 import {IUserApiKeyRepository} from "../../interfaces/IUserApiKeyRepository";
 
 class UserMongoRepository implements IUserApiKeyRepository {

package/src/repository/mongo/UserMongoRepository.ts

@@ -11,7 +11,7 @@ import {DeleteResult, MongoServerError} from "mongodb";
 import type {IUserRepository} from "../../interfaces/IUserRepository";
 import {PaginateResult} from "mongoose";
 import RoleMongoRepository from "./RoleMongoRepository.js";
-import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateOptions, IDraxPaginateResult} from "@drax/crud-share";
 
 class UserMongoRepository implements IUserRepository {
     private roleRepository: RoleMongoRepository;

package/src/repository/sqlite/RoleSqliteRepository.ts

@@ -2,7 +2,7 @@ import {IRoleRepository} from '../../interfaces/IRoleRepository'
 import {UUID} from "crypto";
 import sqlite from "better-sqlite3";
 import {randomUUID} from "node:crypto";
-import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/common-share";
+import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/crud-share";
 import {IRole, IRoleBase} from "@drax/identity-share";
 import {
     SqliteErrorToValidationError,

package/src/repository/sqlite/TenantSqliteRepository.ts

@@ -3,7 +3,7 @@ import {ITenantRepository} from '../../interfaces/ITenantRepository'
 import {UUID} from "crypto";
 import sqlite from "better-sqlite3";
 import {randomUUID} from "node:crypto";
-import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/common-share";
+import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/crud-share";
 import {SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort} from "@drax/common-back";
 import type {SqliteTableField} from "@drax/common-back";
 

package/src/repository/sqlite/UserApiKeySqliteRepository.ts

@@ -3,7 +3,7 @@ import {IUserApiKeyRepository} from '../../interfaces/IUserApiKeyRepository'
 import {UUID} from "crypto";
 import sqlite from "better-sqlite3";
 import {randomUUID} from "node:crypto";
-import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/common-share";
+import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/crud-share";
 import {SqliteErrorToValidationError, SqliteTableBuilder, SqlQueryFilter, SqlSort} from "@drax/common-back";
 import type {SqliteTableField} from "@drax/common-back";
 import UserSqliteRepository from "./UserSqliteRepository.js";

package/src/repository/sqlite/UserSqliteRepository.ts

@@ -3,7 +3,7 @@ import sqlite from "better-sqlite3";
 import {randomUUID} from "node:crypto";
 import {UUID} from "crypto";
 import {IUserRepository} from "../../interfaces/IUserRepository";
-import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/common-share";
+import {IDraxPaginateResult, IDraxPaginateOptions} from "@drax/crud-share";
 import {
     SqliteErrorToValidationError,
     SqliteTableBuilder,

package/src/routes/RoleRoutes.ts

@@ -4,7 +4,7 @@ import {IRole} from "@drax/identity-share";
 import {IdentityPermissions} from "../permissions/IdentityPermissions.js";
 import {PermissionService} from "../services/PermissionService.js";
 import UnauthorizedError from "../errors/UnauthorizedError.js";
-import {IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateResult} from "@drax/crud-share";
 
 
 

package/src/routes/TenantRoutes.ts

@@ -3,7 +3,7 @@ import TenantServiceFactory from "../factory/TenantServiceFactory.js";
 import {ITenant} from "@drax/identity-share";
 import {IdentityPermissions} from "../permissions/IdentityPermissions.js";
 import UnauthorizedError from "../errors/UnauthorizedError.js";
-import {IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateResult} from "@drax/crud-share";
 
 
 

package/src/routes/UserApiKeyRoutes.ts

@@ -3,7 +3,7 @@ import type {IUserApiKey} from "@drax/identity-share";
 import {ValidationError} from "@drax/common-back";
 import {IdentityPermissions} from "../permissions/IdentityPermissions.js";
 import UnauthorizedError from "../errors/UnauthorizedError.js";
-import {IDraxPaginateResult} from "@drax/common-share";
+import {IDraxPaginateResult} from "@drax/crud-share";
 
 
 async function UserApiKeyRoutes(fastify, options) {

package/src/routes/UserAvatarRoutes.ts

@@ -4,7 +4,8 @@ import {StoreManager, UploadFileError, DraxConfig, CommonConfig} from "@drax/com
 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 +25,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 +59,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

@@ -4,7 +4,7 @@ import {ValidationError} 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,7 +3,7 @@ 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";
 
 class TenantService {
 

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";