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

Author: rbhojan

api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

api/src/main/java/com/stormpath/sdk/account/Account.java

@@ -39,6 +39,7 @@
 import com.stormpath.sdk.resource.*;
 import com.stormpath.sdk.tenant.Tenant;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -962,4 +963,11 @@ public interface Account extends Resource, Saveable, Deletable, Extendable, Audi
      * @since 1.1.0
      */
     AccountLinkList getAccountLinks(AccountLinkCriteria criteria);
+
+    /**
+     * Returns the date the last time this Account's password has been modified.
+     * @return the date the last time this Account's password has been modified.
+     * @since 1.2.0
+     */
+    Date getPasswordModifiedAt();
 }

api/src/main/java/com/stormpath/sdk/account/Accounts.java

@@ -282,7 +282,7 @@ public static DateExpressionFactory createdAt(){
      * For example, the following code is equivalent:
      * <pre>
      * AccountCriteria criteria = Accounts.criteria();
-     * DateExpressionFactory createdAt = Accounts.modifiedAt();
+     * DateExpressionFactory modifiedAt = Accounts.modifiedAt();
      * Criterion modifiedAtMatches = modifiedAt.matches("[,2014-04-05T12:00:00]");
      * criteria.add(modifiedAtMatches);
      * </pre>
@@ -295,6 +295,33 @@ public static DateExpressionFactory modifiedAt(){
         return newDateExpressionFactory("modifiedAt");
     }
 
+
+    /**
+     * Creates a new {@link DateExpressionFactory} instance reflecting the Account {@link Account#getPasswordModifiedAt() passwordModifiedAt}
+     * property, to be used to construct a modifiedAt Criterion when building an {@link AccountCriteria} query.  For example:
+     * <pre>
+     * Accounts.where(<b>Accounts.passwordModifiedAt()</b>.matches("[,2014-04-05T12:00:00]");
+     * </pre>
+     * The above example invokes the returned factory's <code>matches("[,2014-04-05T12:00:00]"))</code> method.  This
+     * produces a name-specific {@link Criterion} which is added to the criteria query (via the
+     * {@link #where(Criterion) where} method).
+     * <pre>
+     * For example, the following code is equivalent:
+     * <pre>
+     * AccountCriteria criteria = Accounts.criteria();
+     * DateExpressionFactory passwordModifiedAt = Accounts.passwordModifiedAt();
+     * Criterion modifiedAtMatches = passwordModifiedAt.matches("[,2014-04-05T12:00:00]");
+     * criteria.add(passwordModifiedAt);
+     * </pre>
+     *
+     * @return a new {@link Account#getModifiedAt() modifiedAt}-specific {@link DateExpressionFactory} instance, to be
+     *         used to construct a criterion when building an {@link AccountCriteria} query.
+     * @since 1.2.0
+     */
+    public static DateExpressionFactory passwordModifiedAt(){
+        return newDateExpressionFactory("passwordModifiedAt");
+    }
+
     /**
      * This operation will ask the backend to do a case-insensitive matching query on all viewable attributes in all the resources in the Collection.
      *

changelog.md

@@ -1,5 +1,21 @@
 ## Change Log ##
 
+### 1.2.0 ##
+
+This release has a number of feature additions and bug fixes. Of note:
+
+* Support for [Account Linking](https://docs.stormpath.com/java/product-guide/latest/accnt_mgmt.html#account-linking)
+* Support for [Application WebConfig](https://docs.stormpath.com/java/apidocs/com/stormpath/sdk/application/webconfig/package-summary.html) - critical to interacting with the soon-to-be released Stormpath Client API
+* Support for OAuth2 [revocation](https://tools.ietf.org/html/rfc7009) in the SDK as well as in all integrations exposed at the `/oauth/revoke` endpoont
+* Support for Cross Origin Resource Sharing ([CORS](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing)) entirely by configuration in all integrations using these properties:
+    * stormpath.web.cors.enabled
+    * stormpath.web.cors.allowed.originUris
+    * stormpath.web.cors.allowed.headers
+    * stormpath.web.cors.allowed.methods
+* Idiomatic support for the `passwordModifiedAt` field in the [Account](https://docs.stormpath.com/java/apidocs/com/stormpath/sdk/account/Account.html) interface in in search criteria on [Accounts](https://docs.stormpath.com/java/apidocs/com/stormpath/sdk/account/Accounts.html#passwordModifiedAt--)
+
+See [1.2.0 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.2.0+is%3Aclosed) for a complete list of changes.
+
 ### 1.1.5 ##
 
 This release fixes two bugs. The first is a fix for the LinkedIn Social login integration. Login with LinkedIn was failing under certain conditions. The second is a fix for enabling the confirmPassword form field.

clover/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

examples/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>stormpath-sdk-examples</artifactId>
     <groupId>com.stormpath.sdk</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <name>Stormpath Java SDK :: Examples</name>
     <packaging>pom</packaging>
 

examples/quickstart/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-examples</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>com.stormpath.sdk</groupId>
     <artifactId>stormpath-sdk-examples-quickstart</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
 
     <name>Stormpath Java SDK :: Examples :: Quickstart Code</name>
     <description>A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart</description>

examples/servlet/pom.xml

@@ -21,12 +21,12 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-examples</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>stormpath-sdk-examples-servlet</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <name>Stormpath Java SDK :: Examples :: Servlet Container-based Webapp</name>
     <description>A simple example webapp deployed in a servlet container.</description>
     <packaging>war</packaging>

examples/spring-boot-default/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-examples</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>com.stormpath.spring</groupId>
     <artifactId>stormpath-sdk-examples-spring-boot-default</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
 
     <name>Stormpath Java SDK :: Examples :: Spring Boot Default</name>
     <description>A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens!</description>

examples/spring-boot-webmvc-angular/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>com.stormpath.sdk</groupId>
         <artifactId>stormpath-sdk-examples</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>com.stormpath.spring</groupId>
     <artifactId>stormpath-sdk-examples-spring-boot-web-angular</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
 
     <name>Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp</name>
     <description>A Spring Boot web application that uses Stormpath.</description>