Move email-related components into the lib/service/email directory. (#8153)

isoos · web-flow · commit 4869d77b668b · 2024-10-17T11:20:58.000+02:00
diff --git a/app/lib/account/consent_backend.dart b/app/lib/account/consent_backend.dart
@@ -14,11 +14,10 @@ import '../frontend/templates/consent.dart';
 import '../package/backend.dart';
 import '../publisher/backend.dart';
 import '../service/email/backend.dart';
+import '../service/email/email_templates.dart' show createInviteEmail;
 import '../shared/datastore.dart';
-import '../shared/email.dart' show createInviteEmail;
 import '../shared/exceptions.dart';
 import '../shared/urls.dart';
-
 import 'backend.dart';
 import 'models.dart';
 
diff --git a/app/lib/account/default_auth_provider.dart b/app/lib/account/default_auth_provider.dart
@@ -12,13 +12,13 @@ import 'package:googleapis_auth/auth_io.dart' as auth;
 import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
 
+import '../service/email/email_templates.dart' show looksLikeEmail;
 import '../service/openid/gcp_openid.dart';
 import '../service/openid/github_openid.dart';
 import '../service/openid/jwt.dart';
 import '../service/openid/openid_models.dart';
 import '../service/secret/backend.dart';
 import '../shared/configuration.dart';
-import '../shared/email.dart' show looksLikeEmail;
 import '../shared/exceptions.dart';
 import '../shared/monitoring.dart';
 import '../shared/utils.dart' show fixedTimeEquals;
diff --git a/app/lib/admin/actions/email_send.dart b/app/lib/admin/actions/email_send.dart
@@ -2,14 +2,14 @@
 // 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/service/email/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 '../../shared/email.dart';
+import '../../service/email/email_templates.dart';
 
 import '../models.dart';
 import 'actions.dart';
diff --git a/app/lib/admin/actions/moderation_case_create.dart b/app/lib/admin/actions/moderation_case_create.dart
@@ -5,8 +5,8 @@
 import 'package:pub_dev/account/agent.dart';
 import 'package:pub_dev/admin/models.dart';
 import 'package:pub_dev/frontend/handlers/report.dart';
+import 'package:pub_dev/service/email/email_templates.dart';
 import 'package:pub_dev/shared/datastore.dart';
-import 'package:pub_dev/shared/email.dart';
 
 import 'actions.dart';
 
diff --git a/app/lib/admin/actions/moderation_case_update.dart b/app/lib/admin/actions/moderation_case_update.dart
@@ -4,8 +4,8 @@
 
 import 'package:pub_dev/admin/backend.dart';
 import 'package:pub_dev/admin/models.dart';
+import 'package:pub_dev/service/email/email_templates.dart';
 import 'package:pub_dev/shared/datastore.dart';
-import 'package:pub_dev/shared/email.dart';
 
 import 'actions.dart';
 
diff --git a/app/lib/admin/backend.dart b/app/lib/admin/backend.dart
@@ -32,9 +32,9 @@ import '../package/backend.dart'
 import '../package/models.dart';
 import '../publisher/models.dart';
 import '../scorecard/backend.dart';
+import '../service/email/email_templates.dart';
 import '../shared/configuration.dart';
 import '../shared/datastore.dart';
-import '../shared/email.dart';
 import '../shared/exceptions.dart';
 import '../shared/storage.dart';
 import '../shared/versions.dart';
diff --git a/app/lib/admin/tools/set_user_blocked.dart b/app/lib/admin/tools/set_user_blocked.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:pub_dev/account/backend.dart';
 import 'package:pub_dev/account/models.dart';
-import 'package:pub_dev/shared/email.dart';
+import 'package:pub_dev/service/email/email_templates.dart';
 
 Future<String> executeSetUserBlocked(List<String> args) async {
   if (args.isEmpty || args.length > 2) {
diff --git a/app/lib/fake/backend/fake_email_sender.dart b/app/lib/fake/backend/fake_email_sender.dart
@@ -9,8 +9,8 @@ import 'package:mailer/mailer.dart';
 import 'package:path/path.dart' as p;
 import 'package:ulid/ulid.dart';
 
-import '../../frontend/email_sender.dart';
-import '../../shared/email.dart';
+import '../../service/email/email_sender.dart';
+import '../../service/email/email_templates.dart';
 
 FakeEmailSender get fakeEmailSender => emailSender as FakeEmailSender;
 
diff --git a/app/lib/frontend/handlers/report.dart b/app/lib/frontend/handlers/report.dart
@@ -14,12 +14,12 @@ import 'package:shelf/shelf.dart' as shelf;
 import '../../../service/rate_limit/rate_limit.dart';
 import '../../account/backend.dart';
 import '../../admin/models.dart';
-import '../../frontend/email_sender.dart';
 import '../../frontend/handlers/cache_control.dart';
 import '../../package/backend.dart';
 import '../../publisher/backend.dart';
+import '../../service/email/email_sender.dart';
+import '../../service/email/email_templates.dart';
 import '../../shared/datastore.dart';
-import '../../shared/email.dart';
 import '../../shared/exceptions.dart';
 import '../../shared/handlers.dart';
 import '../request_context.dart';
diff --git a/app/lib/package/backend.dart b/app/lib/package/backend.dart
@@ -32,11 +32,11 @@ import '../account/models.dart' show User;
 import '../audit/models.dart';
 import '../publisher/backend.dart';
 import '../service/email/backend.dart';
+import '../service/email/email_templates.dart';
 import '../service/email/models.dart';
 import '../service/secret/backend.dart';
 import '../shared/configuration.dart';
 import '../shared/datastore.dart';
-import '../shared/email.dart';
 import '../shared/exceptions.dart';
 import '../shared/redis_cache.dart' show cache;
 import '../shared/storage.dart';
diff --git a/app/lib/publisher/backend.dart b/app/lib/publisher/backend.dart
@@ -16,12 +16,11 @@ import '../account/backend.dart';
 import '../account/consent_backend.dart';
 import '../audit/models.dart';
 import '../frontend/request_context.dart';
+import '../service/email/email_templates.dart';
 import '../shared/datastore.dart';
-import '../shared/email.dart';
 import '../shared/exceptions.dart';
 import '../shared/redis_cache.dart' show cache, EntryPurgeExt;
 import 'domain_verifier.dart' show domainVerifier;
-
 import 'models.dart';
 
 final _logger = Logger('pub.publisher.backend');
diff --git a/app/lib/service/email/backend.dart b/app/lib/service/email/backend.dart
@@ -10,9 +10,9 @@ import 'package:logging/logging.dart';
 import 'package:pub_dev/shared/exceptions.dart';
 import 'package:pub_dev/shared/utils.dart';
 
-import '../../frontend/email_sender.dart';
 import '../../shared/datastore.dart';
-import '../../shared/email.dart';
+import 'email_sender.dart';
+import 'email_templates.dart';
 import 'models.dart';
 
 final _logger = Logger('email.backend');
diff --git a/app/lib/service/email/email_sender.dart b/app/lib/service/email/email_sender.dart
@@ -16,8 +16,8 @@ import 'package:mailer/smtp_server.dart';
 import 'package:pool/pool.dart';
 import 'package:retry/retry.dart';
 
-import '../shared/email.dart';
-import '../shared/exceptions.dart';
+import '../../shared/exceptions.dart';
+import 'email_templates.dart';
 
 final _logger = Logger('pub.email');
 final _simpleUrlRegExp = RegExp(r'https?://(.+)');
diff --git a/app/lib/service/email/email_templates.dart b/app/lib/service/email/email_templates.dart
@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'urls.dart';
+import '../../shared/urls.dart';
 
 const _invitesAtPubDev = 'invites@pub.dev';
 const _noreplyAtPubDev = 'noreply@pub.dev';
diff --git a/app/lib/service/services.dart b/app/lib/service/services.dart
@@ -33,7 +33,6 @@ import '../fake/backend/fake_email_sender.dart';
 import '../fake/backend/fake_upload_signer_service.dart';
 import '../fake/server/fake_client_context.dart';
 import '../fake/server/fake_storage_server.dart';
-import '../frontend/email_sender.dart';
 import '../frontend/handlers.dart';
 import '../package/backend.dart';
 import '../package/name_tracker.dart';
@@ -61,6 +60,7 @@ import '../task/backend.dart';
 import '../task/cloudcompute/fakecloudcompute.dart';
 import '../task/cloudcompute/googlecloudcompute.dart';
 import 'announcement/backend.dart';
+import 'email/email_sender.dart';
 import 'entrypoint/logging.dart';
 import 'secret/backend.dart';
 
diff --git a/app/lib/shared/integrity.dart b/app/lib/shared/integrity.dart
@@ -24,11 +24,11 @@ import '../package/model_properties.dart';
 import '../package/models.dart';
 import '../publisher/backend.dart';
 import '../publisher/models.dart';
+import '../service/email/email_templates.dart'
+    show isValidEmail, looksLikeEmail;
 import '../shared/env_config.dart';
-
 import 'configuration.dart';
 import 'datastore.dart';
-import 'email.dart' show isValidEmail, looksLikeEmail;
 import 'storage.dart';
 import 'urls.dart' as urls;
 import 'utils.dart' show canonicalizeVersion, ByteArrayEqualsExt;
diff --git a/app/test/service/email/backend_test.dart b/app/test/service/email/backend_test.dart
@@ -5,9 +5,9 @@
 import 'package:clock/clock.dart';
 import 'package:pub_dev/fake/backend/fake_email_sender.dart';
 import 'package:pub_dev/service/email/backend.dart';
+import 'package:pub_dev/service/email/email_templates.dart';
 import 'package:pub_dev/service/email/models.dart';
 import 'package:pub_dev/shared/datastore.dart';
-import 'package:pub_dev/shared/email.dart';
 import 'package:test/test.dart';
 
 import '../../shared/test_services.dart';
diff --git a/app/test/service/email/email_sender_test.dart b/app/test/service/email/email_sender_test.dart
@@ -7,8 +7,8 @@ import 'dart:async';
 import 'package:clock/clock.dart';
 import 'package:mailer/mailer.dart';
 import 'package:pub_dev/admin/actions/actions.dart';
-import 'package:pub_dev/frontend/email_sender.dart';
-import 'package:pub_dev/shared/email.dart';
+import 'package:pub_dev/service/email/email_sender.dart';
+import 'package:pub_dev/service/email/email_templates.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/app/test/service/email/email_templates_test.dart b/app/test/service/email/email_templates_test.dart
@@ -2,7 +2,7 @@
 // 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/shared/email.dart';
+import 'package:pub_dev/service/email/email_templates.dart';
 import 'package:test/test.dart';
 
 void main() {
