allow 'null' as callback. It's an optional parameter. Remove "oob" as default (thanks to https://github.com/massongit)

kullfar · kullfar · commit 7b8aab5eaba9 · 2018-01-15T15:03:49.000+03:00
diff --git a/changelog b/changelog
@@ -1,3 +1,6 @@
+[SNAPSHOT]
+ * allow 'null' as callback. It's an optional parameter. Remove "oob" as default (thanks to https://github.com/massongit)
+
 [5.1.0]
  * drop optional dependency on Apache commons-codec
  * add API - Dataporten (https://docs.dataporten.no/) (thanks to https://github.com/xibriz)
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java b/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java
@@ -4,7 +4,6 @@
 import com.github.scribejava.core.httpclient.HttpClient;
 import com.github.scribejava.core.httpclient.HttpClientConfig;
 import com.github.scribejava.core.model.OAuthConfig;
-import com.github.scribejava.core.model.OAuthConstants;
 import com.github.scribejava.core.oauth.OAuthService;
 import com.github.scribejava.core.utils.Preconditions;
 
@@ -15,7 +14,7 @@
  */
 public class ServiceBuilder {
 
-    private String callback = OAuthConstants.OUT_OF_BAND;
+    private String callback;
     private String apiKey;
     private String apiSecret;
     private String scope;
@@ -38,7 +37,6 @@ public ServiceBuilder(String apiKey) {
      * @return the {@link ServiceBuilder} instance for method chaining
      */
     public ServiceBuilder callback(String callback) {
-        Preconditions.checkNotNull(callback, "Callback can't be null");
         this.callback = callback;
         return this;
     }
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java
@@ -17,7 +17,6 @@ public interface OAuthConstants {
     String PARAM_PREFIX = "oauth_";
     String TOKEN = "oauth_token";
     String TOKEN_SECRET = "oauth_token_secret";
-    String OUT_OF_BAND = "oob";
     String VERIFIER = "oauth_verifier";
     String HEADER = "Authorization";
     String SCOPE = "scope";
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java
@@ -5,7 +5,6 @@
 import org.junit.Test;
 import com.github.scribejava.core.builder.api.DefaultApi20;
 import com.github.scribejava.core.model.OAuthConfig;
-import com.github.scribejava.core.model.OAuthConstants;
 import com.github.scribejava.core.oauth.OAuth20Service;
 
 public class ServiceBuilderTest {
@@ -26,7 +25,7 @@ public void shouldReturnConfigDefaultValues() {
         final OAuthConfig config = api.getConfig();
         assertEquals(config.getApiKey(), "key");
         assertEquals(config.getApiSecret(), "secret");
-        assertEquals(config.getCallback(), OAuthConstants.OUT_OF_BAND);
+        assertEquals(config.getCallback(), null);
     }
 
     @Test
@@ -39,8 +38,8 @@ public void shouldAcceptValidCallbackUrl() {
         assertEquals(config.getCallback(), "http://example.com");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldNotAcceptNullAsCallback() {
+    @Test
+    public void shouldAcceptNullAsCallback() {
         builder.apiKey("key").apiSecret("secret").callback(null).build(api);
     }
 
