relaxed restrictions on OAuth callbacks

fernandezpablo85 · fernandezpablo85 · commit 6cfdf973f891 · 2011-12-28T11:45:45.000-03:00
diff --git a/src/main/java/org/scribe/builder/ServiceBuilder.java b/src/main/java/org/scribe/builder/ServiceBuilder.java
@@ -84,7 +84,7 @@ public ServiceBuilder provider(Api api)
    */
   public ServiceBuilder callback(String callback)
   {
-    Preconditions.checkValidOAuthCallback(callback, "Callback must be a valid URL or 'oob'");
+    Preconditions.checkNotNull(callback, "Callback can't be null");
     this.callback = callback;
     return this;
   }
diff --git a/src/test/java/org/scribe/builder/ServiceBuilderTest.java b/src/test/java/org/scribe/builder/ServiceBuilderTest.java
@@ -46,9 +46,9 @@ public void shouldAcceptASignatureType()
   }
 
   @Test(expected=IllegalArgumentException.class)
-  public void shouldNotAcceptAnInvalidUrlAsCallback()
+  public void shouldNotAcceptNullAsCallback()
   {
-    builder.provider(ApiMock.class).apiKey("key").apiSecret("secret").callback("example.com").build(); 
+    builder.provider(ApiMock.class).apiKey("key").apiSecret("secret").callback(null).build(); 
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public ServiceBuilder provider(Api api)`
`84`	`84`	`*/`
`85`	`85`	`public ServiceBuilder callback(String callback)`
`86`	`86`	`{`
`87`		`- Preconditions.checkValidOAuthCallback(callback, "Callback must be a valid URL or 'oob'");`
	`87`	`+ Preconditions.checkNotNull(callback, "Callback can't be null");`
`88`	`88`	`this.callback = callback;`
`89`	`89`	`return this;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ public void shouldAcceptASignatureType()`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Test(expected=IllegalArgumentException.class)`
`49`		`- public void shouldNotAcceptAnInvalidUrlAsCallback()`
	`49`	`+ public void shouldNotAcceptNullAsCallback()`
`50`	`50`	`{`
`51`		`- builder.provider(ApiMock.class).apiKey("key").apiSecret("secret").callback("example.com").build();`
	`51`	`+ builder.provider(ApiMock.class).apiKey("key").apiSecret("secret").callback(null).build();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Test`