Refactored OOB checking in fbook api

fernandezpablo85 · fernandezpablo85 · commit 9c4f5bc33734 · 2011-01-13T23:50:36.000-03:00
diff --git a/src/main/java/org/scribe/builder/api/FacebookApi.java b/src/main/java/org/scribe/builder/api/FacebookApi.java
@@ -1,17 +1,16 @@
 package org.scribe.builder.api;
 
-import org.scribe.exceptions.*;
 import org.scribe.model.*;
 import org.scribe.utils.*;
 
 public class FacebookApi extends DefaultApi20
 {
   private static final String AUTHORIZE_URL = "https://graph.facebook.com/oauth/authorize?response_type=token&client_id=%s&redirect_uri=%s";
+
   @Override
   public String getAuthorizationUrl(OAuthConfig config)
   {
-    if(OAuthConstants.OUT_OF_BAND.equals(config.getCallback()))
-    	throw new OAuthException("Facebook does not support oob authentication.");
+    Preconditions.checkValidUrl(config.getCallback(), "Must provide a valid url as callback. Facebook does not support OOB");
     return String.format(AUTHORIZE_URL, config.getApiKey(), URLUtils.percentEncode(config.getCallback()));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,16 @@`
`1`	`1`	`package org.scribe.builder.api;`
`2`	`2`
`3`		`-import org.scribe.exceptions.*;`
`4`	`3`	`import org.scribe.model.*;`
`5`	`4`	`import org.scribe.utils.*;`
`6`	`5`
`7`	`6`	`public class FacebookApi extends DefaultApi20`
`8`	`7`	`{`
`9`	`8`	`private static final String AUTHORIZE_URL = "https://graph.facebook.com/oauth/authorize?response_type=token&client_id=%s&redirect_uri=%s";`
	`9`	`+`
`10`	`10`	`@Override`
`11`	`11`	`public String getAuthorizationUrl(OAuthConfig config)`
`12`	`12`	`{`
`13`		`- if(OAuthConstants.OUT_OF_BAND.equals(config.getCallback()))`
`14`		`- throw new OAuthException("Facebook does not support oob authentication.");`
	`13`	`+ Preconditions.checkValidUrl(config.getCallback(), "Must provide a valid url as callback. Facebook does not support OOB");`
`15`	`14`	`return String.format(AUTHORIZE_URL, config.getApiKey(), URLUtils.percentEncode(config.getCallback()));`
`16`	`15`	`}`
`17`	`16`	`}`