Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions app/lib/account/consent_backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ class ConsentBackend {
required String kind,
required List<String> args,
required AuditLogRecord auditLogRecord,
required bool createdBySiteAdmin,
}) async {
return retry(() async {
// First check for existing consents with identical dedupId.
Expand Down Expand Up @@ -143,7 +142,7 @@ class ConsentBackend {
email: email,
kind: kind,
args: args,
createdBySiteAdmin: createdBySiteAdmin,
createdBySiteAdmin: activeAgent is SupportAgent,
);
await _db.commit(inserts: [
consent,
Expand All @@ -159,7 +158,6 @@ class ConsentBackend {
required User activeUser,
required String packageName,
required String uploaderEmail,
bool createdBySiteAdmin = false,
}) async {
return await _invite(
activeAgent: agent,
Expand All @@ -172,7 +170,6 @@ class ConsentBackend {
package: packageName,
uploaderEmail: uploaderEmail,
),
createdBySiteAdmin: createdBySiteAdmin,
);
}

Expand All @@ -191,7 +188,6 @@ class ConsentBackend {
args: [publisherId, contactEmail],
auditLogRecord: await AuditLogRecord.publisherContactInvited(
user: user, publisherId: publisherId, contactEmail: contactEmail),
createdBySiteAdmin: false,
);
}

Expand All @@ -201,7 +197,6 @@ class ConsentBackend {
required User activeUser,
required String publisherId,
required String invitedUserEmail,
bool createdBySiteAdmin = false,
}) async {
return await _invite(
activeAgent: authenticatedAgent,
Expand All @@ -214,7 +209,6 @@ class ConsentBackend {
publisherId: publisherId,
memberEmail: invitedUserEmail,
),
createdBySiteAdmin: createdBySiteAdmin,
);
}

Expand Down
4 changes: 2 additions & 2 deletions app/lib/admin/backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions app/lib/admin/tools/publisher_member.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -35,11 +36,10 @@ Future<String> executePublisherInviteMember(List<String> 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.';
Expand Down
2 changes: 1 addition & 1 deletion app/test/admin/api_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<Consent>().run().single;
expect(consentRow.args, ['oxygen']);
Expand Down
2 changes: 1 addition & 1 deletion app/test/admin/api_tool_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down