Email sender admin action: direct sending + cc recipients. (#7965)

Author: isoos

app/lib/admin/actions/email_send.dart

@@ -2,12 +2,13 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:pub_dev/frontend/email_sender.dart';
+import 'package:pub_dev/shared/utils.dart';
+
 import '../../account/agent.dart';
 import '../../account/backend.dart';
 import '../../package/backend.dart';
 import '../../publisher/backend.dart';
-import '../../service/email/backend.dart';
-import '../../shared/datastore.dart';
 import '../../shared/email.dart';
 
 import '../models.dart';
@@ -33,6 +34,7 @@ The list of resolved emails will be deduplicated.
   options: {
     'to': 'A comma separated list of email addresses or subjects '
         '(the recipients of the messages).',
+    'cc': '(optional) same as "to" with addresses that will be CC-d.',
     'from': 'The email address to impersonate (`support@pub.dev` by default).',
     'subject': 'The subject of the email message.',
     'body': 'The text content of the email body.',
@@ -61,63 +63,74 @@ The list of resolved emails will be deduplicated.
       to != null && to.isNotEmpty,
       'to must be given',
     );
+    final cc = options['cc'];
+    final inReplyTo = options['in-reply-to'];
+
+    final emailList = await _resolveEmails(to!);
+    final ccEmailList = cc == null ? null : await _resolveEmails(cc);
+
+    try {
+      await emailSender.sendMessage(EmailMessage(
+        localMessageId: createUuid(),
+        EmailAddress(from),
+        emailList.map((v) => EmailAddress(v)).toList(),
+        emailSubject!,
+        emailBody!,
+        ccRecipients:
+            ccEmailList?.map((v) => EmailAddress(v)).toList() ?? const [],
+        inReplyToLocalMessageId: inReplyTo,
+      ));
+      return {
+        'emails': emailList,
+        if (ccEmailList != null) 'ccEmails': ccEmailList,
+        'sent': true,
+      };
+    } catch (e, st) {
+      return {
+        'sent': false,
+        'error': e.toString(),
+        'stackTrace': st.toString(),
+      };
+    }
+  },
+);
 
-    final emails = <String>{};
-    for (final val in to!.split(',')) {
-      final value = val.trim();
-      if (isValidEmail(value)) {
-        emails.add(value);
-        continue;
-      }
-      final ms = ModerationSubject.tryParse(value);
-      InvalidInputException.check(ms != null, 'Invalid subject: $value');
+Future<List<String>> _resolveEmails(String value) async {
+  final emails = <String>{};
+  for (final val in value.split(',')) {
+    final value = val.trim();
+    if (isValidEmail(value)) {
+      emails.add(value);
+      continue;
+    }
+    final ms = ModerationSubject.tryParse(value);
+    InvalidInputException.check(ms != null, 'Invalid subject: $value');
 
-      switch (ms!.kind) {
-        case ModerationSubjectKind.package:
-        case ModerationSubjectKind.packageVersion:
-          final pkg = await packageBackend.lookupPackage(ms.package!);
-          if (pkg!.publisherId != null) {
-            final list =
-                await publisherBackend.getAdminMemberEmails(ms.publisherId!);
-            emails.addAll(list.nonNulls);
-          } else {
-            final list = await accountBackend
-                .lookupUsersById(pkg.uploaders ?? const <String>[]);
-            emails.addAll(list.map((e) => e?.email).nonNulls);
-          }
-          break;
-        case ModerationSubjectKind.publisher:
+    switch (ms!.kind) {
+      case ModerationSubjectKind.package:
+      case ModerationSubjectKind.packageVersion:
+        final pkg = await packageBackend.lookupPackage(ms.package!);
+        if (pkg!.publisherId != null) {
           final list =
               await publisherBackend.getAdminMemberEmails(ms.publisherId!);
           emails.addAll(list.nonNulls);
-          break;
-        case ModerationSubjectKind.user:
-          emails.add(ms.email!);
-          break;
-        default:
-          throw InvalidInputException('Unknown subject kind: ${ms.kind}');
-      }
+        } else {
+          final list = await accountBackend
+              .lookupUsersById(pkg.uploaders ?? const <String>[]);
+          emails.addAll(list.map((e) => e?.email).nonNulls);
+        }
+        break;
+      case ModerationSubjectKind.publisher:
+        final list =
+            await publisherBackend.getAdminMemberEmails(ms.publisherId!);
+        emails.addAll(list.nonNulls);
+        break;
+      case ModerationSubjectKind.user:
+        emails.add(ms.email!);
+        break;
+      default:
+        throw InvalidInputException('Unknown subject kind: ${ms.kind}');
     }
-
-    final inReplyTo = options['in-reply-to'];
-
-    final emailList = emails.toList()..sort();
-    final entity = emailBackend.prepareEntity(EmailMessage(
-      EmailAddress(from),
-      emailList.map((v) => EmailAddress(v)).toList(),
-      emailSubject!,
-      emailBody!,
-      inReplyToLocalMessageId: inReplyTo,
-    ));
-    await withRetryTransaction(dbService, (tx) async {
-      tx.insert(entity);
-    });
-    final sent = await emailBackend.trySendOutgoingEmail(entity);
-
-    return {
-      'uuid': entity.uuid,
-      'emails': emailList,
-      'sent': sent,
-    };
-  },
-);
+  }
+  return emails.toList()..sort();
+}

app/test/admin/email_send_test.dart

@@ -22,11 +22,10 @@ void main() {
         }),
       );
       expect(rs1.output, {
-        'uuid': isNotEmpty,
         'emails': ['a@pub.dev', 'b@pub.dev'],
-        'sent': 2,
+        'sent': true,
       });
-      expect(fakeEmailSender.sentMessages, hasLength(2));
+      expect(fakeEmailSender.sentMessages, hasLength(1));
       final sent = fakeEmailSender.sentMessages
           .expand((e) => e.recipients)
           .map((e) => e.email)
@@ -47,9 +46,8 @@ void main() {
         }),
       );
       expect(rs1.output, {
-        'uuid': isNotEmpty,
         'emails': ['admin@pub.dev'],
-        'sent': 1,
+        'sent': true,
       });
       expect(fakeEmailSender.sentMessages, hasLength(1));
       final email = fakeEmailSender.sentMessages.single;