Imgur API PR fixes

Rabrg · Rabrg · commit 53805cbbddf7 · 2016-01-13T09:18:02.000-06:00
diff --git a/changelog b/changelog
@@ -1,5 +1,6 @@
 [SNAPSHOT]
  * Let GoogleApi20 supports OOB
+ * Updated Imgur API to OAuth2
 
 [2.1.0]
  * add Pinterest API
diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/ImgurApi.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/ImgurApi.java
@@ -38,7 +38,7 @@ public OAuthService createService(final OAuthConfig config) {
         return new ImgurOAuthServiceImpl(this, config);
     }
 
-    public boolean isOob(final OAuthConfig config) {
+    public static boolean isOob(final OAuthConfig config) {
         return "oob".equals(config.getCallback());
     }
-}
+}
diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/service/ImgurOAuthServiceImpl.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/service/ImgurOAuthServiceImpl.java
@@ -2,7 +2,12 @@
 
 import com.github.scribejava.apis.ImgurApi;
 import com.github.scribejava.core.builder.api.DefaultApi20;
-import com.github.scribejava.core.model.*;
+import com.github.scribejava.core.model.AbstractRequest;
+import com.github.scribejava.core.model.OAuthConfig;
+import com.github.scribejava.core.model.OAuthConstants;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Token;
+import com.github.scribejava.core.model.Verifier;
 import com.github.scribejava.core.oauth.OAuth20ServiceImpl;
 
 public final class ImgurOAuthServiceImpl extends OAuth20ServiceImpl {
@@ -13,14 +18,18 @@ public ImgurOAuthServiceImpl(final DefaultApi20 api, final OAuthConfig config) {
 
     @Override
     public Token getAccessToken(final Token requestToken, final Verifier verifier) {
-        final boolean oob = ((ImgurApi) getApi()).isOob(getConfig());
-
         final OAuthRequest request = new OAuthRequest(getApi().getAccessTokenVerb(),
                 getApi().getAccessTokenEndpoint(), this);
         request.addBodyParameter(OAuthConstants.CLIENT_ID, getConfig().getApiKey());
         request.addBodyParameter(OAuthConstants.CLIENT_SECRET, getConfig().getApiSecret());
-        request.addBodyParameter(OAuthConstants.GRANT_TYPE, oob ? "pin" : OAuthConstants.AUTHORIZATION_CODE);
-        request.addBodyParameter(oob ? "pin" : OAuthConstants.CODE, verifier.getValue());
+
+        if(ImgurApi.isOob(getConfig())) {
+            request.addBodyParameter(OAuthConstants.GRANT_TYPE, "pin");
+            request.addBodyParameter("pin", verifier.getValue());
+        } else {
+            request.addBodyParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE);
+            request.addBodyParameter(OAuthConstants.CODE, verifier.getValue());
+        }
 
         return getApi().getAccessTokenExtractor().extract(request.send().getBody());
     }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public OAuthService createService(final OAuthConfig config) {`
`38`	`38`	`return new ImgurOAuthServiceImpl(this, config);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public boolean isOob(final OAuthConfig config) {`
	`41`	`+ public static boolean isOob(final OAuthConfig config) {`
`42`	`42`	`return "oob".equals(config.getCallback());`
`43`	`43`	`}`
`44`		`-}`
	`44`	`+}`