Skip to content

Commit 2ff0bf7

Browse files
authored
Reduce direct Consent.createdBySiteAdmin use and pass SupportAgent instead. (#7795)
1 parent 36fb78c commit 2ff0bf7

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

app/lib/account/consent_backend.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ class ConsentBackend {
111111
required String kind,
112112
required List<String> args,
113113
required AuditLogRecord auditLogRecord,
114-
required bool createdBySiteAdmin,
115114
}) async {
116115
return retry(() async {
117116
// First check for existing consents with identical dedupId.
@@ -143,7 +142,7 @@ class ConsentBackend {
143142
email: email,
144143
kind: kind,
145144
args: args,
146-
createdBySiteAdmin: createdBySiteAdmin,
145+
createdBySiteAdmin: activeAgent is SupportAgent,
147146
);
148147
await _db.commit(inserts: [
149148
consent,
@@ -159,7 +158,6 @@ class ConsentBackend {
159158
required User activeUser,
160159
required String packageName,
161160
required String uploaderEmail,
162-
bool createdBySiteAdmin = false,
163161
}) async {
164162
return await _invite(
165163
activeAgent: agent,
@@ -172,7 +170,6 @@ class ConsentBackend {
172170
package: packageName,
173171
uploaderEmail: uploaderEmail,
174172
),
175-
createdBySiteAdmin: createdBySiteAdmin,
176173
);
177174
}
178175

@@ -191,7 +188,6 @@ class ConsentBackend {
191188
args: [publisherId, contactEmail],
192189
auditLogRecord: await AuditLogRecord.publisherContactInvited(
193190
user: user, publisherId: publisherId, contactEmail: contactEmail),
194-
createdBySiteAdmin: false,
195191
);
196192
}
197193

@@ -201,7 +197,6 @@ class ConsentBackend {
201197
required User activeUser,
202198
required String publisherId,
203199
required String invitedUserEmail,
204-
bool createdBySiteAdmin = false,
205200
}) async {
206201
return await _invite(
207202
activeAgent: authenticatedAgent,
@@ -214,7 +209,6 @@ class ConsentBackend {
214209
publisherId: publisherId,
215210
memberEmail: invitedUserEmail,
216211
),
217-
createdBySiteAdmin: createdBySiteAdmin,
218212
);
219213
}
220214

app/lib/admin/backend.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import 'package:convert/convert.dart';
1414
import 'package:gcloud/service_scope.dart' as ss;
1515
import 'package:logging/logging.dart';
1616
import 'package:pool/pool.dart';
17+
import 'package:pub_dev/account/agent.dart';
1718
import 'package:pub_semver/pub_semver.dart';
1819

1920
import '../account/backend.dart';
@@ -610,11 +611,10 @@ class AdminBackend {
610611

611612
final user = await accountBackend.userForServiceAccount(authenticatedUser);
612613
await consentBackend.invitePackageUploader(
613-
agent: authenticatedUser,
614+
agent: SupportAgent(),
614615
activeUser: user,
615616
packageName: packageName,
616617
uploaderEmail: uploaderEmail,
617-
createdBySiteAdmin: true,
618618
);
619619
return await handleGetPackageUploaders(packageName);
620620
}

app/lib/admin/tools/publisher_member.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'dart:async';
66

77
import 'package:_pub_shared/data/publisher_api.dart';
8+
import 'package:pub_dev/account/agent.dart';
89
import 'package:pub_dev/account/backend.dart';
910
import 'package:pub_dev/account/consent_backend.dart';
1011
import 'package:pub_dev/publisher/backend.dart';
@@ -35,11 +36,10 @@ Future<String> executePublisherInviteMember(List<String> args) async {
3536
await publisherBackend.verifyPublisherMemberInvite(
3637
publisherId, InviteMemberRequest(email: invitedEmail));
3738
await consentBackend.invitePublisherMember(
38-
authenticatedAgent: authenticatedAgent,
39+
authenticatedAgent: SupportAgent(),
3940
activeUser: await accountBackend.userForServiceAccount(authenticatedAgent),
4041
publisherId: publisherId,
4142
invitedUserEmail: invitedEmail,
42-
createdBySiteAdmin: true,
4343
);
4444

4545
return '$invitedEmail has been invited.';

app/test/admin/api_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ void main() {
526526
final inviteAuditRecord = records1.records
527527
.firstWhere((e) => e.kind == AuditLogRecordKind.uploaderInvited);
528528
expect(inviteAuditRecord.summary,
529-
'`admin@pub.dev` invited `[email protected]` to be an uploader for package `oxygen`.');
529+
'`support@pub.dev` invited `[email protected]` to be an uploader for package `oxygen`.');
530530

531531
final consentRow = await dbService.query<Consent>().run().single;
532532
expect(consentRow.args, ['oxygen']);

app/test/admin/api_tool_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void main() {
9797
final r = page.records.firstWhere(
9898
(e) => e.kind == AuditLogRecordKind.publisherMemberInvited);
9999
expect(r.summary,
100-
'`admin@pub.dev` invited `[email protected]` to be a member for publisher `example.com`.');
100+
'`support@pub.dev` invited `[email protected]` to be a member for publisher `example.com`.');
101101

102102
late String consentId;
103103
await withFakeAuthRequestContext(

0 commit comments

Comments
 (0)