@drax/identity-back 0.37.2 → 0.37.5

package/dist/index.js

@@ -2,10 +2,16 @@ import GraphqlMerge from "./graphql/index.js";
 import UserServiceFactory from "./factory/UserServiceFactory.js";
 import RoleServiceFactory from "./factory/RoleServiceFactory.js";
 import TenantServiceFactory from "./factory/TenantServiceFactory.js";
+import UserApiKeyServiceFactory from "./factory/UserApiKeyServiceFactory.js";
+import UserLoginFailServiceFactory from "./factory/UserLoginFailServiceFactory.js";
+import UserSessionServiceFactory from "./factory/UserSessionServiceFactory.js";
 import RoleService from "./services/RoleService.js";
 import UserService from "./services/UserService.js";
 import TenantService from "./services/TenantService.js";
 import PermissionService from "./services/PermissionService.js";
+import UserApiKeyService from "./services/UserApiKeyService.js";
+import UserSessionService from "./services/UserSessionService.js";
+import UserLoginFailService from "./services/UserLoginFailService.js";
 import Rbac from "./rbac/Rbac.js";
 import { UserRoutes } from "./routes/UserRoutes.js";
 import { RoleRoutes } from "./routes/RoleRoutes.js";
@@ -24,6 +30,24 @@ import CreateOrUpdateRole from "./setup/CreateOrUpdateRole.js";
 import LoadPermissions from "./setup/LoadPermissions.js";
 import LoadIdentityConfigFromEnv from "./setup/LoadIdentityConfigFromEnv.js";
 import RecoveryUserPassword from "./setup/RecoveryUserPassword.js";
+import { RoleModel, RoleMongoSchema } from "./models/RoleModel.js";
+import { TenantModel, TenantMongoSchema } from "./models/TenantModel.js";
+import { UserModel, UserMongoSchema } from "./models/UserModel.js";
+import { UserApiKeyModel, UserApiKeyMongoSchema } from "./models/UserApiKeyModel.js";
+import { UserSessionModel, UserSessionMongoSchema } from "./models/UserSessionModel.js";
+import { UserLoginFailModel, UserLoginFailMongoSchema } from "./models/UserLoginFailModel.js";
+import RoleMongoRepository from "./repository/mongo/RoleMongoRepository.js";
+import TenantMongoRepository from "./repository/mongo/TenantMongoRepository.js";
+import UserMongoRepository from "./repository/mongo/UserMongoRepository.js";
+import UserApiKeyMongoRepository from "./repository/mongo/UserApiKeyMongoRepository.js";
+import UserSessionMongoRepository from "./repository/mongo/UserSessionMongoRepository.js";
+import UserLoginFailMongoRepository from "./repository/mongo/UserLoginFailMongoRepository.js";
+import RoleSqliteRepository from "./repository/sqlite/RoleSqliteRepository.js";
+import TenantSqliteRepository from "./repository/sqlite/TenantSqliteRepository.js";
+import UserSqliteRepository from "./repository/sqlite/UserSqliteRepository.js";
+import UserApiKeySqliteRepository from "./repository/sqlite/UserApiKeySqliteRepository.js";
+import UserLoginFailSqliteRepository from "./repository/sqlite/UserLoginFailSqliteRepository.js";
+import UserSessionSqliteRepository from "./repository/sqlite/UserSessionSqliteRepository.js";
 import { RolePermissions } from "./permissions/RolePermissions.js";
 import { TenantPermissions } from "./permissions/TenantPermissions.js";
 import { UserPermissions } from "./permissions/UserPermissions.js";
@@ -34,16 +58,18 @@ import { UserSchema, UserBaseSchema } from "./schemas/UserSchema.js";
 import { TenantSchema, TenantBaseSchema } from "./schemas/TenantSchema.js";
 import { RoleSchema, RoleBaseSchema } from "./schemas/RoleSchema.js";
 import { UserApiKeySchema, UserApiKeyBaseSchema } from "./schemas/UserApiKeySchema.js";
+import { UserLoginFailBaseSchema } from "./schemas/UserLoginFailSchema.js";
+import { UserSessionBaseSchema } from "./schemas/UserSessionSchema.js";
 const graphqlMergeResult = await GraphqlMerge();
 const identityTypeDefs = await graphqlMergeResult.typeDefs;
 const identityResolvers = await graphqlMergeResult.resolvers;
 export { 
 //Schemas
-UserSchema, UserBaseSchema, TenantSchema, TenantBaseSchema, RoleSchema, RoleBaseSchema, UserApiKeyBaseSchema, UserApiKeySchema, 
+UserSchema, UserBaseSchema, TenantSchema, TenantBaseSchema, RoleSchema, RoleBaseSchema, UserApiKeyBaseSchema, UserApiKeySchema, UserLoginFailBaseSchema, UserSessionBaseSchema, 
 //Service
-UserService, RoleService, TenantService, PermissionService, Rbac, 
+UserService, RoleService, TenantService, UserApiKeyService, UserSessionService, UserLoginFailService, PermissionService, Rbac, 
 //Factories
-UserServiceFactory, RoleServiceFactory, TenantServiceFactory, 
+UserServiceFactory, RoleServiceFactory, TenantServiceFactory, UserApiKeyServiceFactory, UserSessionServiceFactory, UserLoginFailServiceFactory, 
 //GQL
 identityTypeDefs, identityResolvers, 
 //API REST
@@ -52,6 +78,12 @@ UserRoutes, RoleRoutes, TenantRoutes, UserApiKeyRoutes, UserSessionRoutes, UserL
 jwtMiddleware, rbacMiddleware, apiKeyMiddleware, 
 //Permissions
 RolePermissions, TenantPermissions, UserPermissions, UserApiKeyPermissions, UserSessionPermissions, UserLoginFailPermissions, 
+//Mongo Repositories
+RoleMongoRepository, TenantMongoRepository, UserMongoRepository, UserApiKeyMongoRepository, UserSessionMongoRepository, UserLoginFailMongoRepository, 
+//Mongo Models
+RoleModel, TenantModel, UserModel, UserApiKeyModel, UserSessionModel, UserLoginFailModel, RoleMongoSchema, TenantMongoSchema, UserMongoSchema, UserApiKeyMongoSchema, UserSessionMongoSchema, UserLoginFailMongoSchema, 
+//Sqlite Repositories
+RoleSqliteRepository, TenantSqliteRepository, UserSqliteRepository, UserApiKeySqliteRepository, UserLoginFailSqliteRepository, UserSessionSqliteRepository, 
 //Config
 IdentityConfig, 
 //Errors

package/dist/middleware/apiKeyMiddleware.js

@@ -11,13 +11,20 @@ async function userApiKeyLoader(k) {
 async function apiKeyMiddleware(request, reply) {
     try {
         let apiKey;
+        //Por header 'x-api-key'
         if (request.headers['x-api-key']) {
             apiKey = request.headers['x-api-key'];
         }
+        //Por authorization 'ApiKey <uuid-key>'
         const apiKeyRegExp = /^ApiKey (.*)$/i;
         if (request.headers['authorization'] && apiKeyRegExp.test(request.headers['authorization'])) {
             apiKey = request.headers?.authorization?.replace(/ApiKey /i, "");
         }
+        //Por authorization '<uuid-key>'
+        const uuidRegex = /^[0-9a-fA-F]{24}$/i;
+        if (request.headers['authorization'] && uuidRegex.test(request.headers['authorization'])) {
+            apiKey = request.headers['authorization'];
+        }
         if (apiKey) {
             const userApiKey = await draxCache.getOrLoad(apiKey, userApiKeyLoader);
             if (userApiKey && userApiKey.user) {

package/dist/models/UserLoginFailModel.js

@@ -1,20 +1,20 @@
 import { mongoose } from '@drax/common-back';
 import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2';
-const UserLoginFailSchema = new mongoose.Schema({
+const UserLoginFailMongoSchema = new mongoose.Schema({
     username: { type: String, required: false, index: false, unique: false },
     userAgent: { type: String, required: false, index: false, unique: false },
     ip: { type: String, required: false, index: false, unique: false },
 }, { timestamps: true });
-UserLoginFailSchema.plugin(uniqueValidator, { message: 'validation.unique' });
-UserLoginFailSchema.plugin(mongoosePaginate);
-UserLoginFailSchema.virtual("id").get(function () {
+UserLoginFailMongoSchema.plugin(uniqueValidator, { message: 'validation.unique' });
+UserLoginFailMongoSchema.plugin(mongoosePaginate);
+UserLoginFailMongoSchema.virtual("id").get(function () {
     return this._id.toString();
 });
-UserLoginFailSchema.set('toJSON', { getters: true, virtuals: true });
-UserLoginFailSchema.set('toObject', { getters: true, virtuals: true });
+UserLoginFailMongoSchema.set('toJSON', { getters: true, virtuals: true });
+UserLoginFailMongoSchema.set('toObject', { getters: true, virtuals: true });
 const MODEL_NAME = 'UserLoginFail';
 const COLLECTION_NAME = 'UserLoginFail';
-const UserLoginFailModel = mongoose.model(MODEL_NAME, UserLoginFailSchema, COLLECTION_NAME);
-export { UserLoginFailSchema, UserLoginFailModel };
+const UserLoginFailModel = mongoose.model(MODEL_NAME, UserLoginFailMongoSchema, COLLECTION_NAME);
+export { UserLoginFailMongoSchema, UserLoginFailModel };
 export default UserLoginFailModel;

package/dist/models/UserSessionModel.js

@@ -1,21 +1,21 @@
 import { mongoose } from '@drax/common-back';
 import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2';
-const UserSessionSchema = new mongoose.Schema({
+const UserSessionMongoSchema = new mongoose.Schema({
     uuid: { type: String, required: true, index: true, unique: false },
     user: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true, index: true, unique: false },
     userAgent: { type: String, required: false, index: false, unique: false },
     ip: { type: String, required: false, index: false, unique: false },
 }, { timestamps: true });
-UserSessionSchema.plugin(uniqueValidator, { message: 'validation.unique' });
-UserSessionSchema.plugin(mongoosePaginate);
-UserSessionSchema.virtual("id").get(function () {
+UserSessionMongoSchema.plugin(uniqueValidator, { message: 'validation.unique' });
+UserSessionMongoSchema.plugin(mongoosePaginate);
+UserSessionMongoSchema.virtual("id").get(function () {
     return this._id.toString();
 });
-UserSessionSchema.set('toJSON', { getters: true, virtuals: true });
-UserSessionSchema.set('toObject', { getters: true, virtuals: true });
+UserSessionMongoSchema.set('toJSON', { getters: true, virtuals: true });
+UserSessionMongoSchema.set('toObject', { getters: true, virtuals: true });
 const MODEL_NAME = 'UserSession';
 const COLLECTION_NAME = 'UserSession';
-const UserSessionModel = mongoose.model(MODEL_NAME, UserSessionSchema, COLLECTION_NAME);
-export { UserSessionSchema, UserSessionModel };
+const UserSessionModel = mongoose.model(MODEL_NAME, UserSessionMongoSchema, COLLECTION_NAME);
+export { UserSessionMongoSchema, UserSessionModel };
 export default UserSessionModel;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.37.2",
+  "version": "0.37.5",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -29,7 +29,7 @@
   "license": "ISC",
   "dependencies": {
     "@drax/common-back": "^0.37.2",
-    "@drax/crud-back": "^0.37.2",
+    "@drax/crud-back": "^0.37.5",
     "@drax/crud-share": "^0.37.0",
     "@drax/email-back": "^0.37.0",
     "@drax/identity-share": "^0.37.0",
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "85833fa79a0d1df3899c13a3a47ed3e7e3fe0448"
+  "gitHead": "2fd3d1fa98a875f67691ea4524682985a52cba17"
 }

package/src/index.ts

@@ -2,11 +2,17 @@ import GraphqlMerge from "./graphql/index.js"
 import UserServiceFactory from "./factory/UserServiceFactory.js";
 import RoleServiceFactory from "./factory/RoleServiceFactory.js";
 import TenantServiceFactory from "./factory/TenantServiceFactory.js";
+import UserApiKeyServiceFactory from "./factory/UserApiKeyServiceFactory.js";
+import UserLoginFailServiceFactory from "./factory/UserLoginFailServiceFactory.js";
+import UserSessionServiceFactory from "./factory/UserSessionServiceFactory.js";
 
 import RoleService from "./services/RoleService.js";
 import UserService from "./services/UserService.js";
 import TenantService from "./services/TenantService.js";
 import PermissionService from "./services/PermissionService.js";
+import UserApiKeyService from "./services/UserApiKeyService.js";
+import UserSessionService from "./services/UserSessionService.js";
+import UserLoginFailService from "./services/UserLoginFailService.js";
 
 import Rbac from "./rbac/Rbac.js";
 
@@ -35,6 +41,30 @@ import type {IRoleRepository} from "./interfaces/IRoleRepository";
 import type {ITenantRepository} from "./interfaces/ITenantRepository";
 import type {IUserRepository} from "./interfaces/IUserRepository";
 import type {IUserApiKeyRepository} from "./interfaces/IUserApiKeyRepository";
+import type {IUserLoginFailRepository} from "./interfaces/IUserLoginFailRepository";
+import type {IUserSessionRepository} from "./interfaces/IUserSessionRepository";
+
+import {RoleModel, RoleMongoSchema} from "./models/RoleModel.js";
+import {TenantModel, TenantMongoSchema} from "./models/TenantModel.js";
+import {UserModel, UserMongoSchema} from "./models/UserModel.js";
+import {UserApiKeyModel, UserApiKeyMongoSchema} from "./models/UserApiKeyModel.js";
+import {UserSessionModel,UserSessionMongoSchema} from "./models/UserSessionModel.js";
+import {UserLoginFailModel,UserLoginFailMongoSchema} from "./models/UserLoginFailModel.js";
+
+
+import RoleMongoRepository from "./repository/mongo/RoleMongoRepository.js";
+import TenantMongoRepository from "./repository/mongo/TenantMongoRepository.js";
+import UserMongoRepository from "./repository/mongo/UserMongoRepository.js";
+import UserApiKeyMongoRepository from "./repository/mongo/UserApiKeyMongoRepository.js";
+import UserSessionMongoRepository from "./repository/mongo/UserSessionMongoRepository.js";
+import UserLoginFailMongoRepository from "./repository/mongo/UserLoginFailMongoRepository.js";
+
+import RoleSqliteRepository from "./repository/sqlite/RoleSqliteRepository.js";
+import TenantSqliteRepository from "./repository/sqlite/TenantSqliteRepository.js";
+import UserSqliteRepository from "./repository/sqlite/UserSqliteRepository.js";
+import UserApiKeySqliteRepository from "./repository/sqlite/UserApiKeySqliteRepository.js";
+import UserLoginFailSqliteRepository from "./repository/sqlite/UserLoginFailSqliteRepository.js";
+import UserSessionSqliteRepository from "./repository/sqlite/UserSessionSqliteRepository.js";
 
 
 import {RolePermissions} from "./permissions/RolePermissions.js";
@@ -48,6 +78,8 @@ import {UserSchema, UserBaseSchema} from "./schemas/UserSchema.js";
 import {TenantSchema,TenantBaseSchema} from "./schemas/TenantSchema.js";
 import {RoleSchema, RoleBaseSchema} from "./schemas/RoleSchema.js";
 import {UserApiKeySchema, UserApiKeyBaseSchema} from "./schemas/UserApiKeySchema.js";
+import {UserLoginFailBaseSchema, UserLoginFailSchema} from "./schemas/UserLoginFailSchema.js";
+import {UserSessionBaseSchema, UserSessionSchema} from "./schemas/UserSessionSchema.js";
 
 
 const graphqlMergeResult = await GraphqlMerge()
@@ -60,6 +92,8 @@ export type {
     ITenantRepository,
     IUserRepository,
     IUserApiKeyRepository,
+    IUserLoginFailRepository,
+    IUserSessionRepository,
 }
 
 export {
@@ -73,11 +107,16 @@ export {
     RoleBaseSchema,
     UserApiKeyBaseSchema,
     UserApiKeySchema,
+    UserLoginFailBaseSchema,
+    UserSessionBaseSchema,
 
     //Service
     UserService,
     RoleService,
     TenantService,
+    UserApiKeyService,
+    UserSessionService,
+    UserLoginFailService,
     PermissionService,
     Rbac,
 
@@ -85,6 +124,9 @@ export {
     UserServiceFactory,
     RoleServiceFactory,
     TenantServiceFactory,
+    UserApiKeyServiceFactory,
+    UserSessionServiceFactory,
+    UserLoginFailServiceFactory,
 
     //GQL
     identityTypeDefs,
@@ -113,6 +155,37 @@ export {
     UserSessionPermissions,
     UserLoginFailPermissions,
 
+    //Mongo Repositories
+    RoleMongoRepository,
+    TenantMongoRepository,
+    UserMongoRepository,
+    UserApiKeyMongoRepository,
+    UserSessionMongoRepository,
+    UserLoginFailMongoRepository,
+
+    //Mongo Models
+    RoleModel,
+    TenantModel,
+    UserModel,
+    UserApiKeyModel,
+    UserSessionModel,
+    UserLoginFailModel,
+
+    RoleMongoSchema,
+    TenantMongoSchema,
+    UserMongoSchema,
+    UserApiKeyMongoSchema,
+    UserSessionMongoSchema,
+    UserLoginFailMongoSchema,
+
+    //Sqlite Repositories
+    RoleSqliteRepository,
+    TenantSqliteRepository,
+    UserSqliteRepository,
+    UserApiKeySqliteRepository,
+    UserLoginFailSqliteRepository,
+    UserSessionSqliteRepository,
+
     //Config
     IdentityConfig,
 

package/src/middleware/apiKeyMiddleware.ts

@@ -17,15 +17,23 @@ async function apiKeyMiddleware (request, reply) {
         try{
             let apiKey: string
 
+            //Por header 'x-api-key'
             if(request.headers['x-api-key']){
                 apiKey = request.headers['x-api-key']
             }
 
+            //Por authorization 'ApiKey <uuid-key>'
             const apiKeyRegExp = /^ApiKey (.*)$/i;
             if(request.headers['authorization'] && apiKeyRegExp.test(request.headers['authorization'])){
                 apiKey = request.headers?.authorization?.replace(/ApiKey /i, "")
             }
 
+            //Por authorization '<uuid-key>'
+            const uuidRegex = /^[0-9a-fA-F]{24}$/i;
+            if(request.headers['authorization'] && uuidRegex.test(request.headers['authorization'])){
+                apiKey = request.headers['authorization']
+            }
+
             if(apiKey){
                 const userApiKey = await draxCache.getOrLoad(apiKey, userApiKeyLoader)
                 if(userApiKey && userApiKey.user){

package/src/models/UserLoginFailModel.ts

@@ -4,30 +4,30 @@ import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2'
 import type {IUserLoginFail} from '@drax/identity-share'
 
-const UserLoginFailSchema = new mongoose.Schema<IUserLoginFail>({
+const UserLoginFailMongoSchema = new mongoose.Schema<IUserLoginFail>({
             username: {type: String,   required: false, index: false, unique: false },
             userAgent: {type: String,   required: false, index: false, unique: false },
             ip: {type: String,   required: false, index: false, unique: false },
 }, {timestamps: true});
 
-UserLoginFailSchema.plugin(uniqueValidator, {message: 'validation.unique'});
-UserLoginFailSchema.plugin(mongoosePaginate);
+UserLoginFailMongoSchema.plugin(uniqueValidator, {message: 'validation.unique'});
+UserLoginFailMongoSchema.plugin(mongoosePaginate);
 
-UserLoginFailSchema.virtual("id").get(function () {
+UserLoginFailMongoSchema.virtual("id").get(function () {
     return this._id.toString();
 });
 
 
-UserLoginFailSchema.set('toJSON', {getters: true, virtuals: true});
+UserLoginFailMongoSchema.set('toJSON', {getters: true, virtuals: true});
 
-UserLoginFailSchema.set('toObject', {getters: true, virtuals: true});
+UserLoginFailMongoSchema.set('toObject', {getters: true, virtuals: true});
 
 const MODEL_NAME = 'UserLoginFail';
 const COLLECTION_NAME = 'UserLoginFail';
-const UserLoginFailModel = mongoose.model<IUserLoginFail, PaginateModel<IUserLoginFail>>(MODEL_NAME, UserLoginFailSchema,COLLECTION_NAME);
+const UserLoginFailModel = mongoose.model<IUserLoginFail, PaginateModel<IUserLoginFail>>(MODEL_NAME, UserLoginFailMongoSchema,COLLECTION_NAME);
 
 export {
-    UserLoginFailSchema,
+    UserLoginFailMongoSchema,
     UserLoginFailModel
 }
 

package/src/models/UserSessionModel.ts

@@ -5,31 +5,31 @@ import uniqueValidator from 'mongoose-unique-validator';
 import mongoosePaginate from 'mongoose-paginate-v2'
 import type {IUserSession} from '@drax/identity-share'
 
-const UserSessionSchema = new mongoose.Schema<IUserSession>({
+const UserSessionMongoSchema = new mongoose.Schema<IUserSession>({
             uuid: {type: String,   required: true, index: true, unique: false },
             user: {type: mongoose.Schema.Types.ObjectId, ref: 'User',  required: true, index: true, unique: false },
             userAgent: {type: String,   required: false, index: false, unique: false },
             ip: {type: String,   required: false, index: false, unique: false },
 }, {timestamps: true});
 
-UserSessionSchema.plugin(uniqueValidator, {message: 'validation.unique'});
-UserSessionSchema.plugin(mongoosePaginate);
+UserSessionMongoSchema.plugin(uniqueValidator, {message: 'validation.unique'});
+UserSessionMongoSchema.plugin(mongoosePaginate);
 
-UserSessionSchema.virtual("id").get(function () {
+UserSessionMongoSchema.virtual("id").get(function () {
     return this._id.toString();
 });
 
 
-UserSessionSchema.set('toJSON', {getters: true, virtuals: true});
+UserSessionMongoSchema.set('toJSON', {getters: true, virtuals: true});
 
-UserSessionSchema.set('toObject', {getters: true, virtuals: true});
+UserSessionMongoSchema.set('toObject', {getters: true, virtuals: true});
 
 const MODEL_NAME = 'UserSession';
 const COLLECTION_NAME = 'UserSession';
-const UserSessionModel = mongoose.model<IUserSession, PaginateModel<IUserSession>>(MODEL_NAME, UserSessionSchema,COLLECTION_NAME);
+const UserSessionModel = mongoose.model<IUserSession, PaginateModel<IUserSession>>(MODEL_NAME, UserSessionMongoSchema,COLLECTION_NAME);
 
 export {
-    UserSessionSchema,
+    UserSessionMongoSchema,
     UserSessionModel
 }