Merge pull request #24 from LuisLoureiro/displayAndStateValues

Display and state parameters for the OAuth2 authorization endpoint.

Author: jberkel

src/main/java/com/soundcloud/api/ApiWrapper.java

@@ -226,7 +226,9 @@ public Token extensionGrantType(String grantType, String... scopes) throws IOExc
                 REDIRECT_URI, mRedirectUri,
                 CLIENT_ID, mClientId,
                 RESPONSE_TYPE, CODE);
-        if (options.length == 2) req.add(SCOPE, options[1]);
+        if (options.length > 1) req.add(SCOPE, options[1]);
+        if (options.length > 2) req.add(DISPLAY, options[2]);
+        if (options.length > 3) req.add(STATE, options[3]);
         return getURI(req, false, true);
     }
 

src/main/java/com/soundcloud/api/CloudAPI.java

@@ -24,6 +24,8 @@ public interface CloudAPI {
     String CODE             = "code";
     String RESPONSE_TYPE    = "response_type";
     String SCOPE            = "scope";
+    String DISPLAY          = "display";
+    String STATE            = "state";
 
     // standard oauth2 grant types
     String PASSWORD           = "password";
@@ -41,6 +43,7 @@ public interface CloudAPI {
     String OAUTH_SCHEME       = "oauth";
     String VERSION            = "1.3.1";
     String USER_AGENT         = "SoundCloud Java Wrapper ("+VERSION+")";
+    String POPUP              = "popup";
 
     /**
      * Request a token using <a href="http://tools.ietf.org/html/draft-ietf-oauth-v2-10#section-4.1.2">
@@ -211,7 +214,7 @@ public interface CloudAPI {
      * <li><code>error</code> in case of failure, this contains an error code (most likely
      * <code>access_denied</code>).
      * </ul>
-     * @param  options auth endpoint to use (leave out for default), requested scope (leave out for default)
+     * @param  options auth endpoint to use (leave out for default), requested scope (leave out for default), display ('popup' for mobile optimized screen) and state.
      * @return the URI to open in a browser/WebView etc.
      * @see CloudAPI#authorizationCode(String, String...)
      */

src/test/java/com/soundcloud/api/ApiWrapperTest.java

@@ -361,6 +361,26 @@ public void shouldIncludeScopeInAuthorizationUrl() throws Exception {
         );
     }
 
+    @Test
+    public void shouldIncludeDisplayInAuthorizationUrl() throws Exception {
+        assertThat(
+            api.authorizationCodeUrl(Endpoints.CONNECT, Token.SCOPE_NON_EXPIRING, CloudAPI.POPUP).toString(),
+                equalTo("https://soundcloud.com/connect"+
+                        "?redirect_uri=redirect%3A%2F%2Fme&client_id=" + TEST_CLIENT_ID + "&response_type=code&scope=non-expiring"+
+                		"&display=popup")
+        );
+    }
+
+    @Test
+    public void shouldIncludeStateInAuthorizationUrl() throws Exception {
+        assertThat(
+            api.authorizationCodeUrl(Endpoints.CONNECT, Token.SCOPE_DEFAULT, CloudAPI.POPUP, "stateValue").toString(),
+                equalTo("https://soundcloud.com/connect"+
+                        "?redirect_uri=redirect%3A%2F%2Fme&client_id=" + TEST_CLIENT_ID + "&response_type=code&scope=*"+
+                		"&display=popup&state=stateValue")
+        );
+    }
+
     @Test
     public void shouldCallTokenStateListenerWhenTokenIsInvalidated() throws Exception {
         CloudAPI.TokenListener listener = mock(CloudAPI.TokenListener.class);