From 4115f20084f302f497be9cb12237564679ca54ec Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 20 Jan 2023 15:34:01 +0100 Subject: Add ability to not send an email for registration --- .../admin-registration.service.ts | 22 ++++++-- .../process-registration-modal.component.html | 13 +++-- .../process-registration-modal.component.ts | 61 ++++++++++++++-------- .../shared/form-validators/form-validator.model.ts | 2 +- 4 files changed, 66 insertions(+), 32 deletions(-) (limited to 'client/src/app') diff --git a/client/src/app/+admin/moderation/registration-list/admin-registration.service.ts b/client/src/app/+admin/moderation/registration-list/admin-registration.service.ts index 10e2938c7..a9f13cf2f 100644 --- a/client/src/app/+admin/moderation/registration-list/admin-registration.service.ts +++ b/client/src/app/+admin/moderation/registration-list/admin-registration.service.ts @@ -5,7 +5,7 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { RestExtractor, RestPagination, RestService } from '@app/core' import { arrayify } from '@shared/core-utils' -import { ResultList, UserRegistration } from '@shared/models' +import { ResultList, UserRegistration, UserRegistrationUpdateState } from '@shared/models' import { environment } from '../../../../environments/environment' @Injectable() @@ -40,17 +40,29 @@ export class AdminRegistrationService { ) } - acceptRegistration (registration: UserRegistration, moderationResponse: string) { + acceptRegistration (options: { + registration: UserRegistration + moderationResponse: string + preventEmailDelivery: boolean + }) { + const { registration, moderationResponse, preventEmailDelivery } = options + const url = AdminRegistrationService.BASE_REGISTRATION_URL + '/' + registration.id + '/accept' - const body = { moderationResponse } + const body: UserRegistrationUpdateState = { moderationResponse, preventEmailDelivery } return this.authHttp.post(url, body) .pipe(catchError(res => this.restExtractor.handleError(res))) } - rejectRegistration (registration: UserRegistration, moderationResponse: string) { + rejectRegistration (options: { + registration: UserRegistration + moderationResponse: string + preventEmailDelivery: boolean + }) { + const { registration, moderationResponse, preventEmailDelivery } = options + const url = AdminRegistrationService.BASE_REGISTRATION_URL + '/' + registration.id + '/reject' - const body = { moderationResponse } + const body: UserRegistrationUpdateState = { moderationResponse, preventEmailDelivery } return this.authHttp.post(url, body) .pipe(catchError(res => this.restExtractor.handleError(res))) diff --git a/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.html b/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.html index 7a33bb94b..8e46b0cf9 100644 --- a/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.html +++ b/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.html @@ -12,7 +12,7 @@
- Registration email has not been verified. + Registration email has not been verified. Email delivery has been disabled by default.
@@ -21,7 +21,7 @@ Accepting {{ registration.username }} registration will create the account and channel.

-

+

An email will be sent to {{ registration.email }} explaining its account has been created with the moderation response you'll write below.

@@ -31,7 +31,7 @@ -

+

An email will be sent to {{ registration.email }} explaining its registration request has been rejected with the moderation response you'll write below.

@@ -53,6 +53,13 @@ {{ formErrors.moderationResponse }}
+ +
+ +
diff --git a/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts b/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts index fbe8deb41..3a7e5dea1 100644 --- a/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts +++ b/client/src/app/+admin/moderation/registration-list/process-registration-modal.component.ts @@ -34,7 +34,8 @@ export class ProcessRegistrationModalComponent extends FormReactive implements O ngOnInit () { this.buildForm({ - moderationResponse: REGISTRATION_MODERATION_RESPONSE_VALIDATOR + moderationResponse: REGISTRATION_MODERATION_RESPONSE_VALIDATOR, + preventEmailDelivery: null }) } @@ -50,6 +51,10 @@ export class ProcessRegistrationModalComponent extends FormReactive implements O this.processMode = mode this.registration = registration + this.form.patchValue({ + preventEmailDelivery: !this.isEmailEnabled() || registration.emailVerified !== true + }) + this.openedModal = this.modalService.open(this.modal, { centered: true }) } @@ -77,31 +82,41 @@ export class ProcessRegistrationModalComponent extends FormReactive implements O return this.server.getHTMLConfig().email.enabled } - private acceptRegistration () { - this.registrationService.acceptRegistration(this.registration, this.form.value.moderationResponse) - .subscribe({ - next: () => { - this.notifier.success($localize`${this.registration.username} account created`) - - this.registrationProcessed.emit() - this.hide() - }, + isPreventEmailDeliveryChecked () { + return this.form.value.preventEmailDelivery + } - error: err => this.notifier.error(err.message) - }) + private acceptRegistration () { + this.registrationService.acceptRegistration({ + registration: this.registration, + moderationResponse: this.form.value.moderationResponse, + preventEmailDelivery: this.form.value.preventEmailDelivery + }).subscribe({ + next: () => { + this.notifier.success($localize`${this.registration.username} account created`) + + this.registrationProcessed.emit() + this.hide() + }, + + error: err => this.notifier.error(err.message) + }) } private rejectRegistration () { - this.registrationService.rejectRegistration(this.registration, this.form.value.moderationResponse) - .subscribe({ - next: () => { - this.notifier.success($localize`${this.registration.username} registration rejected`) - - this.registrationProcessed.emit() - this.hide() - }, - - error: err => this.notifier.error(err.message) - }) + this.registrationService.rejectRegistration({ + registration: this.registration, + moderationResponse: this.form.value.moderationResponse, + preventEmailDelivery: this.form.value.preventEmailDelivery + }).subscribe({ + next: () => { + this.notifier.success($localize`${this.registration.username} registration rejected`) + + this.registrationProcessed.emit() + this.hide() + }, + + error: err => this.notifier.error(err.message) + }) } } diff --git a/client/src/app/shared/form-validators/form-validator.model.ts b/client/src/app/shared/form-validators/form-validator.model.ts index 31c253b9b..1e4bba86b 100644 --- a/client/src/app/shared/form-validators/form-validator.model.ts +++ b/client/src/app/shared/form-validators/form-validator.model.ts @@ -12,5 +12,5 @@ export type BuildFormArgument = { } export type BuildFormDefaultValues = { - [ name: string ]: number | string | string[] | BuildFormDefaultValues + [ name: string ]: boolean | number | string | string[] | BuildFormDefaultValues } -- cgit v1.2.3