@solidxai/core 0.1.9-beta.8 → 0.1.10-alpha.0

package/src/services/authentication.service.ts

@@ -38,16 +38,19 @@ import { SignInDto } from "../dtos/sign-in.dto";
 import { SignUpDto } from "../dtos/sign-up.dto";
 import { User } from "../entities/user.entity";
 import { EventDetails, EventType } from "../interfaces";
-import { ActiveUserData } from '../interfaces/active-user-data.interface';
-import { HashingService } from './hashing.service';
-import { InvalidatedRefreshTokenError, RefreshTokenIdsStorageService } from './refresh-token-ids-storage.service';
-import { SsoCodeStorageService } from './sso-code-storage.service';
-import { RoleMetadataService } from './role-metadata.service';
-import { SettingService } from './setting.service';
-import { UserActivityHistoryService } from './user-activity-history.service';
-import { UserService } from './user.service';
-import { SmsFactory } from 'src/factories/sms.factory';
-import { SolidRegistry } from 'src/helpers/solid-registry';
+import { ActiveUserData } from "../interfaces/active-user-data.interface";
+import { HashingService } from "./hashing.service";
+import {
+  InvalidatedRefreshTokenError,
+  RefreshTokenIdsStorageService,
+} from "./refresh-token-ids-storage.service";
+import { SsoCodeStorageService } from "./sso-code-storage.service";
+import { RoleMetadataService } from "./role-metadata.service";
+import { SettingService } from "./setting.service";
+import { UserActivityHistoryService } from "./user-activity-history.service";
+import { UserService } from "./user.service";
+import { SmsFactory } from "src/factories/sms.factory";
+import { SolidRegistry } from "src/helpers/solid-registry";
 
 enum LoginProvider {
   LOCAL = "local",
@@ -62,32 +65,32 @@ interface otp {
 
 @Injectable()
 export class AuthenticationService {
-    private readonly logger = new Logger(AuthenticationService.name);
-    // private readonly mailService: IMail;
-    constructor(
-        private readonly userService: UserService,
-        // @InjectRepository(User) private readonly userRepository: Repository<User>,
-        private readonly userRepository: UserRepository,
-        private readonly hashingService: HashingService,
-        private readonly jwtService: JwtService,
-        private readonly refreshTokenIdsStorage: RefreshTokenIdsStorageService,
-        private readonly httpService: HttpService,
-        // private readonly mailService: SMTPEMailService,
-        private readonly mailServiceFactory: MailFactory,
-        // private readonly smsService: Msg91OTPService,
-        private readonly smsFactory: SmsFactory,
-        private readonly eventEmitter: EventEmitter2,
-        private readonly settingService: SettingService,
-        private readonly roleMetadataService: RoleMetadataService,
-        private readonly userActivityHistoryService: UserActivityHistoryService,
-        private readonly ssoCodeStorage: SsoCodeStorageService,
-
-        @InjectDataSource()
-        private readonly dataSource: DataSource,
-        private readonly solidRegistry: SolidRegistry,
-    ) {
-        // this.mailService = this.mailServiceFactory.getMailService();
-    }
+  private readonly logger = new Logger(AuthenticationService.name);
+  // private readonly mailService: IMail;
+  constructor(
+    private readonly userService: UserService,
+    // @InjectRepository(User) private readonly userRepository: Repository<User>,
+    private readonly userRepository: UserRepository,
+    private readonly hashingService: HashingService,
+    private readonly jwtService: JwtService,
+    private readonly refreshTokenIdsStorage: RefreshTokenIdsStorageService,
+    private readonly httpService: HttpService,
+    // private readonly mailService: SMTPEMailService,
+    private readonly mailServiceFactory: MailFactory,
+    // private readonly smsService: Msg91OTPService,
+    private readonly smsFactory: SmsFactory,
+    private readonly eventEmitter: EventEmitter2,
+    private readonly settingService: SettingService,
+    private readonly roleMetadataService: RoleMetadataService,
+    private readonly userActivityHistoryService: UserActivityHistoryService,
+    private readonly ssoCodeStorage: SsoCodeStorageService,
+
+    @InjectDataSource()
+    private readonly dataSource: DataSource,
+    private readonly solidRegistry: SolidRegistry,
+  ) {
+    // this.mailService = this.mailServiceFactory.getMailService();
+  }
 
   private async getCompanyLogo(): Promise<string> {
     return this.settingService.getConfigValue<SolidCoreSetting>("companylogo");
@@ -153,58 +156,90 @@ export class AuthenticationService {
     }
   }
 
-    private static readonly SIGNUP_DTO_KEYS = new Set(['username', 'email', 'password', 'fullName', 'mobile', 'roles', 'forcePasswordChange']);
+  private static readonly SIGNUP_DTO_KEYS = new Set([
+    "username",
+    "email",
+    "password",
+    "fullName",
+    "mobile",
+    "roles",
+    "forcePasswordChange",
+    "isAllowedToGenerateApiKeys",
+    "failedLoginAttempts",
+  ]);
 
-    async signUp(signUpDto: SignUpDto & Record<string, any>, activeUser: ActiveUserData = null): Promise<User> {
-        const hasExtensionFields = Object.keys(signUpDto).some(k => !AuthenticationService.SIGNUP_DTO_KEYS.has(k));
-        if (hasExtensionFields) {
-            const provider = this.solidRegistry.getExtensionUserCreationProvider();
-            if (!provider) {
-                throw new InternalServerErrorException(
-                    'No ExtensionUserCreationProvider registered. Register one to handle extension user creation.',
-                );
-            }
-            const entity = await provider.buildExtensionEntity(signUpDto);
-            const effectiveDto = { ...signUpDto, roles: provider.roles(signUpDto) };
-            return this.performSignUp(effectiveDto, entity, provider.repo as Repository<User>);
-        }
-        return this.performSignUp(signUpDto, new User(), this.userRepository);
-    }
-
-    private async performSignUp<T extends User>(signUpDto: SignUpDto, entity: T, repo: Repository<T>): Promise<T> {
-        try {
-            const onForcePasswordChange = this.settingService.getConfigValue<SolidCoreSetting>('forceChangePasswordOnFirstLogin');
-            const activateUserOnRegistration = this.settingService.getConfigValue<SolidCoreSetting>('activateUserOnRegistration');
-            const defaultRole = this.settingService.getConfigValue<SolidCoreSetting>('defaultRole');
-
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(entity, signUpDto, activateUserOnRegistration, onForcePasswordChange);
-            const privateDto = signUpDto as { isAllowedToGenerateApiKeys?: boolean };
-            if (privateDto.isAllowedToGenerateApiKeys !== undefined) {
-                user.isAllowedToGenerateApiKeys = privateDto.isAllowedToGenerateApiKeys;
-            }
-            const savedUser = await repo.save(user);
-            const userRoles = signUpDto.roles ?? [];
-            if ((signUpDto.roles?.length ?? 0) === 0 && signUpDto.username !== 'sa' && defaultRole) {
-                userRoles.push(defaultRole);
-            }
-            await this.handlePostSignup(savedUser, userRoles, pwd, autoGeneratedPwd);
-
-            return savedUser;
-        } catch (err) {
-            const pgUniqueViolationErrorCode = '23505';
-            if (err.code === pgUniqueViolationErrorCode) {
-                throw new ConflictException(parseUniqueConstraintError(err.detail || ERROR_MESSAGES.UNIQUE_CONSTRAINT_VIOLATION));
-            }
-            throw err;
-        }
+  async signUp(
+    signUpDto: SignUpDto & Record<string, any>,
+    activeUser: ActiveUserData = null,
+  ): Promise<User> {
+    const hasExtensionFields = Object.keys(signUpDto).some(
+      (k) => !AuthenticationService.SIGNUP_DTO_KEYS.has(k),
+    );
+    if (hasExtensionFields) {
+      const provider = this.solidRegistry.getExtensionUserCreationProvider();
+      if (!provider) {
+        throw new InternalServerErrorException(
+          "No ExtensionUserCreationProvider registered. Register one to handle extension user creation.",
+        );
+      }
+      const entity = await provider.buildExtensionEntity(signUpDto);
+      const effectiveDto = { ...signUpDto, roles: provider.roles(signUpDto) };
+      return this.performSignUp(
+        effectiveDto,
+        entity,
+        provider.repo as Repository<User>,
+      );
     }
+    return this.performSignUp(signUpDto, new User(), this.userRepository);
+  }
+
+  private async performSignUp<T extends User>(signUpDto: SignUpDto, entity: T, repo: Repository<T>): Promise<T> {
+    try {
+      const onForcePasswordChange = this.settingService.getConfigValue<SolidCoreSetting>("forceChangePasswordOnFirstLogin");
+      const activateUserOnRegistration = this.settingService.getConfigValue<SolidCoreSetting>("activateUserOnRegistration");
+      const defaultRole = this.settingService.getConfigValue<SolidCoreSetting>("defaultRole");
+
+      var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(
+        entity,
+        signUpDto,
+        activateUserOnRegistration,
+        onForcePasswordChange,
+      );
+      const privateDto = signUpDto as { isAllowedToGenerateApiKeys?: boolean };
+      if (privateDto.isAllowedToGenerateApiKeys !== undefined) {
+        user.isAllowedToGenerateApiKeys = privateDto.isAllowedToGenerateApiKeys;
+      }
+      const savedUser = await repo.save(user);
+      const userRoles = signUpDto.roles ?? [];
+      if ((signUpDto.roles?.length ?? 0) === 0 && signUpDto.username !== "sa" && defaultRole) {
+        userRoles.push(defaultRole);
+      }
+      await this.handlePostSignup(savedUser, userRoles, pwd, autoGeneratedPwd);
 
-    /** @deprecated Use IExtensionUserCreationProvider instead. Kept for backward compatibility. */
-    async signupForExtensionUser<T extends User, U extends CreateUserDto>(signUpDto: SignUpDto, extensionUserDto: U, extensionUserRepo: Repository<T>): Promise<T> {
-        // @ts-ignore
-        const entity = extensionUserRepo.merge(extensionUserRepo.create() as T, extensionUserDto);
-        return this.performSignUp(signUpDto, entity, extensionUserRepo);
+      return savedUser;
     }
+    catch (err: any) {
+      const pgUniqueViolationErrorCode = "23505";
+      if (err.code === pgUniqueViolationErrorCode) {
+        throw new ConflictException(
+          parseUniqueConstraintError(
+            err.detail || ERROR_MESSAGES.UNIQUE_CONSTRAINT_VIOLATION,
+          ),
+        );
+      }
+      throw err;
+    }
+  }
+
+  /** @deprecated Use IExtensionUserCreationProvider instead. Kept for backward compatibility. */
+  async signupForExtensionUser<T extends User>(
+    signUpDto: SignUpDto,
+    extensionUserDto: DeepPartial<T>,
+    extensionUserRepo: Repository<T>,
+  ): Promise<T> {
+    const entity = extensionUserRepo.create(extensionUserDto);
+    return this.performSignUp(signUpDto, entity, extensionUserRepo);
+  }
 
   private async populateForSignup<T extends User>(
     user: T,
@@ -438,7 +473,7 @@ export class AuthenticationService {
         validationSource,
       );
       await this.notifyUserOnOtpInitiateRegistration(user, validationSource);
-    } catch (err) {
+    } catch (err: any) {
       if (err.code === "23505") {
         throw new ConflictException(ERROR_MESSAGES.USER_ALREADY_EXISTS);
       }
@@ -489,20 +524,27 @@ export class AuthenticationService {
     );
   }
 
-    private async upsertUserWithRegistrationVerificationTokens(existingUser: User, signUpDto: OTPSignUpDto, validationSource: string): Promise<User> {
-        let user = existingUser;
-        if (isEmpty(user)) {
-            user = this.createUser(signUpDto);
-            user.active = false; // User will be activated only after OTP verification, hence setting active to false for new user.
-            await this.assignRegistrationOtp(validationSource, user);
-            await this.userRepository.save(user);
-            await this.userService.addRoleToUser(user.username, this.settingService.getConfigValue<SolidCoreSetting>('defaultRole'));
-        } else {
-            await this.assignRegistrationOtp(validationSource, user);
-            await this.userRepository.save(user);
-        }
-        return user;
+  private async upsertUserWithRegistrationVerificationTokens(
+    existingUser: User,
+    signUpDto: OTPSignUpDto,
+    validationSource: string,
+  ): Promise<User> {
+    let user = existingUser;
+    if (isEmpty(user)) {
+      user = this.createUser(signUpDto);
+      user.active = false; // User will be activated only after OTP verification, hence setting active to false for new user.
+      await this.assignRegistrationOtp(validationSource, user);
+      await this.userRepository.save(user);
+      await this.userService.addRoleToUser(
+        user.username,
+        this.settingService.getConfigValue<SolidCoreSetting>("defaultRole"),
+      );
+    } else {
+      await this.assignRegistrationOtp(validationSource, user);
+      await this.userRepository.save(user);
     }
+    return user;
+  }
 
   // Create a new user entity.
   private createUser(signUpDto: OTPSignUpDto) {
@@ -1068,16 +1110,16 @@ export class AuthenticationService {
     }
   }
 
-    private buildUserPayload(user: User) {
-        const { id, username, email, mobile, lastLoginProvider } = user;
-        const roles = user.roles.map((role) => role.name);
-        return { id, username, email, mobile, lastLoginProvider, roles };
-    }
+  private buildUserPayload(user: User) {
+    const { id, username, email, mobile, lastLoginProvider } = user;
+    const roles = user.roles.map((role) => role.name);
+    return { id, username, email, mobile, lastLoginProvider, roles };
+  }
 
-    private async buildLoginTokenResponse(user: User) {
-        const { accessToken, refreshToken } = await this.generateTokens(user);
-        return { accessToken, refreshToken, user: this.buildUserPayload(user) };
-    }
+  private async buildLoginTokenResponse(user: User) {
+    const { accessToken, refreshToken } = await this.generateTokens(user);
+    return { accessToken, refreshToken, user: this.buildUserPayload(user) };
+  }
 
   async changePassword(
     changePasswordDto: ChangePasswordDto,
@@ -1252,7 +1294,7 @@ export class AuthenticationService {
     // Assuming all users do not have mobile as mandatory.
     if (
       forgotPasswordSendVerificationTokenOn ==
-        ForgotPasswordSendVerificationTokenOn.MOBILE &&
+      ForgotPasswordSendVerificationTokenOn.MOBILE &&
       user.mobile
     ) {
       const smsService = this.smsFactory.getSmsService();
@@ -1282,11 +1324,11 @@ export class AuthenticationService {
         confirmForgotPasswordDto.verificationToken,
       );
       if (!user)
-        throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+        throw new UnauthorizedException("Invalid verification token");
       if (user.lastLoginProvider !== "local")
         throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
       if (!user.active)
-        throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+        throw new UnauthorizedException("User is inactive");
 
       // 1) Atomically consume the token (only one request can succeed)
       const { affected } = await m
@@ -1378,7 +1420,7 @@ export class AuthenticationService {
     // Assuming all users do not have mobile as mandatory.
     if (
       forgotPasswordSendVerificationTokenOn ==
-        ForgotPasswordSendVerificationTokenOn.MOBILE &&
+      ForgotPasswordSendVerificationTokenOn.MOBILE &&
       user.mobile
     ) {
       const smsService = this.smsFactory.getSmsService();
@@ -1494,7 +1536,7 @@ export class AuthenticationService {
         accessToken: await this.generateAccessToken(user),
         refreshToken: currentRefreshToken,
       };
-    } catch (err) {
+    } catch (err: any) {
       if (err instanceof InvalidatedRefreshTokenError) {
         // Take action: notify user that his refresh token might have been stolen?
         throw new UnauthorizedException(ERROR_MESSAGES.ACCESS_DENIED);
@@ -1545,7 +1587,7 @@ export class AuthenticationService {
       } else {
         throw new UnauthorizedException(ERROR_MESSAGES.INVALID_USER_PROFILE);
       }
-    } catch (error) {
+    } catch (error: any) {
       throw new UnauthorizedException(
         ERROR_MESSAGES.GOOGLE_OAUTH_PROFILE_FETCH_FAILED,
       );
@@ -1590,9 +1632,19 @@ export class AuthenticationService {
   }
 
   async validateUserUsingFacebook(user: User) {
+    if (!user.facebookAccessToken || !user.facebookId) {
+      throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_FOUND);
+    }
+
     try {
       const response = await this.httpService.axiosRef.get(
-        `https://graph.facebook.com/me?fields=id,name,email&access_token=${user.facebookAccessToken}`,
+        `https://graph.facebook.com/me`,
+        {
+          params: { fields: "id,name,email" },
+          headers: {
+            Authorization: `Bearer ${user.facebookAccessToken}`,
+          },
+        },
       );
       const userProfile = response.data;
 
@@ -1604,8 +1656,11 @@ export class AuthenticationService {
       } else {
         throw new UnauthorizedException(ERROR_MESSAGES.INVALID_USER_PROFILE);
       }
-    } catch (error) {
-      throw new UnauthorizedException("Facebook OAuth profile fetch failed");
+    } catch (error: any) {
+      if (error instanceof UnauthorizedException) {
+        throw error;
+      }
+      throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_FOUND);
     }
   }
 
@@ -1666,7 +1721,7 @@ export class AuthenticationService {
       } else {
         throw new UnauthorizedException(ERROR_MESSAGES.INVALID_USER_PROFILE);
       }
-    } catch (error) {
+    } catch (error: any) {
       throw new UnauthorizedException("Microsoft OAuth profile fetch failed");
     }
   }
@@ -1813,7 +1868,7 @@ export class AuthenticationService {
       await this.userActivityHistoryService.logEvent("logout", user);
 
       return { message: SUCCESS_MESSAGES.LOGOUT_SUCCESS };
-    } catch (err) {
+    } catch (err: any) {
       throw err instanceof UnauthorizedException ||
         err instanceof InternalServerErrorException
         ? err
@@ -1846,43 +1901,52 @@ export class AuthenticationService {
     const refreshTokenState =
       await this.refreshTokenIdsStorage.getCurrentRefreshTokenState(user.id);
 
-        const response = {
-            user: {
-                email: user.email,
-                mobile: user.mobile,
-                username: user.username,
-                // forcePasswordChange: user.forcePasswordChange,
-                id: user.id,
-                roles: user.roles.map((role) => role.name)
-            },
-            refreshToken: refreshTokenState.currentRefreshToken,
-            // ...tokens
-        }
-        return response;
-    }
+    const response = {
+      user: {
+        email: user.email,
+        mobile: user.mobile,
+        username: user.username,
+        // forcePasswordChange: user.forcePasswordChange,
+        id: user.id,
+        roles: user.roles.map((role) => role.name),
+      },
+      refreshToken: refreshTokenState.currentRefreshToken,
+      // ...tokens
+    };
+    return response;
+  }
 
-    async generateSsoCode(activeUser: ActiveUserData, rawAccessToken: string): Promise<{ ssoCode: string }> {
-        const refreshTokenState = await this.refreshTokenIdsStorage.getCurrentRefreshTokenState(activeUser.sub);
-        if (!refreshTokenState?.currentRefreshToken) {
-            throw new UnauthorizedException('No active session found');
-        }
-        const ssoCode = await this.ssoCodeStorage.generateCode(
-            activeUser.sub,
-            rawAccessToken,
-            refreshTokenState.currentRefreshToken,
-        );
-        return { ssoCode };
+  async generateSsoCode(
+    activeUser: ActiveUserData,
+    rawAccessToken: string,
+  ): Promise<{ ssoCode: string }> {
+    const refreshTokenState =
+      await this.refreshTokenIdsStorage.getCurrentRefreshTokenState(
+        activeUser.sub,
+      );
+    if (!refreshTokenState?.currentRefreshToken) {
+      throw new UnauthorizedException("No active session found");
     }
+    const ssoCode = await this.ssoCodeStorage.generateCode(
+      activeUser.sub,
+      rawAccessToken,
+      refreshTokenState.currentRefreshToken,
+    );
+    return { ssoCode };
+  }
 
-    async exchangeSsoCode(code: string) {
-        const { userId, accessToken, refreshToken } = await this.ssoCodeStorage.consumeCode(code);
-        const user = await this.userRepository.findOne({ where: { id: userId }, relations: { roles: true } });
-        if (!user) {
-            throw new UnauthorizedException('User not found');
-        }
-        return { accessToken, refreshToken, user: this.buildUserPayload(user) };
+  async exchangeSsoCode(code: string) {
+    const { userId, accessToken, refreshToken } =
+      await this.ssoCodeStorage.consumeCode(code);
+    const user = await this.userRepository.findOne({
+      where: { id: userId },
+      relations: { roles: true },
+    });
+    if (!user) {
+      throw new UnauthorizedException("User not found");
     }
-
+    return { accessToken, refreshToken, user: this.buildUserPayload(user) };
+  }
 }
 
 function parseUniqueConstraintError(detail: string): string {

package/src/services/chatter-message.service.ts

@@ -421,7 +421,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
                     if (value.id) {
                         return value.id.toString();
                     }
-                } catch (error) {
+                } catch (error: any) {
                     console.error('Error fetching related model metadata:', error);
                     return value.id ? value.id.toString() : '';
                 }

package/src/services/crud.service.ts

@@ -129,7 +129,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
                 await this.saveMedia(model, files, savedEntity);
             }
             return savedEntity;
-        } catch (error) {
+        } catch (error: any) {
             if (error instanceof QueryFailedError && error.message.includes('duplicate key value violates unique constraint')) {
                 throw new BadRequestException(ERROR_MESSAGES.DUPLICATE_ENTRY);
             }
@@ -920,7 +920,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
             );
 
             return { message: SUCCESS_MESSAGES.RECORD_RECOVERED, data: softDeletedRows };
-        } catch (error) {
+        } catch (error: any) {
             if (error instanceof QueryFailedError) {
                 if ((error as any).code === '23505') {
                     throw new Error(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);
@@ -966,7 +966,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
             );
 
             return { message: SUCCESS_MESSAGES.SELECTED_RECORDS_RECOVERED, recoveredIds: ids };
-        } catch (error) {
+        } catch (error: any) {
             if (error instanceof QueryFailedError) {
                 if ((error as any).code === "23505") {
                     throw new Error(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);

package/src/services/csv.service.ts

@@ -68,7 +68,7 @@ export class CsvService {
       }
 
       csvStream.end(); // ✅ Ensure CSV stream is finalized
-    } catch (error) {
+    } catch (error: any) {
       this.logger.error(`❌ Error writing CSV: ${error.message}`);
       passThrough.destroy(error); // ✅ Properly destroy stream on error
       throw error;

package/src/services/dashboard.service.ts

@@ -117,7 +117,7 @@ export class DashboardService extends CRUDService<Dashboard> {
     const filePath = await this.moduleMetadataHelperService.getModuleMetadataFilePath(moduleName);
     try {
       await fs.access(filePath);
-    } catch (error) {
+    } catch (error: any) {
       throw new Error(`Configuration file not found for module: ${moduleName}`);
     }
     const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);

package/src/services/database/database-bootstrap.service.ts

@@ -80,7 +80,7 @@ export class DatabaseBootstrapService implements OnModuleInit {
       await this.dataSource.query(sql);
 
       this.logger.debug(`[${this.dataSource.name}] Applied ${fileName}`);
-    } catch (error) {
+    } catch (error: any) {
       // DO NOT THROW — continue with next file
       this.logger.error(
         `[${this.dataSource.name}] Failed ${fileName}`,

package/src/services/excel.service.ts

@@ -93,7 +93,7 @@ export class ExcelService {
 
       workbook.commit();
       // passThrough.end(); // ✅ Properly close the stream
-    } catch (error) {
+    } catch (error: any) {
       this.logger.error(`❌ Error writing Excel: ${error.message}`);
       passThrough.destroy(error); // Destroy stream
       throw error;

package/src/services/export-transaction.service.ts

@@ -90,7 +90,7 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
       const fileName = this.getFileName(templateName, uuid, templateFormat);
       const mimeType = this.getMimeType(templateFormat);
       return { exportStream, fileName, mimeType, exportTransaction };
-    } catch (error) {
+    } catch (error: any) {
       this.updateExportTransaction(id, ExportStatus.FAILED, error.message);
       throw error;
     }
@@ -114,7 +114,7 @@ export class ExportTransactionService extends CRUDService<ExportTransaction> {
       // Store the file using the appropriate storage provider
       await this.storeExportStream(exportStream, exportTransaction, this.getFileName(templateName, uuid, templateFormat));
       this.updateExportTransaction(id, ExportStatus.COMPLETED);
-    } catch (error) {
+    } catch (error: any) {
       this.updateExportTransaction(id, ExportStatus.FAILED, error.message);
       throw error;
 

package/src/services/field-metadata.service.ts

@@ -745,6 +745,8 @@ export class FieldMetadataService implements OnApplicationBootstrap {
                     "type",
                     "ormType",
                     "isSystem",
+                    "regexPattern",
+                    "regexPatternNotMatchingErrorMsg",
                     "defaultValue",
                     "min",
                     "max",
@@ -772,8 +774,6 @@ export class FieldMetadataService implements OnApplicationBootstrap {
                     "regexPattern",
                     "regexPatternNotMatchingErrorMsg",
                     "defaultValue",
-                    "min",
-                    "max",
                     "required",
                     "unique",
                     "index",
@@ -1256,7 +1256,7 @@ export class FieldMetadataService implements OnApplicationBootstrap {
             // Write the updated object back to the file
             const updatedContent = JSON.stringify(metaData, null, 2);
             await fs.writeFile(filePath, updatedContent);
-        } catch (error) {
+        } catch (error: any) {
             this.logger.error('File creation failed:', error);
             throw new Error(ERROR_MESSAGES.FILE_WRITE_FAILED); // Trigger rollback
         }

package/src/services/fixtures.service.ts

@@ -35,7 +35,7 @@ export class FixturesService {
                 // Create the model instance in the database
                 const createdInstance = await modelServiceInstance.create(modelFixture.data);
                 this.logger.log(`Successfully created fixture for model: ${modelFixture.singularName} with ID: ${createdInstance.id}`);
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`Error creating fixture for model: ${modelFixture.singularName} - ${error.message}`);
             }
         }
@@ -59,7 +59,7 @@ export class FixturesService {
                 const deleteCriteria = modelFixture.data; // This should be adjusted based on actual criteria
                 await modelServiceInstance.delete(deleteCriteria);
                 this.logger.log(`Successfully deleted fixture for model: ${modelFixture.singularName}`);
-            } catch (error) {
+            } catch (error: any) {
                 this.logger.error(`Error deleting fixture for model: ${modelFixture.singularName} - ${error.message}`);
             }
         }

package/src/services/import-transaction.service.ts

@@ -25,7 +25,7 @@ import { SolidIntrospectService } from './solid-introspect.service';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { getUserExcludedFields } from 'src/helpers/user-helper';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
-import {upperFirst, camelCase} from 'lodash';
+import { upperFirst, camelCase } from 'lodash';
 import { classify } from '../helpers/string.helper';
 
 interface ImportTemplateFileInfo {
@@ -557,7 +557,7 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
         const createdRecord = await this.insertRecord(record, JSON.parse(importTransaction.mapping) as ImportMapping[], importTransaction.modelMetadata, modelService);
         ids.push(createdRecord.id); // Add the ID of the created record to the ids array
       }
-      catch (error) {
+      catch (error: any) {
         this.logger.debug(`Error inserting record: ${JSON.stringify(record)}. Error: ${error.message}`);
         // Get the Import transaction error log repo
         const errorLog = await this.createErrorLogEntry(importTransaction, record, error);