feat(authentication-service): repositories now allow user to override…

… model reference (#1720) gh-1223
sourcefuse · Oct 17, 2023 · 88a64dd · 88a64dd
1 parent 0f90bb6
commit 88a64dd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/services/authentication-service/src/repositories/role.repository.ts b/services/authentication-service/src/repositories/role.repository.ts
@@ -3,7 +3,7 @@
 // This software is released under the MIT License.
 // https://opensource.org/licenses/MIT
 import {Getter, inject} from '@loopback/core';
-import {juggler} from '@loopback/repository';
+import {Entity, juggler} from '@loopback/repository';
 import {
   DefaultUserModifyCrudRepository,
   IAuthUserWithPermissions,
@@ -24,7 +24,9 @@ export class RoleRepository extends DefaultUserModifyCrudRepository<
     protected readonly getCurrentUser: Getter<
       IAuthUserWithPermissions | undefined
     >,
+    @inject('models.Role')
+    private readonly role: typeof Entity & {prototype: Role},
   ) {
-    super(Role, dataSource, getCurrentUser);
+    super(role, dataSource, getCurrentUser);
   }
 }
diff --git a/services/authentication-service/src/repositories/tenant.repository.ts b/services/authentication-service/src/repositories/tenant.repository.ts
@@ -4,19 +4,20 @@
 // https://opensource.org/licenses/MIT
 import {Getter, inject} from '@loopback/core';
 import {
+  Entity,
   HasManyRepositoryFactory,
-  repository,
   juggler,
+  repository,
 } from '@loopback/repository';
-import {AuthenticationBindings} from 'loopback4-authentication';
 import {
   DefaultUserModifyCrudRepository,
   IAuthUserWithPermissions,
 } from '@sourceloop/core';
+import {AuthenticationBindings} from 'loopback4-authentication';
 
 import {Tenant, TenantConfig} from '../models';
-import {TenantConfigRepository} from './tenant-config.repository';
 import {AuthDbSourceName} from '../types';
+import {TenantConfigRepository} from './tenant-config.repository';
 
 export class TenantRepository extends DefaultUserModifyCrudRepository<
   Tenant,
@@ -35,8 +36,10 @@ export class TenantRepository extends DefaultUserModifyCrudRepository<
     >,
     @repository.getter('TenantConfigRepository')
     protected tenantConfigRepositoryGetter: Getter<TenantConfigRepository>,
+    @inject('models.Tenant')
+    private readonly tenant: typeof Entity & {prototype: Tenant},
   ) {
-    super(Tenant, dataSource, getCurrentUser);
+    super(tenant, dataSource, getCurrentUser);
     this.tenantConfigs = this.createHasManyRepositoryFactoryFor(
       'tenantConfigs',
       tenantConfigRepositoryGetter,

diff --git a/services/authentication-service/src/repositories/user-tenant.repository.ts b/services/authentication-service/src/repositories/user-tenant.repository.ts
@@ -5,6 +5,7 @@
 import {Getter, inject} from '@loopback/core';
 import {
   BelongsToAccessor,
+  Entity,
   HasManyRepositoryFactory,
   juggler,
   repository,
@@ -55,8 +56,10 @@ export class UserTenantRepository extends DefaultSoftCrudRepository<
     protected roleRepositoryGetter: Getter<RoleRepository>,
     @repository.getter('UserLevelPermissionRepository')
     protected userLevelPermissionRepositoryGetter: Getter<UserLevelPermissionRepository>,
+    @inject('models.UserTenant')
+    private readonly userTenant: typeof Entity & {prototype: UserTenant},
   ) {
-    super(UserTenant, dataSource);
+    super(userTenant, dataSource);
     this.userLevelPermissions = this.createHasManyRepositoryFactoryFor(
       'userLevelPermissions',
       userLevelPermissionRepositoryGetter,

diff --git a/services/authentication-service/src/repositories/user.repository.ts b/services/authentication-service/src/repositories/user.repository.ts
@@ -6,6 +6,7 @@ import {Getter, inject} from '@loopback/core';
 import {
   BelongsToAccessor,
   DataObject,
+  Entity,
   HasManyRepositoryFactory,
   HasOneRepositoryFactory,
   juggler,
@@ -73,8 +74,10 @@ export class UserRepository extends DefaultUserModifyCrudRepository<
     @inject(LOGGER.LOGGER_INJECT) private readonly logger: ILogger,
     @inject(AuthServiceBindings.PASSWORD_DECRYPTION_PROVIDER)
     private readonly passwordDecryptionFn: PasswordDecryptionFn,
+    @inject('models.User')
+    private readonly user: typeof Entity & {prototype: User},
   ) {
-    super(User, dataSource, getCurrentUser);
+    super(user, dataSource, getCurrentUser);
     this.userTenants = this.createHasManyRepositoryFactoryFor(
       'userTenants',
       userTenantRepositoryGetter,