Consent.fromUserId and createdBySiteAdmin cleanup

app/lib/account/consent_backend.dart

@@ -138,11 +138,9 @@ class ConsentBackend {
       // Create a new entry.
       final consent = Consent.init(
         fromAgent: activeAgent.agentId,
-        fromUserId: activeUser.userId,
         email: email,
         kind: kind,
         args: args,
-        createdBySiteAdmin: activeAgent is SupportAgent,
       );
       await _db.commit(inserts: [
         consent,
@@ -328,7 +326,6 @@ class _PackageUploaderAction extends ConsentAction {
   @override
   Future<void> onAccept(Consent consent) async {
     final packageName = consent.args![0];
-    final createdBySiteAdmin = consent.createdBySiteAdmin ?? false;
     final currentUser = await requireAuthenticatedWebUser();
     if (currentUser.email?.toLowerCase() != consent.email?.toLowerCase()) {
       throw NotAcceptableException(
@@ -339,7 +336,6 @@ class _PackageUploaderAction extends ConsentAction {
       packageName,
       currentUser.user,
       consentRequestFromAgent: consent.fromAgent!,
-      consentRequestCreatedBySiteAdmin: createdBySiteAdmin,
     );
   }
 
@@ -405,7 +401,6 @@ class _PublisherContactAction extends ConsentAction {
       publisherId,
       contactEmail,
       consentRequestFromAgent: consent.fromAgent!,
-      consentRequestCreatedBySiteAdmin: consent.createdBySiteAdmin ?? false,
     );
   }
 
@@ -485,7 +480,6 @@ class _PublisherMemberAction extends ConsentAction {
       publisherId,
       currentUser.userId,
       consentRequestFromAgent: consent.fromAgent!,
-      consentRequestCreatedBySiteAdmin: consent.createdBySiteAdmin ?? false,
     );
   }
 

app/lib/account/models.dart

@@ -360,15 +360,7 @@ class Consent extends db.Model {
   @db.StringListProperty()
   List<String>? args;
 
-  @db.StringProperty()
-  String? fromUserId;
-
   /// May be an `User.userId` or `support@pub.dev`.
-  /// TODO: Migrate to use [fromAgent] instead of [fromUserId].
-  ///       As [Consent] expires after a week, we don't need to wait for long
-  ///       to migrate this in multiple releases. Once the current release is
-  ///       stable for more then a week, we are safe to migrate the code to use
-  ///       the new field and remove the old one.
   @db.StringProperty()
   String? fromAgent;
 
@@ -384,18 +376,13 @@ class Consent extends db.Model {
   @db.IntProperty()
   int notificationCount = 0;
 
-  @db.BoolProperty()
-  bool? createdBySiteAdmin = false;
-
   Consent();
 
   Consent.init({
-    required this.fromUserId,
     required this.fromAgent,
     required this.email,
     required this.kind,
     required this.args,
-    this.createdBySiteAdmin = false,
     Duration timeout = const Duration(days: 7),
   }) {
     id = Ulid().toString();

app/lib/package/backend.dart

@@ -1497,14 +1497,12 @@ class PackageBackend {
     String packageName,
     User uploader, {
     required String consentRequestFromAgent,
-    required bool consentRequestCreatedBySiteAdmin,
   }) async {
     await withRetryTransaction(db, (tx) async {
       final packageKey = db.emptyKey.append(Package, id: packageName);
       final package = (await tx.lookup([packageKey])).first as Package;
 
-      if (!consentRequestCreatedBySiteAdmin &&
-          consentRequestFromAgent != KnownAgents.pubSupport) {
+      if (consentRequestFromAgent != KnownAgents.pubSupport) {
         await _validatePackageUploader(
           packageName,
           package,

app/lib/publisher/backend.dart

@@ -358,11 +358,9 @@ class PublisherBackend {
     String publisherId,
     String contactEmail, {
     required String consentRequestFromAgent,
-    required bool consentRequestCreatedBySiteAdmin,
   }) async {
     checkPublisherIdParam(publisherId);
-    if (!consentRequestCreatedBySiteAdmin &&
-        consentRequestFromAgent != KnownAgents.pubSupport) {
+    if (consentRequestFromAgent != KnownAgents.pubSupport) {
       await requirePublisherAdmin(publisherId, consentRequestFromAgent);
     }
     final authenticatedUser = await requireAuthenticatedWebUser();
@@ -548,11 +546,9 @@ class PublisherBackend {
     String publisherId,
     String userId, {
     required String consentRequestFromAgent,
-    required bool consentRequestCreatedBySiteAdmin,
   }) async {
     checkPublisherIdParam(publisherId);
-    if (!consentRequestCreatedBySiteAdmin &&
-        consentRequestFromAgent != KnownAgents.pubSupport) {
+    if (consentRequestFromAgent != KnownAgents.pubSupport) {
       await requirePublisherAdmin(publisherId, consentRequestFromAgent);
     }
     final user = await accountBackend.lookupUserById(userId);

app/lib/shared/user_merger.dart

@@ -171,7 +171,6 @@ class UserMerger {
         await withRetryTransaction(_db, (tx) async {
           final consent = await tx.lookupValue<Consent>(m.key);
           if (consent.fromAgent == fromUserId) {
-            consent.fromUserId = toUserId;
             consent.fromAgent = toUserId;
             tx.insert(consent);
           }

app/test/admin/api_test.dart

@@ -530,7 +530,6 @@ void main() {
 
           final consentRow = await dbService.query<Consent>().run().single;
           expect(consentRow.args, ['oxygen']);
-          expect(consentRow.createdBySiteAdmin, isTrue);
 
           await (await createFakeAuthPubApiClient(email: 'someuser@pub.dev'))
               .resolveConsent(

app/test/frontend/golden/pkg_activity_log_page.html

@@ -255,7 +255,7 @@ <h3 class="detail-lead-title">Metadata</h3>
                     <tbody>
                       <tr>
                         <td class="date">
-                          <a class="-x-ago" href="" title="%%published-date%%" aria-label="%%x-ago%%" aria-role="button" role="button" data-timestamp="%%millis%%">%%x-ago%%</a>
+                          <a class="-x-ago" href="" title="%%activity-0-date%%" aria-label="%%x-ago%%" aria-role="button" role="button" data-timestamp="%%millis%%">%%x-ago%%</a>
                         </td>
                         <td class="summary">
                           <div class="markdown-body">

app/test/publisher/api_test.dart

@@ -349,7 +349,6 @@ void main() {
             .map((c) => {
                   'id': c.consentId,
                   'fromAgent': c.fromAgent,
-                  'fromUserId': c.fromUserId,
                   'email': c.email,
                   'kind': c.kind,
                   'args': c.args,
@@ -402,7 +401,6 @@ void main() {
         );
         final consent = Consent.init(
           fromAgent: adminUser.userId,
-          fromUserId: adminUser.userId,
           email: 'other@pub.dev',
           kind: 'PublisherMember',
           args: ['example.com'],
@@ -419,7 +417,6 @@ void main() {
           {
             'id': isNotNull,
             'fromAgent': adminUser.userId,
-            'fromUserId': adminUser.userId,
             'email': 'other@pub.dev',
             'kind': 'PublisherMember',
             'args': ['example.com'],
@@ -449,7 +446,6 @@ void main() {
           {
             'id': isNotNull,
             'fromAgent': user.userId,
-            'fromUserId': user.userId,
             'email': 'newuser@example.com',
             'kind': 'PublisherMember',
             'args': ['example.com'],
@@ -469,7 +465,6 @@ void main() {
           {
             'id': isNotNull,
             'fromAgent': user.userId,
-            'fromUserId': user.userId,
             'email': 'user@pub.dev',
             'kind': 'PublisherMember',
             'args': ['example.com'],

app/test/shared/user_merger_test.dart

@@ -98,21 +98,18 @@ void main() {
       kind: 'k1',
       args: ['1'],
       fromAgent: user.userId,
-      fromUserId: user.userId,
     );
     final target2 = Consent.init(
       email: user.email,
       kind: 'k2',
       args: ['2'],
       fromAgent: admin.userId,
-      fromUserId: admin.userId,
     );
     final controlConsent = Consent.init(
       email: control.email,
       kind: 'k3',
       args: ['3'],
       fromAgent: control.userId,
-      fromUserId: control.userId,
     );
     await dbService.commit(inserts: [target1, target2, controlConsent]);
 
@@ -123,9 +120,9 @@ void main() {
     final updated2 = list.firstWhere((c) => c.id == target2.id);
     final updated3 = list.firstWhere((c) => c.id == controlConsent.id);
 
-    expect(updated1.fromUserId, user.userId);
-    expect(updated2.fromUserId, user.userId);
-    expect(updated3.fromUserId, control.userId);
+    expect(updated1.fromAgent, user.userId);
+    expect(updated2.fromAgent, user.userId);
+    expect(updated3.fromAgent, control.userId);
   });
 
   testWithProfile('publisher membership',