Rate limit check done at the time of creating the record (except for …

…package publishing). (#7594)
dart-lang · Mar 27, 2024 · 58b2f0a · 58b2f0a
1 parent 7232d49
commit 58b2f0a
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 122 deletions.
diff --git a/app/lib/account/consent_backend.dart b/app/lib/account/consent_backend.dart
@@ -159,7 +159,7 @@ class ConsentBackend {
       email: uploaderEmail,
       kind: ConsentKind.packageUploader,
       args: [packageName],
-      auditLogRecord: AuditLogRecord.uploaderInvited(
+      auditLogRecord: await AuditLogRecord.uploaderInvited(
         agent: agent,
         package: packageName,
         uploaderEmail: uploaderEmail,
@@ -180,7 +180,7 @@ class ConsentBackend {
       email: contactEmail,
       kind: ConsentKind.publisherContact,
       args: [publisherId, contactEmail],
-      auditLogRecord: AuditLogRecord.publisherContactInvited(
+      auditLogRecord: await AuditLogRecord.publisherContactInvited(
           user: user, publisherId: publisherId, contactEmail: contactEmail),
       createdBySiteAdmin: false,
     );
@@ -199,7 +199,7 @@ class ConsentBackend {
       email: invitedUserEmail,
       kind: ConsentKind.publisherMember,
       args: [publisherId],
-      auditLogRecord: AuditLogRecord.publisherMemberInvited(
+      auditLogRecord: await AuditLogRecord.publisherMemberInvited(
         agent: authenticatedAgent,
         publisherId: publisherId,
         memberEmail: invitedUserEmail,
@@ -345,26 +345,26 @@ class _PackageUploaderAction extends ConsentAction {
   @override
   Future<void> onReject(Consent consent, User? user) async {
     final packageName = consent.args![0];
-    await dbService.commit(inserts: [
-      AuditLogRecord.uploaderInviteRejected(
+    await withRetryTransaction(dbService, (tx) async {
+      tx.insert(await AuditLogRecord.uploaderInviteRejected(
         fromUserId: consent.fromUserId!,
         package: packageName,
         uploaderEmail: user?.email ?? consent.email!,
         userId: user?.userId,
-      ),
-    ]);
+      ));
+    });
   }
 
   @override
   Future<void> onExpire(Consent consent) async {
     final packageName = consent.args![0];
-    await dbService.commit(inserts: [
-      AuditLogRecord.uploaderInviteExpired(
+    await withRetryTransaction(dbService, (tx) async {
+      tx.insert(await AuditLogRecord.uploaderInviteExpired(
         fromUserId: consent.fromUserId!,
         package: packageName,
         uploaderEmail: consent.email!,
-      ),
-    ]);
+      ));
+    });
   }
 
   @override
@@ -411,27 +411,27 @@ class _PublisherContactAction extends ConsentAction {
   @override
   Future<void> onReject(Consent consent, User? user) async {
     final publisherId = consent.args![0];
-    await dbService.commit(inserts: [
-      AuditLogRecord.publisherContactInviteRejected(
+    await withRetryTransaction(dbService, (tx) async {
+      tx.insert(await AuditLogRecord.publisherContactInviteRejected(
         fromUserId: consent.fromUserId!,
         publisherId: publisherId,
         contactEmail: consent.email!,
         userEmail: user?.email,
         userId: user?.userId,
-      ),
-    ]);
+      ));
+    });
   }
 
   @override
   Future<void> onExpire(Consent consent) async {
     final publisherId = consent.args![0];
-    await dbService.commit(inserts: [
-      AuditLogRecord.publisherContactInviteExpired(
+    await withRetryTransaction(dbService, (tx) async {
+      tx.insert(await AuditLogRecord.publisherContactInviteExpired(
         fromUserId: consent.fromUserId!,
         publisherId: publisherId,
         contactEmail: consent.email!,
-      ),
-    ]);
+      ));
+    });
   }
 
   @override
@@ -491,26 +491,26 @@ class _PublisherMemberAction extends ConsentAction {
   @override
   Future<void> onReject(Consent consent, User? user) async {
     final publisherId = consent.args![0];
-    await dbService.commit(inserts: [
-      AuditLogRecord.publisherMemberInviteRejected(
+    await withRetryTransaction(dbService, (tx) async {
+      tx.insert(await AuditLogRecord.publisherMemberInviteRejected(
         fromUserId: consent.fromUserId!,
         publisherId: publisherId,
         memberEmail: user?.email ?? consent.email!,
         userId: user?.userId,
-      ),
-    ]);
+      ));
+    });
   }
 
   @override
   Future<void> onExpire(Consent consent) async {
     final publisherId = consent.args![0];
-    await dbService.commit(inserts: [
-      AuditLogRecord.publisherMemberInviteExpired(
+    await withRetryTransaction(dbService, (tx) async {
+      tx.insert(await AuditLogRecord.publisherMemberInviteExpired(
         fromUserId: consent.fromUserId!,
         publisherId: publisherId,
         memberEmail: consent.email!,
-      ),
-    ]);
+      ));
+    });
   }
 
   @override

diff --git a/app/lib/admin/actions/create_publisher.dart b/app/lib/admin/actions/create_publisher.dart
@@ -77,7 +77,7 @@ This should generally only be done with PM approval as it skips actual domain ve
             ..created = now
             ..updated = now
             ..role = PublisherMemberRole.admin,
-          AuditLogRecord.publisherCreated(
+          await AuditLogRecord.publisherCreated(
             user: user,
             publisherId: publisherId,
           ),

diff --git a/app/lib/admin/actions/remove_package_from_publisher.dart b/app/lib/admin/actions/remove_package_from_publisher.dart
@@ -53,7 +53,7 @@ If the publisher has no members, the package will end up without uploaders.
         pkg.updated = clock.now().toUtc();
         tx.insert(pkg);
         tx.insert(
-          AuditLogRecord.packageRemovedFromPublisher(
+          await AuditLogRecord.packageRemovedFromPublisher(
             package: packageName,
             fromPublisherId: currentPublisherId,
           ),

diff --git a/app/lib/admin/backend.dart b/app/lib/admin/backend.dart
@@ -648,7 +648,7 @@ class AdminBackend {
         final r = p.uploaders!.remove(uploaderUser.userId);
         if (r) {
           removed = true;
-          tx.insert(AuditLogRecord.uploaderRemoved(
+          tx.insert(await AuditLogRecord.uploaderRemoved(
             agent: authenticatedUser,
             package: packageName,
             uploaderUser: uploaderUser,
@@ -658,7 +658,7 @@ class AdminBackend {
       if (removed) {
         if (p.uploaders!.isEmpty) {
           p.isDiscontinued = true;
-          tx.insert(AuditLogRecord.packageOptionsUpdated(
+          tx.insert(await AuditLogRecord.packageOptionsUpdated(
             agent: authenticatedUser,
             package: packageName,
             publisherId: p.publisherId,