Skip to content
This repository was archived by the owner on Dec 12, 2018. It is now read-only.

Commit ad58f11

Browse files
committed
Merge branch 'master' into 1.3.x
2 parents a871c61 + 47ea613 commit ad58f11

File tree

60 files changed

+530
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+530
-222
lines changed

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-root</artifactId>
24-
<version>1.2.3-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

changelog.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
## Change Log ##
22

3+
### 1.2.3 ##
4+
5+
This release fixes a bug whereby new passwords that violate the password policy were showing the wrong error on the forgot password flow.
6+
7+
See [1.2.3 closed bugs](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.2.3+is%3Aclosed)
8+
39
### 1.2.2 ##
410

511
This release fixes two bugs. Both are fixes to avoid RuntimeException when resolving external provider of an application.
612

713
See [1.2.2 closed bugs](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.2.2+is%3Aclosed)
814

9-
1015
### 1.2.1 ##
1116

1217
This release fixes four bugs. We are adding one more supported grant_type to the AccessTokenController, also enhancing the signature validation of access/refresh tokens and improving error handing when required fields are missing in the token endpoint.

clover/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-root</artifactId>
24-
<version>1.2.3-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

docs/source/tutorial.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@
432432
For more on ``HttpSecurity`` with Spring Security, see `its HttpSecurity documentation <http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#jc-httpsecurity>`_.
433433
434434
We've added a new method to our ``HelloController``. It does not call out any other authorizaton requirements. As such,
435-
anyone logged in will be able to access ``/me``. Furthermore, anyone NOT logged in trying to access ``/me`` will automatically
435+
anyone logged in will be able to access ``/userdetails``. Furthermore, anyone NOT logged in trying to access ``/userdetails`` will automatically
436436
be redirected to the ``/login`` view.
437437
438438
.. code-block:: java
@@ -442,15 +442,15 @@
442442
public class HelloController {
443443
444444
...
445-
@RequestMapping("/me")
446-
String me() {
447-
return "me";
445+
@RequestMapping("/userdetails")
446+
String userDetails() {
447+
return "userdetails";
448448
}
449449
...
450450
}
451451
452-
Try it out. Launch the application as before, and then browse to: ``http://localhost:${port}/me``. You will be redirected to the ``/login``
453-
and then after you login to a valid Stormpath Account, you will automatically be brought back to ``/me``. That's the Stormpath magic at work!
452+
Try it out. Launch the application as before, and then browse to: ``http://localhost:${port}/userdetails``. You will be redirected to the ``/login``
453+
and then after you login to a valid Stormpath Account, you will automatically be brought back to ``/userdetails``. That's the Stormpath magic at work!
454454
455455
Now, we'll look at fine grained controls using Spring Security permissions connected to Stormpath custom data.
456456
@@ -534,13 +534,13 @@
534534
535535
This part of the tutorial exercises the Token Magement features using Spring Security Spring Boot WebMVC.
536536
537-
There's a simple `@RestController` called `MeController` that returns information about the authenticated account.
537+
There's a simple `@RestController` called `UserDetailsController` that returns information about the authenticated account.
538538
539539
.. code-block:: java
540540
541541
@RestController
542-
public class MeController {
543-
@RequestMapping(value="/me", produces = MediaType.APPLICATION_JSON_VALUE)
542+
public class UserDetailsController {
543+
@RequestMapping(value="/userdetails", produces = MediaType.APPLICATION_JSON_VALUE)
544544
public AccountInfo info(HttpServletRequest req) {
545545
// must be logged in to get here per Spring Security config
546546
Account account = AccountResolver.INSTANCE.getAccount(req);
@@ -549,7 +549,7 @@
549549
}
550550
}
551551
552-
In order to hit the `/me` endpoint, we'll first, we'll get an `access_token` and a `refresh_token` by hitting the
552+
In order to hit the `/userdetails` endpoint, we'll first, we'll get an `access_token` and a `refresh_token` by hitting the
553553
`/oauth/token` endpoint:
554554
555555
.. code-block:: bash
@@ -577,14 +577,14 @@
577577
578578
The response includes the tokens as well as information on their type (`Bearer` in this case) and when it expires.
579579
580-
We can now use the `access_token` to hit the `/me` endpoint:
580+
We can now use the `access_token` to hit the `/userdetails` endpoint:
581581
582582
583583
.. code-block:: bash
584584
585585
curl \
586586
-H "Authorization: Bearer eyJraWQiOiJSOTJTQkhKQzFVNERBSU1HUTNNSE9HVk1YIiwiYWxnIjoiSFMyNTYifQ.eyJqdGkiOiI2M1laa1FBNjRTdEdUQjFhVEhlNGdPIiwiaWF0IjoxNDU0NDM4MTQ3LCJpc3MiOiJodHRwczovL2FwaS5zdG9ybXBhdGguY29tL3YxL2FwcGxpY2F0aW9ucy82dkZUNEFSZldDbXVIVlY4Vmt0alRvIiwic3ViIjoiaHR0cHM6Ly9hcGkuc3Rvcm1wYXRoLmNvbS92MS9hY2NvdW50cy80V1NjTWJBbm8zVjk1aWlTc3dralBYIiwiZXhwIjoxNDU0NDQxNzQ3LCJydGkiOiI2M1laa01xMTlzYUhxTHZqSDFtbzRLIn0.-3NNpi7-DTvl2VNCfHHFNwWVikmeCyNPy6KEu--XYjk" \
587-
http://localhost:${port}/me
587+
http://localhost:${port}/userdetails
588588
589589
You will get a response like this:
590590
@@ -644,7 +644,7 @@
644644
645645
curl \
646646
-H "Authorization: Bearer eyJraWQiOiJSOTJTQkhKQzFVNERBSU1HUTNNSE9HVk1YIiwiYWxnIjoiSFMyNTYifQ.eyJqdGkiOiI1eDlxbWlES2U0RmlFMU02alhLSDBMIiwiaWF0IjoxNDU0NDQ0MTU1LCJpc3MiOiJodHRwczovL2FwaS5zdG9ybXBhdGguY29tL3YxL2FwcGxpY2F0aW9ucy82dkZUNEFSZldDbXVIVlY4Vmt0alRvIiwic3ViIjoiaHR0cHM6Ly9hcGkuc3Rvcm1wYXRoLmNvbS92MS9hY2NvdW50cy80V1NjTWJBbm8zVjk1aWlTc3dralBYIiwiZXhwIjoxNDU0NDQ3NzU1LCJydGkiOiI2M1laa01xMTlzYUhxTHZqSDFtbzRLIn0.J2NR7MV3OoolYImfUNiu8SCDvaQdresHTnPHgL7mO1Q" \
647-
http://localhost:${port}/me
647+
http://localhost:${port}/userdetails
648648
649649
Here's the response:
650650

examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-root</artifactId>
24-
<version>1.2.3-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<artifactId>stormpath-sdk-examples</artifactId>
2929
<groupId>com.stormpath.sdk</groupId>
30-
<version>1.2.3-SNAPSHOT</version>
30+
<version>1.3.0-SNAPSHOT</version>
3131
<name>Stormpath Java SDK :: Examples</name>
3232
<packaging>pom</packaging>
3333

examples/quickstart/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>com.stormpath.sdk</groupId>
77
<artifactId>stormpath-sdk-examples</artifactId>
8-
<version>1.2.3-SNAPSHOT</version>
8+
<version>1.3.0-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.stormpath.sdk</groupId>
1313
<artifactId>stormpath-sdk-examples-quickstart</artifactId>
14-
<version>1.2.3-SNAPSHOT</version>
14+
<version>1.3.0-SNAPSHOT</version>
1515

1616
<name>Stormpath Java SDK :: Examples :: Quickstart Code</name>
1717
<description>A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart</description>

examples/servlet/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-examples</artifactId>
24-
<version>1.2.3-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<artifactId>stormpath-sdk-examples-servlet</artifactId>
29-
<version>1.2.3-SNAPSHOT</version>
29+
<version>1.3.0-SNAPSHOT</version>
3030
<name>Stormpath Java SDK :: Examples :: Servlet Container-based Webapp</name>
3131
<description>A simple example webapp deployed in a servlet container.</description>
3232
<packaging>war</packaging>
@@ -116,10 +116,10 @@
116116
<configuration>
117117
<skip>${skipITs}</skip>
118118
<container>
119-
<containerId>tomcat7x</containerId>
119+
<containerId>tomcat8x</containerId>
120120
<zipUrlInstaller>
121121
<url>
122-
http://repo1.maven.org/maven2/org/apache/tomcat/tomcat/7.0.69/tomcat-7.0.69.zip
122+
http://repo1.maven.org/maven2/org/apache/tomcat/tomcat/8.5.9/tomcat-8.5.9.zip
123123
</url>
124124
</zipUrlInstaller>
125125
</container>

examples/spring-boot-default/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-examples</artifactId>
24-
<version>1.2.3-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<groupId>com.stormpath.spring</groupId>
2929
<artifactId>stormpath-sdk-examples-spring-boot-default</artifactId>
30-
<version>1.2.3-SNAPSHOT</version>
30+
<version>1.3.0-SNAPSHOT</version>
3131

3232
<name>Stormpath Java SDK :: Examples :: Spring Boot Default</name>
3333
<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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-examples</artifactId>
24-
<version>1.2.3-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<groupId>com.stormpath.spring</groupId>
2929
<artifactId>stormpath-sdk-examples-spring-boot-web-angular</artifactId>
30-
<version>1.2.3-SNAPSHOT</version>
30+
<version>1.3.0-SNAPSHOT</version>
3131

3232
<name>Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp</name>
3333
<description>A Spring Boot web application that uses Stormpath.</description>

examples/spring-boot-webmvc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-examples</artifactId>
24-
<version>1.2.3-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<groupId>com.stormpath.spring</groupId>
2929
<artifactId>stormpath-sdk-examples-spring-boot-web</artifactId>
30-
<version>1.2.3-SNAPSHOT</version>
30+
<version>1.3.0-SNAPSHOT</version>
3131

3232
<name>Stormpath Java SDK :: Examples :: Spring Boot Webapp</name>
3333
<description>A Spring Boot web application that uses Stormpath.</description>

0 commit comments

Comments
 (0)