@flusys/nestjs-auth 7.0.0 → 7.0.2

package/cjs/services/authentication.service.js

@@ -580,7 +580,7 @@ let AuthenticationService = class AuthenticationService {
             });
         }
         const response = this.generateLoginResponseWithCompany(user, company, branch);
-        this.publishSessionEvent(_config.AUTH_EVENT_ACTIONS.COMPANY_SWITCHED, user, {
+        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.SESSION, _config.AUTH_EVENT_ACTIONS.COMPANY_SWITCHED, user, {
             companyId: company.id,
             branchId: branch.id
         });
@@ -690,7 +690,7 @@ let AuthenticationService = class AuthenticationService {
                     branchId: payload.branchId
                 }
             });
-            this.publishSessionEvent(_config.AUTH_EVENT_ACTIONS.TOKEN_REFRESHED, user, {
+            this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.SESSION, _config.AUTH_EVENT_ACTIONS.TOKEN_REFRESHED, user, {
                 companyId: payload.companyId ?? null,
                 branchId: payload.branchId ?? null
             });
@@ -721,7 +721,7 @@ let AuthenticationService = class AuthenticationService {
         }
         user.password = await _bcrypt.hash(newPassword, _config.BCRYPT_SALT_ROUNDS);
         await userRepository.save(user);
-        this.publishUserEvent(_config.AUTH_EVENT_ACTIONS.PASSWORD_CHANGED, user);
+        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.USER, _config.AUTH_EVENT_ACTIONS.PASSWORD_CHANGED, user);
     }
     async logout(userId) {
         if (!this.cacheManager) {
@@ -919,7 +919,7 @@ let AuthenticationService = class AuthenticationService {
             type: 'access'
         });
         this.sendLoginNotification(user.id);
-        this.publishSessionEvent(_config.AUTH_EVENT_ACTIONS.LOGGED_IN, user);
+        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.SESSION, _config.AUTH_EVENT_ACTIONS.LOGGED_IN, user);
         return {
             accessToken,
             refreshToken,
@@ -935,7 +935,7 @@ let AuthenticationService = class AuthenticationService {
             branchId: branch?.id
         });
         this.sendLoginNotification(user.id, company.id);
-        this.publishSessionEvent(_config.AUTH_EVENT_ACTIONS.LOGGED_IN, user, {
+        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.SESSION, _config.AUTH_EVENT_ACTIONS.LOGGED_IN, user, {
             companyId: company.id,
             branchId: branch?.id ?? null
         });
@@ -989,7 +989,7 @@ let AuthenticationService = class AuthenticationService {
             ...this.generateLoginResponse(user),
             requiresEmailVerification: false
         };
-        this.publishUserEvent(_config.AUTH_EVENT_ACTIONS.REGISTERED, user);
+        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.USER, _config.AUTH_EVENT_ACTIONS.REGISTERED, user);
         return response;
     }
     generateRegistrationResponseWithCompany(user, company, branch) {
@@ -997,19 +997,13 @@ let AuthenticationService = class AuthenticationService {
             ...this.generateLoginResponseWithCompany(user, company, branch),
             requiresEmailVerification: false
         };
-        this.publishUserEvent(_config.AUTH_EVENT_ACTIONS.REGISTERED, user, {
+        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.USER, _config.AUTH_EVENT_ACTIONS.REGISTERED, user, {
             companyId: company.id,
             branchId: branch?.id ?? null
         });
         return response;
     }
-    publishSessionEvent(action, user, metadata = {}) {
-        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.SESSION, action, user, metadata);
-    }
-    publishUserEvent(action, user, metadata = {}) {
-        this.publishAuthEvent(_config.AUTH_EVENT_ENTITIES.USER, action, user, metadata);
-    }
-    /** Never awaited - a login must not wait on, or fail because of, the event bus */ publishAuthEvent(entity, action, user, metadata) {
+    /** Never awaited - a login must not wait on, or fail because of, the event bus */ publishAuthEvent(entity, action, user, metadata = {}) {
         void (0, _classes.publishDomainEvent)({
             module: _config.AUTH_EVENT_MODULE,
             entity,

package/cjs/services/branch.service.js

@@ -129,7 +129,7 @@ let BranchService = class BranchService extends _classes.ApiService {
         return result;
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig, permissionSyncAdapter){
-        super('company_branch', cacheManager, utilsService, BranchService.name, true, 'auth', _companybranchentity.CompanyBranch, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.permissionSyncAdapter = permissionSyncAdapter;
+        super(_config.AUTH_EVENT_ENTITIES.COMPANY_BRANCH, cacheManager, utilsService, BranchService.name, true, _config.AUTH_EVENT_MODULE, dataSourceProvider, _companybranchentity.CompanyBranch), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.permissionSyncAdapter = permissionSyncAdapter;
     }
 };
 BranchService = _ts_decorate([

package/cjs/services/company.service.js

@@ -118,7 +118,7 @@ let CompanyService = class CompanyService extends _classes.ApiService {
         };
     }
     constructor(cacheManager, utilsService, dataSourceProvider, permissionSyncAdapter){
-        super('company', cacheManager, utilsService, CompanyService.name, true, 'auth', _companyentity.Company, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.permissionSyncAdapter = permissionSyncAdapter;
+        super(_config.AUTH_EVENT_ENTITIES.COMPANY, cacheManager, utilsService, CompanyService.name, true, _config.AUTH_EVENT_MODULE, dataSourceProvider, _companyentity.Company), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.permissionSyncAdapter = permissionSyncAdapter;
     }
 };
 CompanyService = _ts_decorate([

package/cjs/services/user.service.js

@@ -101,7 +101,7 @@ let UserService = class UserService extends _classes.ApiService {
             ]);
         }
         if (!this.dataSource) {
-            this.dataSource = await this.getDataSourceForService();
+            this.dataSource = await this.getDataSourceProvider().getDataSource();
         }
     }
     async getUserForProfile(userId, user) {
@@ -571,7 +571,7 @@ let UserService = class UserService extends _classes.ApiService {
         }
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig, userEnricher){
-        super('appuser', cacheManager, utilsService, UserService.name, true, 'auth', _appuserentity.AppUser, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), _define_property(this, "logAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.userEnricher = userEnricher, this.logAdapter = (0, _classes.createModuleLogger)(this.constructor.name);
+        super(_config.AUTH_EVENT_ENTITIES.USER, cacheManager, utilsService, UserService.name, true, _config.AUTH_EVENT_MODULE, dataSourceProvider, _appuserentity.AppUser), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), _define_property(this, "logAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.userEnricher = userEnricher, this.logAdapter = (0, _classes.createModuleLogger)(this.constructor.name);
     }
 };
 _ts_decorate([

package/fesm/services/authentication.service.js

@@ -529,7 +529,7 @@ export class AuthenticationService {
             });
         }
         const response = this.generateLoginResponseWithCompany(user, company, branch);
-        this.publishSessionEvent(AUTH_EVENT_ACTIONS.COMPANY_SWITCHED, user, {
+        this.publishAuthEvent(AUTH_EVENT_ENTITIES.SESSION, AUTH_EVENT_ACTIONS.COMPANY_SWITCHED, user, {
             companyId: company.id,
             branchId: branch.id
         });
@@ -639,7 +639,7 @@ export class AuthenticationService {
                     branchId: payload.branchId
                 }
             });
-            this.publishSessionEvent(AUTH_EVENT_ACTIONS.TOKEN_REFRESHED, user, {
+            this.publishAuthEvent(AUTH_EVENT_ENTITIES.SESSION, AUTH_EVENT_ACTIONS.TOKEN_REFRESHED, user, {
                 companyId: payload.companyId ?? null,
                 branchId: payload.branchId ?? null
             });
@@ -670,7 +670,7 @@ export class AuthenticationService {
         }
         user.password = await bcrypt.hash(newPassword, BCRYPT_SALT_ROUNDS);
         await userRepository.save(user);
-        this.publishUserEvent(AUTH_EVENT_ACTIONS.PASSWORD_CHANGED, user);
+        this.publishAuthEvent(AUTH_EVENT_ENTITIES.USER, AUTH_EVENT_ACTIONS.PASSWORD_CHANGED, user);
     }
     async logout(userId) {
         if (!this.cacheManager) {
@@ -868,7 +868,7 @@ export class AuthenticationService {
             type: 'access'
         });
         this.sendLoginNotification(user.id);
-        this.publishSessionEvent(AUTH_EVENT_ACTIONS.LOGGED_IN, user);
+        this.publishAuthEvent(AUTH_EVENT_ENTITIES.SESSION, AUTH_EVENT_ACTIONS.LOGGED_IN, user);
         return {
             accessToken,
             refreshToken,
@@ -884,7 +884,7 @@ export class AuthenticationService {
             branchId: branch?.id
         });
         this.sendLoginNotification(user.id, company.id);
-        this.publishSessionEvent(AUTH_EVENT_ACTIONS.LOGGED_IN, user, {
+        this.publishAuthEvent(AUTH_EVENT_ENTITIES.SESSION, AUTH_EVENT_ACTIONS.LOGGED_IN, user, {
             companyId: company.id,
             branchId: branch?.id ?? null
         });
@@ -938,7 +938,7 @@ export class AuthenticationService {
             ...this.generateLoginResponse(user),
             requiresEmailVerification: false
         };
-        this.publishUserEvent(AUTH_EVENT_ACTIONS.REGISTERED, user);
+        this.publishAuthEvent(AUTH_EVENT_ENTITIES.USER, AUTH_EVENT_ACTIONS.REGISTERED, user);
         return response;
     }
     generateRegistrationResponseWithCompany(user, company, branch) {
@@ -946,19 +946,13 @@ export class AuthenticationService {
             ...this.generateLoginResponseWithCompany(user, company, branch),
             requiresEmailVerification: false
         };
-        this.publishUserEvent(AUTH_EVENT_ACTIONS.REGISTERED, user, {
+        this.publishAuthEvent(AUTH_EVENT_ENTITIES.USER, AUTH_EVENT_ACTIONS.REGISTERED, user, {
             companyId: company.id,
             branchId: branch?.id ?? null
         });
         return response;
     }
-    publishSessionEvent(action, user, metadata = {}) {
-        this.publishAuthEvent(AUTH_EVENT_ENTITIES.SESSION, action, user, metadata);
-    }
-    publishUserEvent(action, user, metadata = {}) {
-        this.publishAuthEvent(AUTH_EVENT_ENTITIES.USER, action, user, metadata);
-    }
-    /** Never awaited - a login must not wait on, or fail because of, the event bus */ publishAuthEvent(entity, action, user, metadata) {
+    /** Never awaited - a login must not wait on, or fail because of, the event bus */ publishAuthEvent(entity, action, user, metadata = {}) {
         void publishDomainEvent({
             module: AUTH_EVENT_MODULE,
             entity,

package/fesm/services/branch.service.js

@@ -31,7 +31,7 @@ import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { ForbiddenException, Inject, Injectable, Optional, Scope } from '@nestjs/common';
 import { In, IsNull } from 'typeorm';
-import { BRANCH_MESSAGES } from '../config';
+import { AUTH_EVENT_ENTITIES, AUTH_EVENT_MODULE, BRANCH_MESSAGES } from '../config';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { AuthConfigService } from './auth-config.service';
@@ -119,7 +119,7 @@ export class BranchService extends ApiService {
         return result;
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig, permissionSyncAdapter){
-        super('company_branch', cacheManager, utilsService, BranchService.name, true, 'auth', CompanyBranch, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.permissionSyncAdapter = permissionSyncAdapter;
+        super(AUTH_EVENT_ENTITIES.COMPANY_BRANCH, cacheManager, utilsService, BranchService.name, true, AUTH_EVENT_MODULE, dataSourceProvider, CompanyBranch), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.permissionSyncAdapter = permissionSyncAdapter;
     }
 }
 BranchService = _ts_decorate([

package/fesm/services/company.service.js

@@ -30,7 +30,7 @@ import { IPermissionSyncAdapter, PERMISSION_SYNC_ADAPTER } from '@flusys/nestjs-
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { ForbiddenException, Inject, Injectable, Optional, Scope } from '@nestjs/common';
 import { In, IsNull } from 'typeorm';
-import { COMPANY_MESSAGES } from '../config';
+import { AUTH_EVENT_ENTITIES, AUTH_EVENT_MODULE, COMPANY_MESSAGES } from '../config';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { Company } from '../entities/company.entity';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
@@ -108,7 +108,7 @@ export class CompanyService extends ApiService {
         };
     }
     constructor(cacheManager, utilsService, dataSourceProvider, permissionSyncAdapter){
-        super('company', cacheManager, utilsService, CompanyService.name, true, 'auth', Company, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.permissionSyncAdapter = permissionSyncAdapter;
+        super(AUTH_EVENT_ENTITIES.COMPANY, cacheManager, utilsService, CompanyService.name, true, AUTH_EVENT_MODULE, dataSourceProvider, Company), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "permissionSyncAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.permissionSyncAdapter = permissionSyncAdapter;
     }
 }
 CompanyService = _ts_decorate([

package/fesm/services/user.service.js

@@ -32,7 +32,7 @@ import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { BadRequestException, ForbiddenException, Inject, Injectable, NotFoundException, Optional, Scope } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
-import { AUTH_MESSAGES, BCRYPT_SALT_ROUNDS, USER_ENRICHER, USER_MESSAGES, USER_PERMISSION_MESSAGES } from '../config';
+import { AUTH_EVENT_ENTITIES, AUTH_EVENT_MODULE, AUTH_MESSAGES, BCRYPT_SALT_ROUNDS, USER_ENRICHER, USER_MESSAGES, USER_PERMISSION_MESSAGES } from '../config';
 import { CreateUserDto } from '../dtos/user.dto';
 import { AppUser } from '../entities/app-user.entity';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
@@ -50,7 +50,7 @@ export class UserService extends ApiService {
             ]);
         }
         if (!this.dataSource) {
-            this.dataSource = await this.getDataSourceForService();
+            this.dataSource = await this.getDataSourceProvider().getDataSource();
         }
     }
     async getUserForProfile(userId, user) {
@@ -520,7 +520,7 @@ export class UserService extends ApiService {
         }
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig, userEnricher){
-        super('appuser', cacheManager, utilsService, UserService.name, true, 'auth', AppUser, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), _define_property(this, "logAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.userEnricher = userEnricher, this.logAdapter = createModuleLogger(this.constructor.name);
+        super(AUTH_EVENT_ENTITIES.USER, cacheManager, utilsService, UserService.name, true, AUTH_EVENT_MODULE, dataSourceProvider, AppUser), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), _define_property(this, "logAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.userEnricher = userEnricher, this.logAdapter = createModuleLogger(this.constructor.name);
     }
 }
 _ts_decorate([

package/interfaces/auth-module-options.interface.d.ts

@@ -1,4 +1,4 @@
-import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
+import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig } from '@flusys/nestjs-core';
 import { IModuleEventsConfig } from '@flusys/nestjs-shared/interfaces';
 import { ModuleMetadata, Provider, Type } from '@nestjs/common';
 export interface IAuthModuleConfig extends IDataSourceServiceOptions {
@@ -14,9 +14,8 @@ export interface AuthModuleOptions extends IDynamicModuleConfig {
     config?: IAuthModuleConfig;
     providers?: Provider[];
 }
-export interface AuthOptionsFactory extends IModuleOptionsFactory<IAuthModuleConfig> {
+export interface AuthOptionsFactory {
     createAuthOptions(): Promise<IAuthModuleConfig> | IAuthModuleConfig;
-    createOptions(): Promise<IAuthModuleConfig> | IAuthModuleConfig;
 }
 export interface AuthModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>, IDynamicModuleConfig {
     bootstrapAppConfig: IBootstrapAppConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-auth",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Authentication and authorization infrastructure for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -98,7 +98,7 @@
     "rxjs": "^7.8.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "7.0.0",
-    "@flusys/nestjs-shared": "7.0.0"
+    "@flusys/nestjs-core": "7.0.2",
+    "@flusys/nestjs-shared": "7.0.2"
   }
 }

package/services/authentication.service.d.ts

@@ -61,7 +61,5 @@ export declare class AuthenticationService {
     private generateCompanySelectionResponse;
     private generateRegistrationResponse;
     private generateRegistrationResponseWithCompany;
-    private publishSessionEvent;
-    private publishUserEvent;
     private publishAuthEvent;
 }