1818
1919import cd .go .authorization .github .GitHubAuthenticator ;
2020import cd .go .authorization .github .GitHubAuthorizer ;
21- import cd .go .authorization .github .GitHubClientBuilder ;
2221import cd .go .authorization .github .exceptions .NoAuthorizationConfigurationException ;
2322import cd .go .authorization .github .models .AuthConfig ;
2423import cd .go .authorization .github .models .LoggedInUserInfo ;
3029import java .util .Map ;
3130
3231import static cd .go .authorization .github .utils .Util .GSON ;
33- import static com .thoughtworks .go .plugin .api .response .DefaultGoApiResponse .SUCCESS_RESPONSE_CODE ;
3432
3533public class UserAuthenticationRequestExecutor implements RequestExecutor {
3634 private final UserAuthenticationRequest request ;
37- private final GitHubClientBuilder providerManager ;
3835 private final GitHubAuthenticator gitHubAuthenticator ;
3936 private final GitHubAuthorizer gitHubAuthorizer ;
4037
4138 public UserAuthenticationRequestExecutor (UserAuthenticationRequest request ) {
42- this (request , new GitHubClientBuilder (), new GitHubAuthenticator (), new GitHubAuthorizer ());
39+ this (request , new GitHubAuthenticator (), new GitHubAuthorizer ());
4340 }
4441
45- UserAuthenticationRequestExecutor (UserAuthenticationRequest request , GitHubClientBuilder providerManager , GitHubAuthenticator gitHubAuthenticator , GitHubAuthorizer gitHubAuthorizer ) {
42+ UserAuthenticationRequestExecutor (UserAuthenticationRequest request , GitHubAuthenticator gitHubAuthenticator , GitHubAuthorizer gitHubAuthorizer ) {
4643 this .request = request ;
47- this .providerManager = providerManager ;
4844 this .gitHubAuthenticator = gitHubAuthenticator ;
4945 this .gitHubAuthorizer = gitHubAuthorizer ;
5046 }
@@ -64,7 +60,6 @@ public GoPluginApiResponse execute() throws Exception {
6460 userMap .put ("roles" , gitHubAuthorizer .authorize (loggedInUserInfo .getGitHubUser (), authConfig , request .roles ()));
6561 }
6662
67- DefaultGoPluginApiResponse response = new DefaultGoPluginApiResponse (SUCCESS_RESPONSE_CODE , GSON .toJson (userMap ));
68- return response ;
63+ return DefaultGoPluginApiResponse .success (GSON .toJson (userMap ));
6964 }
7065}
0 commit comments