Merge branch 'main' into demo-mode-component

Author: lyubov-voloshko

backend/package.json

@@ -79,7 +79,7 @@
 		"langchain": "^1.2.34",
 		"lru-cache": "^11.2.7",
 		"nanoid": "5.1.7",
-		"nodemailer": "^8.0.2",
+		"nodemailer": "^8.0.4",
 		"nunjucks": "^3.2.4",
 		"openai": "^6.32.0",
 		"otplib": "^12.0.1",

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

@@ -23,7 +23,6 @@ import { ICustomFieldsRepository } from '../../entities/custom-field/repository/
 import { IEmailVerificationRepository } from '../../entities/email/repository/email-verification.repository.interface.js';
 import { IGroupRepository } from '../../entities/group/repository/group.repository.interface.js';
 import { ILogOutRepository } from '../../entities/log-out/repository/log-out-repository.interface.js';
-import { IPermissionRepository } from '../../entities/permission/repository/permission.repository.interface.js';
 import { ISecretAccessLogRepository } from '../../entities/secret-access-log/repository/secret-access-log-repository.interface.js';
 import { SecretAccessLogEntity } from '../../entities/secret-access-log/secret-access-log.entity.js';
 import { ActionEventsEntity } from '../../entities/table-actions/table-action-events-module/action-event.entity.js';
@@ -70,7 +69,6 @@ export interface IGlobalDatabaseContext extends IDatabaseContext {
 	userRepository: Repository<UserEntity> & IUserRepository;
 	connectionRepository: Repository<ConnectionEntity> & IConnectionRepository;
 	groupRepository: IGroupRepository;
-	permissionRepository: IPermissionRepository;
 	tableSettingsRepository: Repository<TableSettingsEntity> & ITableSettingsRepository;
 	agentRepository: IAgentRepository;
 	emailVerificationRepository: IEmailVerificationRepository;

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

@@ -31,7 +31,7 @@ import { ConnectionPropertiesEntity } from '../../entities/connection-properties
 import { IConnectionPropertiesRepository } from '../../entities/connection-properties/repository/connection-properties.repository.interface.js';
 import { customConnectionPropertiesRepositoryExtension } from '../../entities/connection-properties/repository/custom-connection-properties-repository-extension.js';
 import { CustomFieldsEntity } from '../../entities/custom-field/custom-fields.entity.js';
-import { cusomFieldsCustomRepositoryExtension } from '../../entities/custom-field/repository/custom-field-repository-extension.js';
+import { customFieldsCustomRepositoryExtension } from '../../entities/custom-field/repository/custom-field-repository-extension.js';
 import { ICustomFieldsRepository } from '../../entities/custom-field/repository/custom-fields-repository.interface.js';
 import { EmailVerificationEntity } from '../../entities/email/email-verification.entity.js';
 import { IEmailVerificationRepository } from '../../entities/email/repository/email-verification.repository.interface.js';
@@ -42,9 +42,6 @@ import { groupCustomRepositoryExtension } from '../../entities/group/repository/
 import { LogOutEntity } from '../../entities/log-out/log-out.entity.js';
 import { logOutCustomRepositoryExtension } from '../../entities/log-out/repository/log-out-custom-repository-extension.js';
 import { ILogOutRepository } from '../../entities/log-out/repository/log-out-repository.interface.js';
-import { PermissionEntity } from '../../entities/permission/permission.entity.js';
-import { IPermissionRepository } from '../../entities/permission/repository/permission.repository.interface.js';
-import { permissionCustomRepositoryExtension } from '../../entities/permission/repository/permission-custom-repository-extension.js';
 import { secretAccessLogRepositoryExtension } from '../../entities/secret-access-log/repository/secret-access-log-repository.extension.js';
 import { ISecretAccessLogRepository } from '../../entities/secret-access-log/repository/secret-access-log-repository.interface.js';
 import { SecretAccessLogEntity } from '../../entities/secret-access-log/secret-access-log.entity.js';
@@ -123,7 +120,6 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 	private _userRepository: Repository<UserEntity> & IUserRepository;
 	private _connectionRepository: Repository<ConnectionEntity> & IConnectionRepository;
 	private _groupRepository: IGroupRepository;
-	private _permissionRepository: IPermissionRepository;
 	private _tableSettingsRepository: Repository<TableSettingsEntity> & ITableSettingsRepository;
 	private _agentRepository: IAgentRepository;
 	private _emailVerificationRepository: IEmailVerificationRepository;
@@ -175,9 +171,6 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 			.getRepository(ConnectionEntity)
 			.extend(customConnectionRepositoryExtension);
 		this._groupRepository = this.appDataSource.getRepository(GroupEntity).extend(groupCustomRepositoryExtension);
-		this._permissionRepository = this.appDataSource
-			.getRepository(PermissionEntity)
-			.extend(permissionCustomRepositoryExtension);
 		this._tableSettingsRepository = this.appDataSource
 			.getRepository(TableSettingsEntity)
 			.extend(tableSettingsCustomRepositoryExtension);
@@ -199,7 +192,7 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 			.extend(customConnectionPropertiesRepositoryExtension);
 		this._customFieldsRepository = this.appDataSource
 			.getRepository(CustomFieldsEntity)
-			.extend(cusomFieldsCustomRepositoryExtension);
+			.extend(customFieldsCustomRepositoryExtension);
 		this._tableLogsRepository = this.appDataSource
 			.getRepository(TableLogsEntity)
 			.extend(tableLogsCustomRepositoryExtension);
@@ -285,10 +278,6 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 		return this._groupRepository;
 	}
 
-	public get permissionRepository(): IPermissionRepository {
-		return this._permissionRepository;
-	}
-
 	public get tableSettingsRepository(): Repository<TableSettingsEntity> & ITableSettingsRepository {
 		return this._tableSettingsRepository;
 	}

backend/src/common/data-injection.tokens.ts

@@ -116,6 +116,7 @@ export enum UseCaseType {
 	SAAS_REGISTER_USER_WITH_SAML = 'SAAS_REGISTER_USER_WITH_SAML',
 	SAAS_CREATE_CONNECTION_FOR_HOSTED_DB = 'SAAS_CREATE_CONNECTION_FOR_HOSTED_DB',
 	SAAS_DELETE_CONNECTION_FOR_HOSTED_DB = 'SAAS_DELETE_CONNECTION_FOR_HOSTED_DB',
+	SAAS_UPDATE_HOSTED_CONNECTION_PASSWORD = 'SAAS_UPDATE_HOSTED_CONNECTION_PASSWORD',
 
 	INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP = 'INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP',
 	VERIFY_INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP = 'VERIFY_INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP',

backend/src/entities/agent/agent.entity.ts

@@ -25,15 +25,26 @@ export class AgentEntity {
 	@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
 	updatedAt: Date;
 
+	private _tokenChanged = false;
+
+	setToken(token: string): void {
+		this.token = token;
+		this._tokenChanged = true;
+	}
+
 	@BeforeInsert()
 	encryptToken(): void {
 		this.token = Encryptor.hashDataHMAC(this.token);
+		this._tokenChanged = false;
 	}
 
 	@BeforeUpdate()
 	updateTimestampAndEncryptToken(): void {
 		this.updatedAt = new Date();
-		this.token = Encryptor.hashDataHMAC(this.token);
+		if (this._tokenChanged) {
+			this.token = Encryptor.hashDataHMAC(this.token);
+			this._tokenChanged = false;
+		}
 	}
 
 	@OneToOne(

backend/src/entities/agent/agent.module.ts

@@ -1,6 +1,5 @@
-import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AuthMiddleware } from '../../authorization/index.js';
 import { GlobalDatabaseContext } from '../../common/application/global-database-context.js';
 import { BaseType } from '../../common/data-injection.tokens.js';
 import { LogOutEntity } from '../log-out/log-out.entity.js';
@@ -17,8 +16,4 @@ import { AgentEntity } from './agent.entity.js';
 	],
 	exports: [],
 })
-export class AgentModule implements NestModule {
-	public configure(consumer: MiddlewareConsumer): any {
-		consumer.apply(AuthMiddleware).forRoutes();
-	}
-}
+export class AgentModule {}

backend/src/entities/agent/repository/agent.repository.interface.ts

@@ -1,3 +1,4 @@
+import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared/enums/connection-types-enum.js';
 import { ConnectionEntity } from '../../connection/connection.entity.js';
 import { AgentEntity } from '../agent.entity.js';
 
@@ -7,4 +8,6 @@ export interface IAgentRepository {
 	createNewAgentForConnectionAndReturnToken(connection: ConnectionEntity): Promise<string>;
 
 	renewOrCreateConnectionToken(connectionId: string): Promise<string>;
+
+	getTestAgentToken(connectionType: ConnectionTypeTestEnum): string;
 }

backend/src/entities/agent/repository/custom-agent-repository-extension.ts

@@ -2,26 +2,18 @@ import { ConnectionTypeTestEnum } from '@rocketadmin/shared-code/dist/src/shared
 import { nanoid } from 'nanoid';
 import { ConnectionEntity } from '../../connection/connection.entity.js';
 import { AgentEntity } from '../agent.entity.js';
+import { IAgentRepository } from './agent.repository.interface.js';
 
-export const customAgentRepositoryExtension = {
-	async saveNewAgent(agent: AgentEntity): Promise<AgentEntity> {
-		return await this.save(agent);
-	},
-
+export const customAgentRepositoryExtension: IAgentRepository = {
 	async createNewAgentForConnectionAndReturnToken(connection: ConnectionEntity): Promise<string> {
 		const newAgent = await this.createNewAgentForConnection(connection);
 		return newAgent.token;
 	},
 
 	async createNewAgentForConnection(connection: ConnectionEntity): Promise<AgentEntity> {
 		const agent = new AgentEntity();
-		let token = nanoid(64);
-		if (process.env.NODE_ENV !== 'test') {
-			agent.token = token;
-		} else {
-			token = this.getTestAgentToken(connection.type);
-			agent.token = token;
-		}
+		const token = process.env.NODE_ENV !== 'test' ? nanoid(64) : this.getTestAgentToken(connection.type);
+		agent.setToken(token);
 		agent.connection = connection;
 		const savedAgent = await this.save(agent);
 		savedAgent.token = token;
@@ -42,7 +34,7 @@ export const customAgentRepositoryExtension = {
 			return await this.createNewAgentForConnectionAndReturnToken(foundConnection);
 		} else {
 			const newToken = nanoid(64);
-			foundAgent.token = newToken;
+			foundAgent.setToken(newToken);
 			await this.save(foundAgent);
 			return newToken;
 		}

backend/src/entities/amplitude/amplitude.service.ts

@@ -1,36 +1,56 @@
 import Amplitude from '@amplitude/node';
-import { Injectable } from '@nestjs/common';
+import { Injectable, OnModuleInit } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { AmplitudeEventTypeEnum } from '../../enums/index.js';
 import { UserEntity } from '../user/user.entity.js';
 
+export interface AmplitudeLogOptions {
+	user_email?: string;
+	tablesCount?: number;
+	reason?: string;
+	message?: string;
+	operationCount?: number;
+}
+
 @Injectable()
-export class AmplitudeService {
+export class AmplitudeService implements OnModuleInit {
+	private client: ReturnType<typeof Amplitude.init>;
+
 	constructor(
 		@InjectRepository(UserEntity)
 		private readonly userRepository: Repository<UserEntity>,
 	) {}
 
-	public async formAndSendLogRecord(event_type: AmplitudeEventTypeEnum, user_id: string, options = null) {
+	public onModuleInit(): void {
+		if (process.env.AMPLITUDE_API_KEY) {
+			this.client = Amplitude.init(process.env.AMPLITUDE_API_KEY);
+		}
+	}
+
+	public async formAndSendLogRecord(
+		event_type: AmplitudeEventTypeEnum,
+		user_id: string,
+		options?: AmplitudeLogOptions,
+	): Promise<void> {
 		try {
 			if (process.env.NODE_ENV === 'test') return;
 			let user_email = (await this.userRepository.findOne({ where: { id: user_id } }))?.email;
 			if (!user_email && options) {
-				user_email = options?.user_email;
+				user_email = options.user_email;
 			}
-			let event_properties;
+			let event_properties: Record<string, unknown> | undefined;
 			if (user_email) {
 				event_properties = {
 					user_properties: {
-						email: user_email ? user_email : 'unknown',
-						tablesCount: options?.tablesCount ? options.tablesCount : undefined,
-						reason: options?.reason ? options?.reason : undefined,
-						message: options?.message ? options.message : undefined,
+						email: user_email ?? 'unknown',
+						tablesCount: options?.tablesCount,
+						reason: options?.reason,
+						message: options?.message,
 					},
 				};
 			}
-			if (options?.operationCount && options?.operationCount > 0) {
+			if (options?.operationCount && options.operationCount > 0) {
 				const promisesArr = Array.from(Array(options.operationCount), () =>
 					this.sendLog(event_type, user_id, event_properties),
 				);
@@ -43,21 +63,19 @@ export class AmplitudeService {
 		}
 	}
 
-	private async sendLog(eventType, cognitoUserName, eventProperties) {
-		const client = Amplitude.init(process.env.AMPLITUDE_API_KEY);
+	private async sendLog(
+		eventType: AmplitudeEventTypeEnum,
+		userId: string,
+		eventProperties?: Record<string, unknown>,
+	): Promise<void> {
+		if (!this.client) return;
 		try {
-			client
-				.logEvent({
-					event_type: eventType,
-					user_id: cognitoUserName,
-					event_properties: eventProperties ? eventProperties : undefined,
-				})
-				.catch((e) => {
-					throw new Error(e);
-				});
-			client.flush().catch((e) => {
-				throw new Error(e);
+			await this.client.logEvent({
+				event_type: eventType,
+				user_id: userId,
+				event_properties: eventProperties,
 			});
+			await this.client.flush();
 		} catch (e) {
 			console.error(e);
 		}