Merge branch 'master' into AM-3581-social-login-v2

Author: rbhojan

api/src/main/java/com/stormpath/sdk/provider/GoogleAccountRequestBuilder.java

@@ -22,12 +22,4 @@
  */
 public interface GoogleAccountRequestBuilder extends ProviderAccountRequestBuilder<GoogleAccountRequestBuilder> {
 
-    /**
-     * Setter for the Google authorization code (it looks similar to "4/2Dz0r7r9oNBE9dFD-_JUb.suCu7uj8TEnp6UAPm0").
-     *
-     * @param code the Google authorization code.
-     * @return the Google authorization code.
-     */
-    GoogleAccountRequestBuilder setCode(String code);
-
 }

api/src/main/java/com/stormpath/sdk/provider/GoogleProvider.java

@@ -22,4 +22,9 @@
  */
 public interface GoogleProvider extends RedirectableOAuthProvider {
 
+    String getHd();
+
+    GoogleProviderDisplay getDisplay();
+
+    GoogleProviderAccessType getAccessType();
 }

api/src/main/java/com/stormpath/sdk/provider/GoogleProviderAccessType.java

@@ -0,0 +1,12 @@
+package com.stormpath.sdk.provider;
+
+/**
+ * A GoogleProviderAccessType represents the different available options for access_type when initiating
+ * OAuth flow with Google.  See
+ * <a href="https://developers.google.com/identity/protocols/OAuth2WebServer#offline">Google's documentation</a> for details.
+ *
+ * @since 1.2.0
+ */
+public enum GoogleProviderAccessType {
+    OFFLINE, ONLINE
+}

api/src/main/java/com/stormpath/sdk/provider/GoogleProviderDisplay.java

@@ -0,0 +1,11 @@
+package com.stormpath.sdk.provider;
+
+/**
+ * A value specifying how the authorization server displays the authentication and consent user interface pages. These
+ * values are specified, and accepted by the Google servers, but do not have any effect on its behavior
+ *
+ * @since 1.2.0
+ */
+public enum GoogleProviderDisplay {
+    PAGE, POPUP, TOUCH, WAP
+}

api/src/main/java/com/stormpath/sdk/provider/LinkedInAccountRequestBuilder.java

@@ -23,7 +23,7 @@
 public interface LinkedInAccountRequestBuilder extends ProviderAccountRequestBuilder<LinkedInAccountRequestBuilder> {
 
     /**
-     * Setter for the LinkedIn authorization code (it looks similar to "4/2Dz0r7r9oNBE9dFD-_JUb.suCu7uj8TEnp6UAPm0").
+     * Setter for the LinkedIn authorization code.
      *
      * @param code the LinkedIn authorization code.
      * @return the LinkedIn authorization code.

api/src/main/java/com/stormpath/sdk/provider/OAuthProvider.java

@@ -15,6 +15,8 @@
  */
 package com.stormpath.sdk.provider;
 
+import java.util.List;
+
 /**
  * @since 1.0.0
  */
@@ -33,4 +35,11 @@ public interface OAuthProvider extends Provider {
      * @return the client secret used to authenticate requests to the 3rd party oauth provider.
      */
     String getClientSecret();
+
+    /**
+     * Returns the list of scopes configured for the oauth provider
+     * @return the list of scopes configured for the oauth provider
+     * @since 1.2.0
+     */
+    List<String> getScope();
 }

api/src/main/java/com/stormpath/sdk/provider/ProviderAccountRequest.java

@@ -21,7 +21,7 @@
  * NOTE: A Provider-specific {@link com.stormpath.sdk.directory.Directory} must previously exist in Stormpath and it must also
  * be an Enabled Account Store within the Application.
  *
- * @see {@link com.stormpath.sdk.directory.CreateDirectoryRequestBuilder}
+ * @see com.stormpath.sdk.directory.CreateDirectoryRequestBuilder
  * @since 1.0.beta
  */
 public interface ProviderAccountRequest {
@@ -32,4 +32,6 @@ public interface ProviderAccountRequest {
      * @return the {@link ProviderData} Resource containing the data required to access to the account.
      */
     ProviderData getProviderData();
+
+    String getRedirectUri();
 }

api/src/main/java/com/stormpath/sdk/provider/ProviderAccountRequestBuilder.java

@@ -19,19 +19,36 @@
  * A Builder to construct {@link ProviderAccountRequest}s.
  *
  * @param <T> the specific builder class (e.g {@link FacebookAccountRequestBuilder} or {@link GoogleAccountRequestBuilder}.
- *
  * @since 1.0.beta
  */
 public interface ProviderAccountRequestBuilder<T extends ProviderAccountRequestBuilder<T>> {
 
     /**
-     * Setter for the Provider App authorization code.
+     * Setter for the Provider App access token.
      *
-     * @param accessToken the Provider App authorization code.
+     * @param accessToken the Provider App access token.
      * @return the builder instance for method chaining.
      */
     T setAccessToken(String accessToken);
 
+    /**
+     * Setter for the Provider App authorization code.
+     *
+     * @param code the Provider App authorization code.
+     * @return the builder instance for method chaining.
+     * @since 1.2.0
+     */
+    T setCode(String code);
+
+    /**
+     * Setter for the uri to use when validating the authorization code.
+     *
+     * @param redirectUri the uri to use when validating the authorization code.
+     * @return the builder instance for method chaining.
+     * @since 1.2.0
+     */
+    T setRedirectUri(String redirectUri);
+
     /**
      * Creates a new {@code ProviderAccountRequest} instance based on the current builder state.
      *

ci/build.sh

@@ -4,7 +4,7 @@ source ./ci/common.sh
 
 if [ -n "$RUN_ITS" ]; then
   info "Running unit and IT tests..."
-  (mvn -Pclover.all -DskipITs=false -q install &> $WORKDIR/target/tests.log) &
+  (mvn -s ci/settings.xml -Pclover.all -DskipITs=false -q install &> $WORKDIR/target/tests.log) &
   PID=$!
   show_spinner "$PID"
 
@@ -20,7 +20,7 @@ fi
 
 if [ -z "$RUN_ITS" ]; then
   info "Running unit tests..."
-  (mvn -q install &> $WORKDIR/target/tests.log) &
+  (mvn -s ci/settings.xml -q install &> $WORKDIR/target/tests.log) &
   PID=$!
   show_spinner "$PID"
 

ci/build_docs.sh

@@ -22,7 +22,7 @@ if [ "$EXIT_CODE" -ne 0 ]; then
 fi
 
 info "Generating JavaDocs..."
-(mvn -q javadoc:aggregate -P travis-docs &> $WORKDIR/target/javadocs.log) &
+(mvn -s ci/settings.xml -q javadoc:aggregate -P travis-docs &> $WORKDIR/target/javadocs.log) &
 PID=$!
 
 show_spinner "$PID"