From 9ba477a9b3aa3f7ddbc1d6d5cb91194f2738466b Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Wed, 7 May 2025 09:22:59 +0200 Subject: [PATCH] update: migration --- src/data-source.ts | 4 ++-- src/helpers/codingHelper.ts | 4 ++-- ...08-settingsFromEnv.ts => 1745059495807-settingsFromEnv.ts} | 4 ++-- src/migrations/1745059495808-settingsFromEnv_set.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/migrations/{1745059495808-settingsFromEnv.ts => 1745059495807-settingsFromEnv.ts} (82%) diff --git a/src/data-source.ts b/src/data-source.ts index fb60d49..63de0f8 100644 --- a/src/data-source.ts +++ b/src/data-source.ts @@ -52,7 +52,7 @@ import { TemplatesAndProtocolSort1742549956787 } from "./migrations/174254995678 import { QueryToUUID1742922178643 } from "./migrations/1742922178643-queryToUUID"; import { NewsletterColumnType1744351418751 } from "./migrations/1744351418751-newsletterColumnType"; import { QueryUpdatedAt1744795756230 } from "./migrations/1744795756230-QueryUpdatedAt"; -import { SettingsFromEnv1745059495808 } from "./migrations/1745059495808-settingsFromEnv"; +import { SettingsFromEnv1745059495807 } from "./migrations/1745059495807-settingsFromEnv"; import { MemberCreatedAt1746006549262 } from "./migrations/1746006549262-memberCreatedAt"; import { UserLoginRoutine1746252454922 } from "./migrations/1746252454922-UserLoginRoutine"; import { SettingsFromEnv_SET1745059495808 } from "./migrations/1745059495808-settingsFromEnv_set"; @@ -119,7 +119,7 @@ const dataSource = new DataSource({ QueryToUUID1742922178643, NewsletterColumnType1744351418751, QueryUpdatedAt1744795756230, - SettingsFromEnv1745059495808, + SettingsFromEnv1745059495807, SettingsFromEnv_SET1745059495808, MemberCreatedAt1746006549262, UserLoginRoutine1746252454922, diff --git a/src/helpers/codingHelper.ts b/src/helpers/codingHelper.ts index 354abc8..fee835a 100644 --- a/src/helpers/codingHelper.ts +++ b/src/helpers/codingHelper.ts @@ -13,7 +13,7 @@ export abstract class CodingHelper { try { return CodingHelper.decrypt(key, val, true); } catch (error) { - console.error("Decryption error:", error); + console.error("Decryption error in database-read - can be ignored"); if (fallback == "") return val; else return fallback; } @@ -25,7 +25,7 @@ export abstract class CodingHelper { try { return CodingHelper.encrypt(key, valueToEncrypt, true); } catch (error) { - console.error("Encryption error:", error); + console.error("Encryption error in database-read - can be ignored"); if (fallback == "") return val; return ""; } diff --git a/src/migrations/1745059495808-settingsFromEnv.ts b/src/migrations/1745059495807-settingsFromEnv.ts similarity index 82% rename from src/migrations/1745059495808-settingsFromEnv.ts rename to src/migrations/1745059495807-settingsFromEnv.ts index 1faee5e..1af7e08 100644 --- a/src/migrations/1745059495808-settingsFromEnv.ts +++ b/src/migrations/1745059495807-settingsFromEnv.ts @@ -3,8 +3,8 @@ import { setting_table } from "./baseSchemaTables/admin"; import SettingHelper from "../helpers/settingsHelper"; import ms from "ms"; -export class SettingsFromEnv1745059495808 implements MigrationInterface { - name = "SettingsFromEnv1745059495808"; +export class SettingsFromEnv1745059495807 implements MigrationInterface { + name = "SettingsFromEnv1745059495807"; public async up(queryRunner: QueryRunner): Promise { await queryRunner.createTable(setting_table, true, true, true); diff --git a/src/migrations/1745059495808-settingsFromEnv_set.ts b/src/migrations/1745059495808-settingsFromEnv_set.ts index c99c7b0..3a5729b 100644 --- a/src/migrations/1745059495808-settingsFromEnv_set.ts +++ b/src/migrations/1745059495808-settingsFromEnv_set.ts @@ -20,7 +20,7 @@ export class SettingsFromEnv_SET1745059495808 implements MigrationInterface { await SettingHelper.setSetting("mail.password", process.env.MAIL_PASSWORD); await SettingHelper.setSetting("mail.host", process.env.MAIL_HOST); await SettingHelper.setSetting("mail.port", Number(process.env.MAIL_PORT ?? "578")); - await SettingHelper.setSetting("mail.secure", Boolean(process.env.MAIL_SECURE ?? "false")); + await SettingHelper.setSetting("mail.secure", process.env.MAIL_SECURE == "true"); await SettingHelper.setSetting("backup.interval", Number(process.env.BACKUP_INTERVAL ?? "1")); await SettingHelper.setSetting("backup.copies", Number(process.env.BACKUP_COPIES ?? "7")); }