commit 0244138ffb5a50282768bfcd9afa6dff4815d99c
author Alexander Martinz <alex@amartinz.at> Sun Sep 16 18:01:43 2018 +0000
committer Alexander Martinz <alex@amartinz.at> Mon Sep 17 16:30:02 2018 +0200
tree 011a5efe357c01790a7f8c5e305d6be3010b74c0
parent ec0e9a6ef833c1c0b028de48d0b9c48770886a47

Fix GitLab and Bitbucket services

Since commit I37bd47ac0c there is a precondition
check to ensure that raw is not null and passing
in null will result in a server error.

Instead of passing in null, pass in the raw response.

Change-Id: I537d017575948a4c262d55a736810f08f607e135
Signed-off-by: Alexander Martinz <alex@amartinz.at>

src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java
index e600067..55680f2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java
@@ -110,7 +110,7 @@
   public OAuthToken getAccessToken(OAuthVerifier rv) {
     Verifier vi = new Verifier(rv.getValue());
     Token to = service.getAccessToken(null, vi);
-    return new OAuthToken(to.getToken(), to.getSecret(), null);
+    return new OAuthToken(to.getToken(), to.getSecret(), to.getRawResponse());
   }
 
   @Override

src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java
index 2d6870a..792342e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java
@@ -106,7 +106,7 @@
   public OAuthToken getAccessToken(OAuthVerifier rv) {
     Verifier vi = new Verifier(rv.getValue());
     Token to = service.getAccessToken(null, vi);
-    return new OAuthToken(to.getToken(), to.getSecret(), null);
+    return new OAuthToken(to.getToken(), to.getSecret(), to.getRawResponse());
   }
 
   @Override