@fecommunity/reactpress-server 3.7.0 → 4.0.0-beta.1

package/dist/modules/setting/setting.service.js

@@ -13,22 +13,76 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingService = void 0;
+const theme_1 = require("../../../../toolkit/dist/theme");
 const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
 const merge = require("deepmerge");
 const typeorm_2 = require("typeorm");
 const setting_constant_1 = require("./setting.constant");
 const setting_entity_1 = require("./setting.entity");
+const bootstrap_constants_1 = require("../bootstrap/bootstrap.constants");
+const install_locale_1 = require("../bootstrap/install-locale");
+const THEMES_WITH_CONFIGURATION = ['reactpress-theme-starter'];
+function trimUrl(url) {
+    return url.replace(/\/+$/, '');
+}
 let SettingService = class SettingService {
-    constructor(settingRepository) {
+    constructor(settingRepository, configService) {
         this.settingRepository = settingRepository;
-        this.initI18n();
-        this.initGlobalConfig();
+        this.configService = configService;
+    }
+    onModuleInit() {
+        void this.runInitializers();
+    }
+    async runInitializers() {
+        try {
+            await this.initI18n();
+            await this.initGlobalConfig();
+            await this.initSystemSettings();
+            await this.migrateLegacyAppearance();
+            await this.initThemeConfigurations();
+        }
+        catch (error) {
+            console.error('[SettingService] initialization failed:', error);
+        }
+    }
+    async getSettingRow() {
+        return this.ensureSettingRow();
+    }
+    settingRowScore(row) {
+        var _a, _b, _c;
+        return ((((_a = row.globalSetting) === null || _a === void 0 ? void 0 : _a.trim()) ? 4 : 0) +
+            (((_b = row.i18n) === null || _b === void 0 ? void 0 : _b.trim()) ? 2 : 0) +
+            (((_c = row.systemTitle) === null || _c === void 0 ? void 0 : _c.trim()) ? 1 : 0));
+    }
+    async ensureSettingRow() {
+        const items = await this.settingRepository.find({ order: { createAt: 'ASC' } });
+        if (items.length === 0) {
+            return this.settingRepository.save(this.settingRepository.create({}));
+        }
+        if (items.length === 1)
+            return items[0];
+        const sorted = [...items].sort((a, b) => this.settingRowScore(b) - this.settingRowScore(a));
+        const primary = Object.assign({}, sorted[0]);
+        for (const row of sorted.slice(1)) {
+            for (const key of Object.keys(row)) {
+                if (key === 'id' || key === 'createAt' || key === 'updateAt')
+                    continue;
+                const val = row[key];
+                const current = primary[key];
+                if (val != null && String(val).trim() !== '' && (current == null || String(current).trim() === '')) {
+                    primary[key] = val;
+                }
+            }
+        }
+        const saved = await this.settingRepository.save(primary);
+        await this.settingRepository.remove(sorted.slice(1));
+        return saved;
     }
     async initI18n() {
         try {
-            const items = await this.settingRepository.find();
-            const target = (items && items[0]) || {};
+            const target = await this.ensureSettingRow();
             let data = {};
             try {
                 if (target.i18n) {
@@ -56,51 +110,142 @@ let SettingService = class SettingService {
         }
     }
     async initGlobalConfig() {
-        const items = await this.settingRepository.find();
-        const target = (items && items[0]) || {};
+        var _a;
+        const target = await this.ensureSettingRow();
         let data = {};
         try {
             if (target.globalSetting) {
                 data = JSON.parse(target.globalSetting);
             }
         }
-        catch (e) {
+        catch (_b) {
             data = {};
         }
-        const mergedSettings = merge({}, setting_constant_1.settings, data);
+        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(data);
+        const defaultTheme = (0, theme_1.getThemeStateFromGlobalSetting)(setting_constant_1.settings);
+        const mergedTheme = Object.assign(Object.assign(Object.assign({}, defaultTheme), themeState), { mods: Object.assign(Object.assign({}, defaultTheme.mods), themeState.mods), installedThemes: ((_a = themeState.installedThemes) === null || _a === void 0 ? void 0 : _a.length) > 0 ? themeState.installedThemes : defaultTheme.installedThemes });
+        const mergedSettings = Object.assign(Object.assign({}, data), { theme: mergedTheme });
         const mergedSettingsString = JSON.stringify(mergedSettings);
         if (!target.globalSetting || target.globalSetting !== mergedSettingsString) {
             target.globalSetting = mergedSettingsString;
             await this.settingRepository.save(target);
         }
     }
+    async initSystemSettings() {
+        const locale = (0, install_locale_1.resolveInstallLocale)(this.configService.get('REACTPRESS_LANG') || this.configService.get('LANG'));
+        const clientSiteUrl = this.configService.get('CLIENT_SITE_URL', 'http://localhost:3001');
+        const urlDefaults = {
+            systemUrl: clientSiteUrl,
+            adminSystemUrl: `${trimUrl(clientSiteUrl)}/admin/`,
+        };
+        const target = await this.ensureSettingRow();
+        let changed = false;
+        const merged = Object.assign(Object.assign({}, (0, bootstrap_constants_1.getSystemSettingSeedDefaults)(locale)), urlDefaults);
+        for (const [key, defaultValue] of Object.entries(merged)) {
+            const current = target[key];
+            if (current != null && String(current).trim() !== '')
+                continue;
+            target[key] = defaultValue;
+            changed = true;
+        }
+        if (!changed)
+            return;
+        await this.settingRepository.save(target);
+        console.log(`[SettingService] system settings seeded with built-in defaults (${locale})`);
+    }
+    async migrateLegacyAppearance() {
+        const target = await this.ensureSettingRow();
+        if (!target.id && !target.globalSetting)
+            return;
+        let gs = {};
+        try {
+            if (target.globalSetting) {
+                gs = JSON.parse(target.globalSetting);
+            }
+        }
+        catch (_a) {
+            gs = {};
+        }
+        const { global, changed } = (0, theme_1.migrateLegacyAppearanceToThemeMods)(gs, target);
+        if (changed) {
+            target.globalSetting = JSON.stringify(global);
+            await this.settingRepository.save(target);
+            console.log('[SettingService] legacy appearance migrated to theme mods');
+        }
+    }
+    async initThemeConfigurations() {
+        const target = await this.ensureSettingRow();
+        let gs = {};
+        try {
+            if (target.globalSetting) {
+                gs = JSON.parse(target.globalSetting);
+            }
+        }
+        catch (_a) {
+            gs = {};
+        }
+        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(gs);
+        const activeTheme = themeState.activeTheme || 'hello-world';
+        const config = gs.config && typeof gs.config === 'object'
+            ? Object.assign({}, gs.config)
+            : {};
+        let changed = false;
+        for (const themeId of THEMES_WITH_CONFIGURATION) {
+            const seed = (0, theme_1.getThemeConfigurationSeed)(themeId, 'zh');
+            if (!seed)
+                continue;
+            const current = config[themeId];
+            const merged = merge({}, seed, current && typeof current === 'object' ? current : {});
+            const mergedStr = JSON.stringify(merged);
+            const prevStr = JSON.stringify(current !== null && current !== void 0 ? current : {});
+            if (mergedStr !== prevStr) {
+                config[themeId] = merged;
+                changed = true;
+            }
+        }
+        if (!gs.config && Object.keys(config).length) {
+            changed = true;
+        }
+        if (changed) {
+            gs.config = config;
+            target.globalSetting = JSON.stringify(gs);
+            await this.settingRepository.save(target);
+            console.log(`[SettingService] theme config seeded (active: ${activeTheme})`);
+        }
+    }
     async findAll(innerInvoke = false, isAdmin = false) {
-        const data = await this.settingRepository.find();
-        const res = data[0];
+        const res = await this.ensureSettingRow().catch(() => null);
         if (!res) {
             return {};
         }
-        if (innerInvoke || isAdmin) {
+        if (isAdmin && !innerInvoke) {
             return res;
         }
-        const filterRes = setting_constant_1.UNPROTECTED_KEYS.reduce((a, c) => {
-            a[c] = res[c];
-            return a;
-        }, {});
-        return filterRes;
+        const effective = (0, theme_1.resolveEffectiveSettingRow)(res);
+        if (innerInvoke) {
+            return effective;
+        }
+        return (0, theme_1.buildPublicSettingView)(effective);
     }
     async update(setting) {
-        const old = await this.settingRepository.find();
-        const updatedTag = old && old[0]
-            ? await this.settingRepository.merge(old[0], setting)
-            : await this.settingRepository.create(setting);
+        var _a;
+        const old = await this.ensureSettingRow();
+        const sanitized = (0, theme_1.pickSystemSettingPatch)(setting);
+        if ('smtpPass' in sanitized && !String((_a = sanitized.smtpPass) !== null && _a !== void 0 ? _a : '').trim()) {
+            delete sanitized.smtpPass;
+        }
+        if (Object.keys(sanitized).length === 0) {
+            return old !== null && old !== void 0 ? old : {};
+        }
+        const updatedTag = await this.settingRepository.merge(old, sanitized);
         return this.settingRepository.save(updatedTag);
     }
 };
 SettingService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(setting_entity_1.Setting)),
-    __metadata("design:paramtypes", [typeorm_2.Repository])
+    __metadata("design:paramtypes", [typeorm_2.Repository,
+        config_1.ConfigService])
 ], SettingService);
 exports.SettingService = SettingService;
 //# sourceMappingURL=setting.service.js.map

package/dist/modules/setting/setting.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/smtp/mail.util.d.ts

@@ -1,6 +1,7 @@
-export declare const sendEmail: (message: any, { host, port, user, pass }: {
-    host: any;
-    port: any;
-    user: any;
-    pass: any;
-}) => Promise<unknown>;
+export type SmtpTransportConfig = {
+    host: string;
+    port: string | number;
+    user: string;
+    pass: string;
+};
+export declare const sendEmail: (message: Record<string, unknown>, { host, port, user, pass }: SmtpTransportConfig) => Promise<unknown>;

package/dist/modules/smtp/mail.util.js

@@ -5,18 +5,14 @@ const nodemailer = require('nodemailer');
 const sendEmail = (message, { host, port, user, pass }) => {
     if (!host || !port || !user || !pass) {
         console.log('邮箱配置不正确，无法发送邮件');
-        return null;
+        return Promise.reject(new Error('SMTP configuration is incomplete'));
     }
-    const transport = nodemailer.createTransport({
-        host,
-        port,
-        secureConnection: true,
-        secure: true,
-        auth: {
+    const portNum = Number(port);
+    const secure = portNum === 465;
+    const transport = nodemailer.createTransport(Object.assign({ host, port: portNum, secure, auth: {
             user,
             pass,
-        },
-    });
+        } }, (portNum === 587 ? { requireTLS: true } : {})));
     return new Promise((resolve, reject) => {
         transport.sendMail(message, function (err, info) {
             if (err) {

package/dist/modules/smtp/mail.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"mail.util.js","sourceRoot":"","sources":["../../../src/modules/smtp/mail.util.ts"],"names":[],"mappings":";;;AACA,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAElC,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,CAAC;QAC3C,IAAI;QACJ,IAAI;QACJ,gBAAgB,EAAE,IAAI;QACtB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE;YACJ,IAAI;YACJ,IAAI;SACL;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAS,GAAG,EAAE,IAAI;YAC5C,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC3B,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA3BW,QAAA,SAAS,aA2BpB"}
+{"version":3,"file":"mail.util.js","sourceRoot":"","sources":["../../../src/modules/smtp/mail.util.ts"],"names":[],"mappings":";;;AACA,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AASlC,MAAM,SAAS,GAAG,CACvB,OAAgC,EAChC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAuB,EAC/C,EAAE;IACF,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC;KACtE;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,OAAO,KAAK,GAAG,CAAC;IAE/B,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,iBAC1C,IAAI,EACJ,IAAI,EAAE,OAAO,EACb,MAAM,EACN,IAAI,EAAE;YACJ,IAAI;YACJ,IAAI;SACL,IACE,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAChD,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,EAAE,IAAI;YAC7C,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC3B,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAjCW,QAAA,SAAS,aAiCpB"}

package/dist/modules/smtp/smtp.controller.d.ts

@@ -4,6 +4,9 @@ export declare class SMTPController {
     private readonly smtpService;
     constructor(smtpService: SMTPService);
     create(data: any): Promise<SMTP>;
+    testSend(data: any): Promise<{
+        ok: true;
+    }>;
     findAll(queryParam: any): Promise<[SMTP[], number]>;
     deleteById(id: any): Promise<SMTP>;
 }

package/dist/modules/smtp/smtp.controller.js

@@ -26,6 +26,9 @@ let SMTPController = class SMTPController {
     create(data) {
         return this.smtpService.create(data);
     }
+    testSend(data) {
+        return this.smtpService.testSend(data);
+    }
     findAll(queryParam) {
         return this.smtpService.findAll(queryParam);
     }
@@ -42,6 +45,16 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], SMTPController.prototype, "create", null);
+__decorate([
+    (0, swagger_1.ApiResponse)({ status: 200, description: '发送测试邮件' }),
+    (0, common_1.Post)('test'),
+    (0, roles_guard_1.Roles)('admin'),
+    (0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard),
+    __param(0, (0, common_1.Body)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], SMTPController.prototype, "testSend", null);
 __decorate([
     (0, common_1.Get)(),
     (0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard),

package/dist/modules/smtp/smtp.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"smtp.controller.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA8F;AAC9F,6CAAuD;AAEvD,2DAAsD;AACtD,qDAAwD;AACxD,+CAAqC;AACrC,iDAA6C;AAK7C,IAAa,cAAc,GAA3B,MAAa,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IASzD,MAAM,CAAS,IAAI;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAOD,OAAO,CAAU,UAAU;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IASD,UAAU,CAAc,EAAE;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACzC,CAAC;CACF,CAAA;AAvBC;IAHC,IAAA,qBAAW,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,kBAAI,CAAC,EAAE,CAAC;IAC/D,IAAA,aAAI,GAAE;IACN,IAAA,kBAAS,EAAC,6BAAY,CAAC;IAChB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;4CAEb;AAOD;IAFC,IAAA,YAAG,GAAE;IACL,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACf,WAAA,IAAA,cAAK,GAAE,CAAA;;;;6CAEf;AASD;IAHC,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;gDAEtB;AAhCU,cAAc;IAH1B,IAAA,iBAAO,EAAC,MAAM,CAAC;IACf,IAAA,mBAAU,EAAC,MAAM,CAAC;IAClB,IAAA,kBAAS,EAAC,wBAAU,CAAC;qCAEsB,0BAAW;GAD1C,cAAc,CAiC1B;AAjCY,wCAAc"}
+{"version":3,"file":"smtp.controller.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA8F;AAC9F,6CAAuD;AAEvD,2DAAsD;AACtD,qDAAwD;AACxD,+CAAqC;AACrC,iDAA6C;AAKtC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IASzD,MAAM,CAAS,IAAI;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IASD,QAAQ,CAAS,IAAI;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAOD,OAAO,CAAU,UAAU;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IASD,UAAU,CAAc,EAAE;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACzC,CAAC;CACF,CAAA;AArCC;IAAC,IAAA,qBAAW,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,kBAAI,CAAC,EAAE,CAAC;IAC/D,IAAA,aAAI,GAAE;IACN,IAAA,kBAAS,EAAC,6BAAY,CAAC;IAChB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;4CAEb;AAKD;IAAC,IAAA,qBAAW,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;IACnD,IAAA,aAAI,EAAC,MAAM,CAAC;IACZ,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACd,WAAA,IAAA,aAAI,GAAE,CAAA;;;;8CAEf;AAKD;IAAC,IAAA,YAAG,GAAE;IACL,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACf,WAAA,IAAA,cAAK,GAAE,CAAA;;;;6CAEf;AAMD;IAAC,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;gDAEtB;AA3CU,cAAc;IAH1B,IAAA,iBAAO,EAAC,MAAM,CAAC;IACf,IAAA,mBAAU,EAAC,MAAM,CAAC;IAClB,IAAA,kBAAS,EAAC,wBAAU,CAAC;qCAEsB,0BAAW;GAD1C,cAAc,CA4C1B;AA5CY,wCAAc"}

package/dist/modules/smtp/smtp.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"smtp.entity.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qCAAmF;AAGnF,IAAa,IAAI,GAAjB,MAAa,IAAI;CAgChB,CAAA;AA7BC;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gCACpB;AAIX;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;kCAC3B;AAIb;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;gCAC7B;AAIX;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;qCACxB;AAIhB;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;kCAC3B;AAIb;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;kCAC3B;AAQb;IANC,IAAA,qBAAW,GAAE;IACb,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,WAAW;KAClB,CAAC;8BACQ,IAAI;sCAAC;AA/BJ,IAAI;IADhB,IAAA,gBAAM,GAAE;GACI,IAAI,CAgChB;AAhCY,oBAAI"}
+{"version":3,"file":"smtp.entity.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qCAAmF;AAG5E,IAAM,IAAI,GAAV,MAAM,IAAI;CAgChB,CAAA;AA/BC;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gCACpB;AAEX;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;kCAC3B;AAEb;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;gCAC7B;AAEX;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;qCACxB;AAEhB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;kCAC3B;AAEb;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;kCAC3B;AAEb;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,WAAW;KAClB,CAAC;8BACQ,IAAI;sCAAC;AA/BJ,IAAI;IADhB,IAAA,gBAAM,GAAE;GACI,IAAI,CAgChB;AAhCY,oBAAI"}

package/dist/modules/smtp/smtp.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"smtp.module.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAEhD,qDAAiD;AACjD,8DAA0D;AAC1D,uDAAmD;AACnD,+CAAqC;AACrC,iDAA6C;AAQ7C,IAAa,UAAU,GAAvB,MAAa,UAAU;CAAG,CAAA;AAAb,UAAU;IANtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,kBAAI,CAAC,CAAC,EAAE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC,EAAE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC,CAAC;QAC1G,OAAO,EAAE,CAAC,0BAAW,CAAC;QACtB,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,CAAC;KACzB,CAAC;GACW,UAAU,CAAG;AAAb,gCAAU"}
+{"version":3,"file":"smtp.module.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAEhD,qDAAiD;AACjD,8DAA0D;AAC1D,uDAAmD;AACnD,+CAAqC;AACrC,iDAA6C;AAQtC,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,UAAU;IANtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,kBAAI,CAAC,CAAC,EAAE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,8BAAa,CAAC,EAAE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC,CAAC;QAC1G,OAAO,EAAE,CAAC,0BAAW,CAAC;QACtB,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,CAAC;KACzB,CAAC;GACW,UAAU,CAAG;AAAb,gCAAU"}

package/dist/modules/smtp/smtp.service.d.ts

@@ -1,10 +1,24 @@
 import { Repository } from 'typeorm';
 import { SettingService } from '../setting/setting.service';
 import { SMTP } from './smtp.entity';
+export type SmtpConfigOverride = {
+    smtpHost?: string;
+    smtpPort?: string;
+    smtpUser?: string;
+    smtpPass?: string;
+    smtpFromUser?: string;
+};
+export type TestSmtpPayload = SmtpConfigOverride & {
+    to: string;
+};
 export declare class SMTPService {
     private readonly smtpRepository;
     private readonly settingService;
     constructor(smtpRepository: Repository<SMTP>, settingService: SettingService);
+    private resolveSmtpConfig;
+    testSend(payload: TestSmtpPayload): Promise<{
+        ok: true;
+    }>;
     create(data: Partial<SMTP>): Promise<SMTP>;
     findAll(queryParams: any): Promise<[SMTP[], number]>;
     deleteById(id: any): Promise<SMTP>;

package/dist/modules/smtp/smtp.service.js

@@ -24,10 +24,10 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SMTPService = void 0;
-const api_messages_1 = require("../../common/api-messages");
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
+const api_messages_1 = require("../../common/api-messages");
 const setting_service_1 = require("../setting/setting.service");
 const mail_util_1 = require("./mail.util");
 const smtp_entity_1 = require("./smtp.entity");
@@ -36,18 +36,45 @@ let SMTPService = class SMTPService {
         this.smtpRepository = smtpRepository;
         this.settingService = settingService;
     }
-    async create(data) {
+    async resolveSmtpConfig(override = {}) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const setting = await this.settingService.findAll(true);
-        const { smtpHost, smtpPort, smtpUser, smtpPass, smtpFromUser } = setting;
+        const host = ((_b = (_a = override.smtpHost) !== null && _a !== void 0 ? _a : setting.smtpHost) !== null && _b !== void 0 ? _b : '').trim();
+        const port = ((_d = (_c = override.smtpPort) !== null && _c !== void 0 ? _c : setting.smtpPort) !== null && _d !== void 0 ? _d : '').trim();
+        const user = ((_f = (_e = override.smtpUser) !== null && _e !== void 0 ? _e : setting.smtpUser) !== null && _f !== void 0 ? _f : '').trim();
+        const pass = ((_h = (_g = override.smtpPass) !== null && _g !== void 0 ? _g : setting.smtpPass) !== null && _h !== void 0 ? _h : '').trim();
+        const from = ((_k = (_j = override.smtpFromUser) !== null && _j !== void 0 ? _j : setting.smtpFromUser) !== null && _k !== void 0 ? _k : user).trim();
+        if (!host || !port || !user || !pass || !from) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_CONFIG_INCOMPLETE, common_1.HttpStatus.BAD_REQUEST);
+        }
+        return {
+            transport: { host, port, user, pass },
+            from,
+        };
+    }
+    async testSend(payload) {
+        var _a;
+        const to = ((_a = payload.to) !== null && _a !== void 0 ? _a : '').trim();
+        if (!to) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_REQUIRED, common_1.HttpStatus.BAD_REQUEST);
+        }
+        const { transport, from } = await this.resolveSmtpConfig(payload);
+        await (0, mail_util_1.sendEmail)({
+            from,
+            to,
+            subject: api_messages_1.ApiMsg.EMAIL_TEST_SUBJECT,
+            html: api_messages_1.ApiMsg.EMAIL_TEST_HTML,
+        }, transport).catch(() => {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_SEND_FAILED, common_1.HttpStatus.BAD_REQUEST);
+        });
+        return { ok: true };
+    }
+    async create(data) {
+        const { transport, from } = await this.resolveSmtpConfig();
         Object.assign(data, {
-            from: smtpFromUser,
+            from,
         });
-        await (0, mail_util_1.sendEmail)(data, {
-            host: smtpHost,
-            port: smtpPort,
-            user: smtpUser,
-            pass: smtpPass,
-        }).catch(() => {
+        await (0, mail_util_1.sendEmail)(data, transport).catch(() => {
             throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_SEND_FAILED, common_1.HttpStatus.BAD_REQUEST);
         });
         const newSMTP = await this.smtpRepository.create(data);

package/dist/modules/smtp/smtp.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"smtp.service.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAmD;AACnD,2CAAuE;AACvE,6CAAmD;AACnD,qCAAqC;AAErC,gEAA4D;AAC5D,2CAAwC;AACxC,+CAAqC;AAGrC,IAAa,WAAW,GAAxB,MAAa,WAAW;IACtB,YAEmB,cAAgC,EAChC,cAA8B;QAD9B,mBAAc,GAAd,cAAc,CAAkB;QAChC,mBAAc,GAAd,cAAc,CAAgB;IAC9C,CAAC;IAMJ,KAAK,CAAC,MAAM,CAAC,IAAmB;QAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;QACH,MAAM,IAAA,qBAAS,EAAC,IAAI,EAAE;YACpB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACZ,MAAM,IAAI,sBAAa,CAAC,qBAAM,CAAC,iBAAiB,EAAE,mBAAU,CAAC,WAAW,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC;IACjB,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,WAAW;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAE9F,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,MAAM,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,EAAE,KAAqB,WAAW,EAA3B,WAAW,UAAK,WAAW,EAAzD,oBAA2C,CAAc,CAAC;YAChE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;YAEtB,IAAI,WAAW,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACvC,KAAK,CAAC,QAAQ,CAAC,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,GAAG,EAAE,EAAE,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC7F,CAAC,CAAC,CAAC;aACJ;SACF;QAED,OAAO,KAAK,CAAC,eAAe,EAAE,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,UAAU,CAAC,EAAE;QACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AA3DY,WAAW;IADvB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,kBAAI,CAAC,CAAA;qCACU,oBAAU;QACV,gCAAc;GAJtC,WAAW,CA2DvB;AA3DY,kCAAW"}
+{"version":3,"file":"smtp.service.js","sourceRoot":"","sources":["../../../src/modules/smtp/smtp.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuE;AACvE,6CAAmD;AACnD,qCAAqC;AAErC,4DAAmD;AACnD,gEAA4D;AAC5D,2CAA6D;AAC7D,+CAAqC;AAe9B,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAEmB,cAAgC,EAChC,cAA8B;QAD9B,mBAAc,GAAd,cAAc,CAAkB;QAChC,mBAAc,GAAd,cAAc,CAAgB;IAC9C,CAAC;IAEI,KAAK,CAAC,iBAAiB,CAAC,WAA+B,EAAE;;QAI/D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,CAAC,MAAA,MAAA,QAAQ,CAAC,QAAQ,mCAAI,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,CAAC,MAAA,MAAA,QAAQ,CAAC,QAAQ,mCAAI,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,CAAC,MAAA,MAAA,QAAQ,CAAC,QAAQ,mCAAI,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,CAAC,MAAA,MAAA,QAAQ,CAAC,QAAQ,mCAAI,OAAO,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,CAAC,MAAA,MAAA,QAAQ,CAAC,YAAY,mCAAI,OAAO,CAAC,YAAY,mCAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAE5E,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;YAC7C,MAAM,IAAI,sBAAa,CAAC,qBAAM,CAAC,uBAAuB,EAAE,mBAAU,CAAC,WAAW,CAAC,CAAC;SACjF;QAED,OAAO;YACL,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;YACrC,IAAI;SACL,CAAC;IACJ,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,OAAwB;;QACrC,MAAM,EAAE,GAAG,CAAC,MAAA,OAAO,CAAC,EAAE,mCAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,EAAE,EAAE;YACP,MAAM,IAAI,sBAAa,CAAC,qBAAM,CAAC,cAAc,EAAE,mBAAU,CAAC,WAAW,CAAC,CAAC;SACxE;QAED,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,IAAA,qBAAS,EACb;YACE,IAAI;YACJ,EAAE;YACF,OAAO,EAAE,qBAAM,CAAC,kBAAkB;YAClC,IAAI,EAAE,qBAAM,CAAC,eAAe;SAC7B,EACD,SAAS,CACV,CAAC,KAAK,CAAC,GAAG,EAAE;YACX,MAAM,IAAI,sBAAa,CAAC,qBAAM,CAAC,iBAAiB,EAAE,mBAAU,CAAC,WAAW,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,IAAmB;QAC9B,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,IAAI;SACL,CAAC,CAAC;QACH,MAAM,IAAA,qBAAS,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC1C,MAAM,IAAI,sBAAa,CAAC,qBAAM,CAAC,iBAAiB,EAAE,mBAAU,CAAC,WAAW,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC;IACjB,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,WAAW;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAE9F,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,MAAM,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,EAAE,KAAqB,WAAW,EAA3B,WAAW,UAAK,WAAW,EAAzD,oBAA2C,CAAc,CAAC;YAChE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;YAEtB,IAAI,WAAW,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACvC,KAAK,CAAC,QAAQ,CAAC,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,GAAG,EAAE,EAAE,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC7F,CAAC,CAAC,CAAC;aACJ;SACF;QAED,OAAO,KAAK,CAAC,eAAe,EAAE,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,UAAU,CAAC,EAAE;QACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AAnGY,WAAW;IADvB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,kBAAI,CAAC,CAAA;qCACU,oBAAU;QACV,gCAAc;GAJtC,WAAW,CAmGvB;AAnGY,kCAAW"}

package/dist/modules/tag/tag.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.controller.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqG;AACrG,6CAAuD;AAEvD,2DAAsD;AACtD,qDAAwD;AACxD,6CAAmC;AACnC,+CAA2C;AAK3C,IAAa,aAAa,GAA1B,MAAa,aAAa;IACxB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAUvD,MAAM,CAAS,GAAG;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAMD,OAAO,CAAU,WAAW;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC;IAOD,QAAQ,CAAc,EAAE;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;IAOD,cAAc,CAAc,EAAE,EAAmB,MAAM;QACrD,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAUD,UAAU,CAAc,EAAE,EAAU,GAAG;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IASD,UAAU,CAAc,EAAE;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AApDC;IAJC,IAAA,qBAAW,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,gBAAG,CAAC,EAAE,CAAC;IAC9D,IAAA,aAAI,GAAE;IACN,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IAChB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;2CAEb;AAMD;IADC,IAAA,YAAG,GAAE;IACG,WAAA,IAAA,cAAK,GAAE,CAAA;;;;4CAEf;AAOD;IADC,IAAA,YAAG,EAAC,KAAK,CAAC;IACD,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;6CAEpB;AAOD;IADC,IAAA,YAAG,EAAC,aAAa,CAAC;IACH,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IAAM,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;;;;mDAE/C;AAUD;IAHC,IAAA,cAAK,EAAC,KAAK,CAAC;IACZ,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IAAM,WAAA,IAAA,aAAI,GAAE,CAAA;;;;+CAElC;AASD;IAHC,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;+CAEtB;AA9DU,aAAa;IAHzB,IAAA,iBAAO,EAAC,KAAK,CAAC;IACd,IAAA,mBAAU,EAAC,KAAK,CAAC;IACjB,IAAA,kBAAS,EAAC,wBAAU,CAAC;qCAEqB,wBAAU;GADxC,aAAa,CA+DzB;AA/DY,sCAAa"}
+{"version":3,"file":"tag.controller.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqG;AACrG,6CAAuD;AAEvD,2DAAsD;AACtD,qDAAwD;AACxD,6CAAmC;AACnC,+CAA2C;AAKpC,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAUvD,MAAM,CAAS,GAAG;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAMD,OAAO,CAAU,WAAW;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC;IAOD,QAAQ,CAAc,EAAE;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;IAOD,cAAc,CAAc,EAAE,EAAmB,MAAM;QACrD,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAUD,UAAU,CAAc,EAAE,EAAU,GAAG;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IASD,UAAU,CAAc,EAAE;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AAxDC;IAAC,IAAA,qBAAW,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,gBAAG,CAAC,EAAE,CAAC;IAC9D,IAAA,aAAI,GAAE;IACN,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IAChB,WAAA,IAAA,aAAI,GAAE,CAAA;;;;2CAEb;AAKD;IAAC,IAAA,YAAG,GAAE;IACG,WAAA,IAAA,cAAK,GAAE,CAAA;;;;4CAEf;AAMD;IAAC,IAAA,YAAG,EAAC,KAAK,CAAC;IACD,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;6CAEpB;AAMD;IAAC,IAAA,YAAG,EAAC,aAAa,CAAC;IACH,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IAAM,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;;;;mDAE/C;AAOD;IAAC,IAAA,cAAK,EAAC,KAAK,CAAC;IACZ,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;IAAM,WAAA,IAAA,aAAI,GAAE,CAAA;;;;+CAElC;AAMD;IAAC,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,mBAAK,EAAC,OAAO,CAAC;IACd,IAAA,kBAAS,EAAC,6BAAY,CAAC;IACZ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;+CAEtB;AA9DU,aAAa;IAHzB,IAAA,iBAAO,EAAC,KAAK,CAAC;IACd,IAAA,mBAAU,EAAC,KAAK,CAAC;IACjB,IAAA,kBAAS,EAAC,wBAAU,CAAC;qCAEqB,wBAAU;GADxC,aAAa,CA+DzB;AA/DY,sCAAa"}

package/dist/modules/tag/tag.entity.js

@@ -30,7 +30,7 @@ __decorate([
     __metadata("design:type", String)
 ], Tag.prototype, "value", void 0);
 __decorate([
-    (0, swagger_1.ApiProperty)(),
+    (0, swagger_1.ApiProperty)({ type: () => article_entity_1.Article, isArray: true }),
     (0, typeorm_1.ManyToMany)(() => article_entity_1.Article, (article) => article.tags),
     __metadata("design:type", Array)
 ], Tag.prototype, "articles", void 0);

package/dist/modules/tag/tag.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.entity.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qCAAiH;AAEjH,8DAAoD;AAGpD,IAAa,GAAG,GAAhB,MAAa,GAAG;CAkCf,CAAA;AAhCC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;+BACpB;AAIX;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;kCACK;AAId;IAFC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;kCACK;AAOd;IALC,IAAA,qBAAW,GAAE;IACb,IAAA,oBAAU,EACT,GAAG,EAAE,CAAC,wBAAO,EACb,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAC1B;8BACS,KAAK;qCAAU;AAQzB;IANC,IAAA,qBAAW,GAAE;IACb,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,WAAW;KAClB,CAAC;8BACQ,IAAI;qCAAC;AAQf;IANC,IAAA,qBAAW,GAAE;IACb,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,WAAW;KAClB,CAAC;8BACQ,IAAI;qCAAC;AAjCJ,GAAG;IADf,IAAA,gBAAM,GAAE;GACI,GAAG,CAkCf;AAlCY,kBAAG"}
+{"version":3,"file":"tag.entity.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qCAAiH;AAEjH,8DAAoD;AAG7C,IAAM,GAAG,GAAT,MAAM,GAAG;CAkCf,CAAA;AAjCC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;+BACpB;AAEX;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;kCACK;AAEd;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;kCACK;AAEd;IAAC,IAAA,qBAAW,EAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,wBAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACnD,IAAA,oBAAU,EACT,GAAG,EAAE,CAAC,wBAAO,EACb,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAC1B;8BACS,KAAK;qCAAU;AAEzB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,WAAW;KAClB,CAAC;8BACQ,IAAI;qCAAC;AAEf;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,WAAW;KAClB,CAAC;8BACQ,IAAI;qCAAC;AAjCJ,GAAG;IADf,IAAA,gBAAM,GAAE;GACI,GAAG,CAkCf;AAlCY,kBAAG"}

package/dist/modules/tag/tag.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.module.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAEhD,qDAAiD;AACjD,qDAAiD;AACjD,6CAAmC;AACnC,+CAA2C;AAQ3C,IAAa,SAAS,GAAtB,MAAa,SAAS;CAAG,CAAA;AAAZ,SAAS;IANrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,gBAAG,CAAC,CAAC,EAAE,wBAAU,CAAC;QACtD,OAAO,EAAE,CAAC,wBAAU,CAAC;QACrB,SAAS,EAAE,CAAC,wBAAU,CAAC;QACvB,WAAW,EAAE,CAAC,8BAAa,CAAC;KAC7B,CAAC;GACW,SAAS,CAAG;AAAZ,8BAAS"}
+{"version":3,"file":"tag.module.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAEhD,qDAAiD;AACjD,qDAAiD;AACjD,6CAAmC;AACnC,+CAA2C;AAQpC,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,SAAS;IANrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,gBAAG,CAAC,CAAC,EAAE,wBAAU,CAAC;QACtD,OAAO,EAAE,CAAC,wBAAU,CAAC;QACrB,SAAS,EAAE,CAAC,wBAAU,CAAC;QACvB,WAAW,EAAE,CAAC,8BAAa,CAAC;KAC7B,CAAC;GACW,SAAS,CAAG;AAAZ,8BAAS"}

package/dist/modules/tag/tag.service.js

@@ -13,10 +13,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagService = void 0;
-const api_messages_1 = require("../../common/api-messages");
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
+const api_messages_1 = require("../../common/api-messages");
 const tag_entity_1 = require("./tag.entity");
 let TagService = class TagService {
     constructor(tagRepository) {

package/dist/modules/tag/tag.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.service.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tag.service.js","sourceRoot":"","sources":["../../../src/modules/tag/tag.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/user/user.controller.js

@@ -13,10 +13,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserController = void 0;
-const api_messages_1 = require("../../common/api-messages");
 const common_1 = require("@nestjs/common");
 const jwt_1 = require("@nestjs/jwt");
 const swagger_1 = require("@nestjs/swagger");
+const api_messages_1 = require("../../common/api-messages");
+const user_util_1 = require("../../utils/user.util");
 const jwt_auth_guard_1 = require("../auth/jwt-auth.guard");
 const roles_guard_1 = require("../auth/roles.guard");
 const user_entity_1 = require("./user.entity");
@@ -30,6 +31,13 @@ let UserController = class UserController {
         return this.userService.findAll(query);
     }
     async register(user) {
+        const email = typeof user.email === 'string' ? user.email.trim() : '';
+        if (!email) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_REQUIRED, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (!(0, user_util_1.isValidEmail)(email)) {
+            throw new common_1.HttpException(api_messages_1.ApiMsg.EMAIL_INVALID, common_1.HttpStatus.BAD_REQUEST);
+        }
         const d = await this.userService.createUser(user);
         return d;
     }

package/dist/modules/user/user.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../src/modules/user/user.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../src/modules/user/user.controller.ts"],"names":[],"mappings":"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"}