Adapt to new AuthRequest API
Bug: Issue 15444
Change-Id: I026887b49afd5f9fd4fc8680ff93e60600f9980c
diff --git a/src/main/java/com/googlesource/gerrit/plugins/saml/SamlMembership.java b/src/main/java/com/googlesource/gerrit/plugins/saml/SamlMembership.java
index 06940dc..e7104e3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/saml/SamlMembership.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/saml/SamlMembership.java
@@ -56,6 +56,7 @@
private final IdentifiedUser.GenericFactory userFactory;
private final Provider<GroupsUpdate> groupsUpdateProvider;
private final Sequences sequences;
+ private final AuthRequest.Factory authRequestFactory;
@Inject
SamlMembership(
@@ -65,7 +66,8 @@
GroupCache groupCache,
IdentifiedUser.GenericFactory userFactory,
@ServerInitiated Provider<GroupsUpdate> groupsUpdateProvider,
- Sequences sequences) {
+ Sequences sequences,
+ AuthRequest.Factory authRequestFactory) {
this.memberAttr = samlConfig.getMemberOfAttr();
this.serverIdent = serverIdent;
this.accountManager = accountManager;
@@ -73,6 +75,7 @@
this.userFactory = userFactory;
this.groupsUpdateProvider = groupsUpdateProvider;
this.sequences = sequences;
+ this.authRequestFactory = authRequestFactory;
}
/**
@@ -174,7 +177,7 @@
}
private Account.Id getOrCreateAccountId(AuthenticatedUser user) throws IOException {
- AuthRequest authRequest = AuthRequest.forUser(user.getUsername());
+ AuthRequest authRequest = authRequestFactory.createForUser(user.getUsername());
authRequest.setUserName(user.getUsername());
authRequest.setEmailAddress(user.getEmail());
authRequest.setDisplayName(user.getDisplayName());