Only update email list, no google.com exemption

Author: isoos

app/lib/admin/actions/package_reserve.dart

@@ -12,11 +12,14 @@ final packageReserve = AdminAction(
   name: 'package-reserve',
   summary: 'Creates a ReservedPackage entity.',
   description: '''
-Reserves a package name that can be claimed by @google.com accounts or
-the allowed list of email addresses.
+Reserves a package name that can be claimed by the specified list of email addresses.
 
-The action can be re-run with the same package name. In such cases the provided
-email list will be added to the existing ReservedPackage entity.
+The action can be re-run with the same package name. In such cases the previous
+email list will be discarded, and the specified email list will be updated to the
+existing ReservedPackage entity.
+
+When no emails are specified, the package will be reserved, but no user may be
+able to claim it.
 ''',
   options: {
     'package': 'The package name to be reserved.',
@@ -43,9 +46,7 @@ email list will be added to the existing ReservedPackage entity.
       final existing = await tx.lookupOrNull<ReservedPackage>(
           dbService.emptyKey.append(ReservedPackage, id: package));
       final entry = existing ?? ReservedPackage.init(package);
-      if (emails != null) {
-        entry.emails = <String>{...entry.emails, ...emails}.toList();
-      }
+      entry.emails = <String>{...?emails}.toList();
       tx.insert(entry);
       return entry;
     });

app/lib/package/backend.dart

@@ -1023,13 +1023,16 @@ class PackageBackend {
     required AuthenticatedAgent agent,
   }) async {
     final reservedPackage = await lookupReservedPackage(name);
-    final reservedEmails = reservedPackage?.emails ?? const <String>[];
 
     bool isAllowedUser = false;
     if (agent is AuthenticatedUser) {
       final email = agent.user.email;
-      isAllowedUser = email != null &&
-          (email.endsWith('@google.com') || reservedEmails.contains(email));
+      if (reservedPackage != null) {
+        final reservedEmails = reservedPackage.emails;
+        isAllowedUser = email != null && reservedEmails.contains(email);
+      } else {
+        isAllowedUser = email != null && email.endsWith('@google.com');
+      }
     }
 
     final isReservedName =

app/test/admin/package_reserve_test.dart

@@ -85,18 +85,18 @@ void main() {
       expect(rp, isNull);
     });
 
-    testWithProfile('allows Dart-team publishing', fn: () async {
+    testWithProfile('no longer allows Dart-team exemption', fn: () async {
       await _reserve('pkg');
 
       final pubspecContent = generatePubspecYaml('pkg', '1.0.0');
       final bytes = await packageArchiveBytes(pubspecContent: pubspecContent);
-      await createPubApiClient(
-              authToken: createFakeAuthTokenForEmail('[email protected]',
-                  audience: 'fake-client-audience'))
-          .uploadPackageBytes(bytes);
-
-      final rp = await packageBackend.lookupReservedPackage('pkg');
-      expect(rp, isNull);
+      await expectApiException(
+        createPubApiClient(authToken: adminClientToken)
+            .uploadPackageBytes(bytes),
+        code: 'PackageRejected',
+        status: 400,
+        message: 'Package name pkg is reserved.',
+      );
     });
   });
 }