@drax/identity-back 0.37.4 → 0.37.5

package/dist/index.js

@@ -30,6 +30,12 @@ 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";
@@ -52,14 +58,14 @@ 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";
+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, UserLoginFailBaseSchema, UserLoginFailSchema, UserSessionBaseSchema, UserSessionSchema, 
+UserSchema, UserBaseSchema, TenantSchema, TenantBaseSchema, RoleSchema, RoleBaseSchema, UserApiKeyBaseSchema, UserApiKeySchema, UserLoginFailBaseSchema, UserSessionBaseSchema, 
 //Service
 UserService, RoleService, TenantService, UserApiKeyService, UserSessionService, UserLoginFailService, PermissionService, Rbac, 
 //Factories
@@ -74,6 +80,8 @@ jwtMiddleware, rbacMiddleware, apiKeyMiddleware,
 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

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.4",
+  "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.4",
+    "@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": "d30963a38a3efec693b589bcc55ae286f4a04386"
+  "gitHead": "2fd3d1fa98a875f67691ea4524682985a52cba17"
 }

package/src/index.ts

@@ -44,6 +44,13 @@ 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";
@@ -101,9 +108,7 @@ export {
     UserApiKeyBaseSchema,
     UserApiKeySchema,
     UserLoginFailBaseSchema,
-    UserLoginFailSchema,
     UserSessionBaseSchema,
-    UserSessionSchema,
 
     //Service
     UserService,
@@ -158,6 +163,21 @@ export {
     UserSessionMongoRepository,
     UserLoginFailMongoRepository,
 
+    //Mongo Models
+    RoleModel,
+    TenantModel,
+    UserModel,
+    UserApiKeyModel,
+    UserSessionModel,
+    UserLoginFailModel,
+
+    RoleMongoSchema,
+    TenantMongoSchema,
+    UserMongoSchema,
+    UserApiKeyMongoSchema,
+    UserSessionMongoSchema,
+    UserLoginFailMongoSchema,
+
     //Sqlite Repositories
     RoleSqliteRepository,
     TenantSqliteRepository,

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
 }