Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

feat: add resend verification email functionality to admin users list (#7272)

HugeFrog24bbb2c96cde35
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
index 214aa78d16..a9ea8a2ef9 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
@@ -2,7 +2,7 @@ import { CommonModule, NgClass } from '@angular/common'
import { Component, OnDestroy, OnInit, inject, viewChild } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { RouterLink } from '@angular/router'
-import { AuthService, ConfirmService, HooksService, Notifier, PluginService } from '@app/core'
+import { AuthService, ConfirmService, HooksService, Notifier, PluginService, UserService } from '@app/core'
import { formatICU, getBackendHost } from '@app/helpers'
import { Actor } from '@app/shared/shared-main/account/actor.model'
import { PTDatePipe } from '@app/shared/shared-main/common/date.pipe'
@@ -72,6 +72,7 @@ export class UserListComponent implements OnInit, OnDestroy {
private userAdminService = inject(UserAdminService)
private hooks = inject(HooksService)
private pluginService = inject(PluginService)
+ private userService = inject(UserService)
readonly userBanModal = viewChild<UserBanModalComponent>('userBanModal')
readonly table = viewChild<TableComponent<User, ColumnName>>('table')
@@ -151,6 +152,13 @@ export class UserListComponent implements OnInit, OnDestroy {
isDisplayed: users => {
return users.every(u => this.authUser.canManage(u) && !u.blocked && u.emailVerified !== true)
}
+ },
+ {
+ label: $localize`Re-send verification emails`,
+ handler: users => this.resendVerificationEmails(users),
+ isDisplayed: users => {
+ return users.every(u => this.authUser.canManage(u) && !u.blocked && u.emailVerified !== true && !u.pluginAuth)
+ }
}
]
]
@@ -265,6 +273,22 @@ export class UserListComponent implements OnInit, OnDestroy {
})
}
+ resendVerificationEmails (users: User[]) {
+ this.userService.askSendVerifyEmail(users.map(u => u.email))
+ .subscribe({
+ next: () => {
+ this.notifier.success(
+ formatICU(
+ $localize`{count, plural, =1 {1 verification email sent.} other {{count} verification emails sent.}}`,
+ { count: users.length }
+ )
+ )
+ },
+
+ error: err => this.notifier.error(err.message)
+ })
+ }
+
private _dataLoader (options: DataLoaderOptions) {
return this.userAdminService.listUsers(options)
.pipe(
diff --git a/client/src/app/core/users/user.service.ts b/client/src/app/core/users/user.service.ts
index 14a469a1e0..a37779ee54 100644
--- a/client/src/app/core/users/user.service.ts
+++ b/client/src/app/core/users/user.service.ts
@@ -1,10 +1,10 @@
import { HttpClient, HttpParams } from '@angular/common/http'
-import { Injectable, LOCALE_ID, inject } from '@angular/core'
+import { inject, Injectable, LOCALE_ID } from '@angular/core'
import { AuthService } from '@app/core/auth'
-import { getCompleteLocale } from '@peertube/peertube-core-utils'
+import { arrayify, getCompleteLocale } from '@peertube/peertube-core-utils'
import { ActorImage, User as UserServerModel, UserUpdateMe, UserVideoQuota } from '@peertube/peertube-models'
-import { Observable, of } from 'rxjs'
-import { catchError, first, map, shareReplay } from 'rxjs/operators'
+import { from, Observable, of } from 'rxjs'
+import { catchError, concatMap, first, map, shareReplay, toArray } from 'rxjs/operators'
import { environment } from '../../../environments/environment'
import { RestExtractor } from '../rest'
import { UserLocalStorageService } from './user-local-storage.service'
@@ -108,11 +108,16 @@ export class UserService {
.pipe(catchError(err => this.restExtractor.handleError(err)))
}
- askSendVerifyEmail (email: string) {
+ askSendVerifyEmail (emailArg: string | string[]) {
+ const emails = arrayify(emailArg)
const url = UserService.BASE_USERS_URL + 'ask-send-verify-email'
- return this.authHttp.post(url, { email })
- .pipe(catchError(err => this.restExtractor.handleError(err)))
+ return from(emails)
+ .pipe(
+ concatMap(email => this.authHttp.post(url, { email })),
+ toArray(),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
verifyUserEmail (options: {
diff --git a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
index 4485dcd503..2ddb864476 100644
--- a/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
+++ b/client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
@@ -1,6 +1,6 @@
import { NgIf } from '@angular/common'
import { Component, OnChanges, OnInit, inject, input, output, viewChild } from '@angular/core'
-import { AuthService, ConfirmService, HooksService, Notifier, ServerService } from '@app/core'
+import { AuthService, ConfirmService, HooksService, Notifier, ServerService, UserService } from '@app/core'
import { BulkRemoveCommentsOfBody, User, UserRight } from '@peertube/peertube-models'
import { Account } from '../shared-main/account/account.model'
import { ActionDropdownComponent, DropdownAction } from '../shared-main/buttons/action-dropdown.component'
@@ -33,6 +33,7 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
private userAdminService = inject(UserAdminService)
private blocklistService = inject(BlocklistService)
private bulkService = inject(BulkService)
+ private userService = inject(UserService)
private hooks = inject(HooksService)
readonly userBanModal = viewChild<UserBanModalComponent>('userBanModal')
@@ -135,6 +136,17 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
})
}
+ resendVerificationEmail (user: User) {
+ this.userService.askSendVerifyEmail(user.email)
+ .subscribe({
+ next: () => {
+ this.notifier.success($localize`Verification email sent to ${user.email}`)
+ },
+
+ error: err => this.notifier.error(err.message)
+ })
+ }
+
blockAccountByUser (account: AccountMutedStatus) {
this.blocklistService.blockAccountByUser(account)
.subscribe({
@@ -373,6 +385,11 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
label: $localize`Set email as verified`,
handler: ({ user }) => this.setEmailAsVerified(user),
isDisplayed: ({ user }) => !user.blocked && user.emailVerified !== true
+ },
+ {
+ label: $localize`Re-send verification email`,
+ handler: ({ user }) => this.resendVerificationEmail(user),
+ isDisplayed: ({ user }) => !user.blocked && user.emailVerified !== true && !user.pluginAuth
}
])
}