Merge branch 'feature/hosted-db-frontend' of https://github.com/rocket-admin/rocketadmin into feature/hosted-db-frontend

Author: lyubov-voloshko

backend/src/common/application/global-database-context.interface.ts

@@ -51,7 +51,6 @@ import { IUserInvitationRepository } from '../../entities/user/user-invitation/r
 import { IPasswordResetRepository } from '../../entities/user/user-password/repository/password-reset-repository.interface.js';
 import { IUserSessionSettings } from '../../entities/user/user-session-settings/reposiotory/user-session-settings-repository.interface.js';
 import { UserSessionSettingsEntity } from '../../entities/user/user-session-settings/user-session-settings.entity.js';
-import { IUserAccessRepository } from '../../entities/user-access/repository/user-access.repository.interface.js';
 import { IUserActionRepository } from '../../entities/user-actions/repository/user-action.repository.interface.js';
 import { IUserSecretRepository } from '../../entities/user-secret/repository/user-secret-repository.interface.js';
 import { UserSecretEntity } from '../../entities/user-secret/user-secret.entity.js';
@@ -73,7 +72,6 @@ export interface IGlobalDatabaseContext extends IDatabaseContext {
 	groupRepository: IGroupRepository;
 	permissionRepository: IPermissionRepository;
 	tableSettingsRepository: Repository<TableSettingsEntity> & ITableSettingsRepository;
-	userAccessRepository: IUserAccessRepository;
 	agentRepository: IAgentRepository;
 	emailVerificationRepository: IEmailVerificationRepository;
 	passwordResetRepository: IPasswordResetRepository;

backend/src/common/application/global-database-context.ts

@@ -92,8 +92,6 @@ import { userPasswordResetCustomRepositoryExtension } from '../../entities/user/
 import { userSessionSettingsRepositoryExtension } from '../../entities/user/user-session-settings/reposiotory/user-session-settings-custom-repository.extension.js';
 import { IUserSessionSettings } from '../../entities/user/user-session-settings/reposiotory/user-session-settings-repository.interface.js';
 import { UserSessionSettingsEntity } from '../../entities/user/user-session-settings/user-session-settings.entity.js';
-import { IUserAccessRepository } from '../../entities/user-access/repository/user-access.repository.interface.js';
-import { userAccessCustomReposiotoryExtension } from '../../entities/user-access/repository/user-access-custom-repository-extension.js';
 import { IUserActionRepository } from '../../entities/user-actions/repository/user-action.repository.interface.js';
 import { userActionCustomRepositoryExtension } from '../../entities/user-actions/repository/user-action-custom-repository-extension.js';
 import { UserActionEntity } from '../../entities/user-actions/user-action.entity.js';
@@ -127,7 +125,6 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 	private _groupRepository: IGroupRepository;
 	private _permissionRepository: IPermissionRepository;
 	private _tableSettingsRepository: Repository<TableSettingsEntity> & ITableSettingsRepository;
-	private _userAccessRepository: IUserAccessRepository;
 	private _agentRepository: IAgentRepository;
 	private _emailVerificationRepository: IEmailVerificationRepository;
 	private _passwordResetRepository: IPasswordResetRepository;
@@ -184,9 +181,6 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 		this._tableSettingsRepository = this.appDataSource
 			.getRepository(TableSettingsEntity)
 			.extend(tableSettingsCustomRepositoryExtension);
-		this._userAccessRepository = this.appDataSource
-			.getRepository(PermissionEntity)
-			.extend(userAccessCustomReposiotoryExtension);
 		this._agentRepository = this.appDataSource.getRepository(AgentEntity).extend(customAgentRepositoryExtension);
 		this._emailVerificationRepository = this.appDataSource
 			.getRepository(EmailVerificationEntity)
@@ -299,10 +293,6 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 		return this._tableSettingsRepository;
 	}
 
-	public get userAccessRepository(): IUserAccessRepository {
-		return this._userAccessRepository;
-	}
-
 	public get agentRepository(): IAgentRepository {
 		return this._agentRepository;
 	}

backend/src/entities/cedar-authorization/cedar-authorization.module.ts

@@ -7,6 +7,7 @@ import { LogOutEntity } from '../log-out/log-out.entity.js';
 import { UserEntity } from '../user/user.entity.js';
 import { CedarAuthorizationController } from './cedar-authorization.controller.js';
 import { CedarAuthorizationService } from './cedar-authorization.service.js';
+import { CedarPermissionsService } from './cedar-permissions.service.js';
 
 @Global()
 @Module({
@@ -17,9 +18,10 @@ import { CedarAuthorizationService } from './cedar-authorization.service.js';
 			useClass: GlobalDatabaseContext,
 		},
 		CedarAuthorizationService,
+		CedarPermissionsService,
 	],
 	controllers: [CedarAuthorizationController],
-	exports: [CedarAuthorizationService],
+	exports: [CedarAuthorizationService, CedarPermissionsService],
 })
 export class CedarAuthorizationModule implements NestModule {
 	public configure(consumer: MiddlewareConsumer): void {

backend/src/entities/cedar-authorization/cedar-authorization.service.interface.ts

@@ -2,7 +2,6 @@ import { IComplexPermission } from '../permission/permission.interface.js';
 import { CedarValidationRequest } from './cedar-action-map.js';
 
 export interface ICedarAuthorizationService {
-	isFeatureEnabled(): boolean;
 	validate(request: CedarValidationRequest): Promise<boolean>;
 	invalidatePolicyCacheForConnection(connectionId: string): void;
 	getSchema(): Record<string, unknown>;

backend/src/entities/cedar-authorization/cedar-authorization.service.ts

@@ -31,16 +31,10 @@ export class CedarAuthorizationService implements ICedarAuthorizationService, On
 	) {}
 
 	async onModuleInit(): Promise<void> {
-		if (!this.isFeatureEnabled()) return;
 		this.schema = CEDAR_SCHEMA as Record<string, unknown>;
 		this.logger.log('Cedar authorization service initialized');
 	}
 
-	isFeatureEnabled(): boolean {
-		// return process.env.CEDAR_AUTHORIZATION_ENABLED === 'true';
-		return true;
-	}
-
 	async validate(request: CedarValidationRequest): Promise<boolean> {
 		const { userId, action, groupId, tableName, dashboardId } = request;
 		let { connectionId } = request;