diff --git a/app/lib/account/consent_backend.dart b/app/lib/account/consent_backend.dart index d4c580eb18..50d29ec34f 100644 --- a/app/lib/account/consent_backend.dart +++ b/app/lib/account/consent_backend.dart @@ -111,7 +111,6 @@ class ConsentBackend { required String kind, required List args, required AuditLogRecord auditLogRecord, - required bool createdBySiteAdmin, }) async { return retry(() async { // First check for existing consents with identical dedupId. @@ -143,7 +142,7 @@ class ConsentBackend { email: email, kind: kind, args: args, - createdBySiteAdmin: createdBySiteAdmin, + createdBySiteAdmin: activeAgent is SupportAgent, ); await _db.commit(inserts: [ consent, @@ -159,7 +158,6 @@ class ConsentBackend { required User activeUser, required String packageName, required String uploaderEmail, - bool createdBySiteAdmin = false, }) async { return await _invite( activeAgent: agent, @@ -172,7 +170,6 @@ class ConsentBackend { package: packageName, uploaderEmail: uploaderEmail, ), - createdBySiteAdmin: createdBySiteAdmin, ); } @@ -191,7 +188,6 @@ class ConsentBackend { args: [publisherId, contactEmail], auditLogRecord: await AuditLogRecord.publisherContactInvited( user: user, publisherId: publisherId, contactEmail: contactEmail), - createdBySiteAdmin: false, ); } @@ -201,7 +197,6 @@ class ConsentBackend { required User activeUser, required String publisherId, required String invitedUserEmail, - bool createdBySiteAdmin = false, }) async { return await _invite( activeAgent: authenticatedAgent, @@ -214,7 +209,6 @@ class ConsentBackend { publisherId: publisherId, memberEmail: invitedUserEmail, ), - createdBySiteAdmin: createdBySiteAdmin, ); } diff --git a/app/lib/admin/backend.dart b/app/lib/admin/backend.dart index 36d21afb7c..b4279915cf 100644 --- a/app/lib/admin/backend.dart +++ b/app/lib/admin/backend.dart @@ -14,6 +14,7 @@ import 'package:convert/convert.dart'; import 'package:gcloud/service_scope.dart' as ss; import 'package:logging/logging.dart'; import 'package:pool/pool.dart'; +import 'package:pub_dev/account/agent.dart'; import 'package:pub_semver/pub_semver.dart'; import '../account/backend.dart'; @@ -610,11 +611,10 @@ class AdminBackend { final user = await accountBackend.userForServiceAccount(authenticatedUser); await consentBackend.invitePackageUploader( - agent: authenticatedUser, + agent: SupportAgent(), activeUser: user, packageName: packageName, uploaderEmail: uploaderEmail, - createdBySiteAdmin: true, ); return await handleGetPackageUploaders(packageName); } diff --git a/app/lib/admin/tools/publisher_member.dart b/app/lib/admin/tools/publisher_member.dart index c2d7db501d..7a2f4639e6 100644 --- a/app/lib/admin/tools/publisher_member.dart +++ b/app/lib/admin/tools/publisher_member.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'package:_pub_shared/data/publisher_api.dart'; +import 'package:pub_dev/account/agent.dart'; import 'package:pub_dev/account/backend.dart'; import 'package:pub_dev/account/consent_backend.dart'; import 'package:pub_dev/publisher/backend.dart'; @@ -35,11 +36,10 @@ Future executePublisherInviteMember(List args) async { await publisherBackend.verifyPublisherMemberInvite( publisherId, InviteMemberRequest(email: invitedEmail)); await consentBackend.invitePublisherMember( - authenticatedAgent: authenticatedAgent, + authenticatedAgent: SupportAgent(), activeUser: await accountBackend.userForServiceAccount(authenticatedAgent), publisherId: publisherId, invitedUserEmail: invitedEmail, - createdBySiteAdmin: true, ); return '$invitedEmail has been invited.'; diff --git a/app/test/admin/api_test.dart b/app/test/admin/api_test.dart index 32edc115a1..b203fbfd13 100644 --- a/app/test/admin/api_test.dart +++ b/app/test/admin/api_test.dart @@ -526,7 +526,7 @@ void main() { final inviteAuditRecord = records1.records .firstWhere((e) => e.kind == AuditLogRecordKind.uploaderInvited); expect(inviteAuditRecord.summary, - '`admin@pub.dev` invited `someuser@pub.dev` to be an uploader for package `oxygen`.'); + '`support@pub.dev` invited `someuser@pub.dev` to be an uploader for package `oxygen`.'); final consentRow = await dbService.query().run().single; expect(consentRow.args, ['oxygen']); diff --git a/app/test/admin/api_tool_test.dart b/app/test/admin/api_tool_test.dart index ff2d7b24d7..ceabd2322b 100644 --- a/app/test/admin/api_tool_test.dart +++ b/app/test/admin/api_tool_test.dart @@ -97,7 +97,7 @@ void main() { final r = page.records.firstWhere( (e) => e.kind == AuditLogRecordKind.publisherMemberInvited); expect(r.summary, - '`admin@pub.dev` invited `newmember@pub.dev` to be a member for publisher `example.com`.'); + '`support@pub.dev` invited `newmember@pub.dev` to be a member for publisher `example.com`.'); late String consentId; await withFakeAuthRequestContext(