diff --git a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts index fbee22bb9..60b5ad9a5 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { UserService } from '@services/user.service'; -import { SMTPConfiguration } from '@redaction/red-ui-http'; +import { ISmtpConfiguration } from '@red/domain'; @Component({ selector: 'redaction-smtp-auth-dialog', @@ -16,7 +16,7 @@ export class SmtpAuthDialogComponent { private readonly _formBuilder: FormBuilder, private readonly _userService: UserService, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: SMTPConfiguration, + @Inject(MAT_DIALOG_DATA) public data: ISmtpConfiguration, ) { this.authForm = this._formBuilder.group({ user: [data?.user || this._userService.currentUser.email, [Validators.required]], diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts index cf4f4d619..ca7f1934b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/general-config-screen.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AdminDialogService } from '../../services/admin-dialog.service'; -import { GeneralConfigurationModel, SMTPConfiguration } from '@redaction/red-ui-http'; +import { IGeneralConfiguration, ISmtpConfiguration } from '@red/domain'; import { ConfigService } from '@services/config.service'; import { AutoUnsubscribe, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -21,8 +21,8 @@ export class GeneralConfigScreenComponent extends AutoUnsubscribe implements OnI readonly configForm: FormGroup; readonly smtpForm: FormGroup; - private _initialGeneralConfiguration: GeneralConfigurationModel; - private _initialSMTPConfiguration: SMTPConfiguration; + private _initialGeneralConfiguration: IGeneralConfiguration; + private _initialSMTPConfiguration: ISmtpConfiguration; constructor( private readonly _toaster: Toaster, diff --git a/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts b/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts index 8d7391026..7d9f0faea 100644 --- a/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/smtp-config.service.ts @@ -1,6 +1,6 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, RequiredParam, Validate } from '@iqser/common-ui'; -import { SMTPConfiguration } from '@redaction/red-ui-http'; +import { ISmtpConfiguration } from '@red/domain'; @Injectable() export class SmtpConfigService extends GenericService { @@ -9,12 +9,12 @@ export class SmtpConfigService extends GenericService { } @Validate() - updateSMTPConfiguration(@RequiredParam() body: SMTPConfiguration) { + updateSMTPConfiguration(@RequiredParam() body: ISmtpConfiguration) { return this._post(body, `${this._defaultModelPath}/smtp`); } @Validate() - testSMTPConfiguration(@RequiredParam() body: SMTPConfiguration) { + testSMTPConfiguration(@RequiredParam() body: ISmtpConfiguration) { return this._post(body, `${this._defaultModelPath}/smtp/test`); } diff --git a/apps/red-ui/src/app/services/general-settings.service.ts b/apps/red-ui/src/app/services/general-settings.service.ts index 08613dfae..b817352c8 100644 --- a/apps/red-ui/src/app/services/general-settings.service.ts +++ b/apps/red-ui/src/app/services/general-settings.service.ts @@ -1,11 +1,11 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService, RequiredParam, Validate } from '@iqser/common-ui'; -import { GeneralConfigurationModel } from '@redaction/red-ui-http'; +import { IGeneralConfiguration } from '@red/domain'; @Injectable({ providedIn: 'root', }) -export class GeneralSettingsService extends GenericService { +export class GeneralSettingsService extends GenericService { constructor(protected readonly _injector: Injector) { super(_injector, 'configuration'); } @@ -15,7 +15,7 @@ export class GeneralSettingsService extends GenericService(body, `${this._defaultModelPath}/general`); } } diff --git a/libs/red-domain/src/index.ts b/libs/red-domain/src/index.ts index 0ce6beffa..3053a71b2 100644 --- a/libs/red-domain/src/index.ts +++ b/libs/red-domain/src/index.ts @@ -14,3 +14,4 @@ export * from './lib/file-attributes'; export * from './lib/files'; export * from './lib/downloads'; export * from './lib/reports'; +export * from './lib/configuration'; diff --git a/libs/red-domain/src/lib/configuration/general-configuration.ts b/libs/red-domain/src/lib/configuration/general-configuration.ts new file mode 100644 index 000000000..8f422c410 --- /dev/null +++ b/libs/red-domain/src/lib/configuration/general-configuration.ts @@ -0,0 +1,5 @@ +export interface IGeneralConfiguration { + auxiliaryName?: string; + displayName?: string; + forgotPasswordFunctionEnabled?: boolean; +} diff --git a/libs/red-domain/src/lib/configuration/index.ts b/libs/red-domain/src/lib/configuration/index.ts new file mode 100644 index 000000000..425d064c7 --- /dev/null +++ b/libs/red-domain/src/lib/configuration/index.ts @@ -0,0 +1,2 @@ +export * from './general-configuration'; +export * from './smtp-configuration'; diff --git a/libs/red-domain/src/lib/configuration/smtp-configuration.ts b/libs/red-domain/src/lib/configuration/smtp-configuration.ts new file mode 100644 index 000000000..4095e55f5 --- /dev/null +++ b/libs/red-domain/src/lib/configuration/smtp-configuration.ts @@ -0,0 +1,15 @@ +export interface ISmtpConfiguration { + auth?: boolean; + envelopeFrom?: string; + from?: string; + fromDisplayName?: string; + host?: string; + id?: string; + password?: string; + port?: number; + replyTo?: string; + replyToDisplayName?: string; + ssl?: boolean; + starttls?: boolean; + user?: string; +} diff --git a/libs/red-ui-http/src/lib/model/generalConfigurationModel.ts b/libs/red-ui-http/src/lib/model/generalConfigurationModel.ts deleted file mode 100644 index de1c46a8b..000000000 --- a/libs/red-ui-http/src/lib/model/generalConfigurationModel.ts +++ /dev/null @@ -1,17 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -export interface GeneralConfigurationModel { - auxiliaryName?: string; - displayName?: string; - forgotPasswordFunctionEnabled?: boolean; -} diff --git a/libs/red-ui-http/src/lib/model/models.ts b/libs/red-ui-http/src/lib/model/models.ts index 15132039e..676bc8fd5 100644 --- a/libs/red-ui-http/src/lib/model/models.ts +++ b/libs/red-ui-http/src/lib/model/models.ts @@ -3,10 +3,8 @@ export * from './categoryModel'; export * from './colors'; export * from './digitalSignature'; export * from './digitalSignatureViewModel'; -export * from './generalConfigurationModel'; export * from './idRemoval'; export * from './imageRecategorizationRequest'; export * from './placeholdersResponse'; export * from './rules'; -export * from './smtp-configuration'; export * from './watermarkModel'; diff --git a/libs/red-ui-http/src/lib/model/smtp-configuration.ts b/libs/red-ui-http/src/lib/model/smtp-configuration.ts deleted file mode 100644 index cc2cf9a33..000000000 --- a/libs/red-ui-http/src/lib/model/smtp-configuration.ts +++ /dev/null @@ -1,27 +0,0 @@ -/** - * API Documentation for Redaction Gateway - * Description for redaction - * - * OpenAPI spec version: 1.0 - * - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -export interface SMTPConfiguration { - auth?: boolean; - envelopeFrom?: string; - from?: string; - fromDisplayName?: string; - host?: string; - id?: string; - password?: string; - port?: number; - replyTo?: string; - replyToDisplayName?: string; - ssl?: boolean; - starttls?: boolean; - user?: string; -}