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

Master without client api #1317

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9405c76
1297 - Improved MCF implementation when registration workflow is spec…
Feb 8, 2017
e585361
Merge pull request #1299 from stormpath/1297_MCF_second_time
Feb 8, 2017
e48549c
1297 - Improved IT
Feb 8, 2017
f57bae9
Changed poms to 1.5.4-SNAPSHOT
Feb 8, 2017
142d22b
[maven-release-plugin] prepare release stormpath-sdk-root-1.5.4
Feb 8, 2017
dfa03c4
[maven-release-plugin] prepare for next development iteration
Feb 8, 2017
af5850e
Added 1.5.4 to changelog
Feb 9, 2017
452971a
Remove cookies from /oauth/revoke
mraible Mar 7, 2017
3c7bbb5
Put back fully qualified imports
dogeared Mar 14, 2017
1afd2a8
temp echo to troubleshoot build issues
dogeared Mar 14, 2017
1eb7729
temp echo to troubleshoot build issues
dogeared Mar 14, 2017
28b3162
updated changelog
dogeared Mar 14, 2017
26b12d9
Merge pull request #1316 from stormpath/issue/1304_new
dogeared Mar 14, 2017
7ea3eab
[maven-release-plugin] prepare release stormpath-sdk-root-1.5.5
dogeared Mar 14, 2017
42b87e1
[maven-release-plugin] prepare for next development iteration
dogeared Mar 14, 2017
448c34a
Revert "temporarily disabled failing tests"
bdemers Mar 17, 2017
63ff06b
Revert "Openid-connect-new-OAuthPolicy-fields review comments"
bdemers Mar 17, 2017
253e068
Revert "penid-connect-new-OAuthPolicy-fields Review Comments"
bdemers Mar 17, 2017
c51a472
Revert "penid-connect-new-OAuthPolicy-fields Fixing Test"
bdemers Mar 17, 2017
6a61ff1
Revert "penid-connect-new-OAuthPolicy-fields"
bdemers Mar 17, 2017
3ee7744
merged 1.5.x
bdemers Mar 17, 2017
f0e275b
reverting tck.sh change that removed STORMPATH_APPLICATION_HREF
bdemers Mar 17, 2017
5cba8b5
Revert "temp echo to troubleshoot build issues"
bdemers Mar 30, 2017
0eab775
Revert "temp echo to troubleshoot build issues"
bdemers Mar 30, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Openid-connect-new-OAuthPolicy-fields review comments"
This reverts commit 67ad654.
  • Loading branch information
bdemers committed Mar 17, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 63ff06b3e326b41690e9c13c00f91e9a69db59aa
16 changes: 8 additions & 8 deletions api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java
Original file line number Diff line number Diff line change
@@ -114,8 +114,8 @@ public interface OAuthPolicy extends Resource, Saveable {

/**
* Returns access token attribute mappings.
* <p>Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the access token upon its generation.</p>
* Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the access token upon its generation.
*
* @return access token attribute mappings.
*
@@ -127,8 +127,8 @@ public interface OAuthPolicy extends Resource, Saveable {
* Sets access token attribute mappings to be inserted into access tokens.
*
* @param accessTokenAttributeMap access token attribute mappings to be inserted into access tokens
* <p>Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the access token upon its generation.</p>
* Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the access token upon its generation.
* @return this instance for method chaining.
*
* @since 1.6.0
@@ -137,8 +137,8 @@ public interface OAuthPolicy extends Resource, Saveable {

/**
* Returns id token attribute mappings.
* <p>Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the id token upon its generation.</p>
* Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the id token upon its generation.
*
* @return id token attribute mappings.
*
@@ -150,8 +150,8 @@ public interface OAuthPolicy extends Resource, Saveable {
* Sets id token attribute mappings to be inserted into id tokens.
*
* @param idTokenAttributeMap id token attribute mappings to be inserted into id tokens
* <p>Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the id token upon its generation.</p>
* Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map.
* Authorization server would then add all these mappings as part of the id token upon its generation.
* @return this instance for method chaining.
*
* @since 1.6.0
24 changes: 0 additions & 24 deletions api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java
Original file line number Diff line number Diff line change
@@ -22,33 +22,9 @@
*/
public interface OAuthPolicyOptions<T> extends Options {

/**
* Ensures that when retrieving an OAuthPolicy, the OAuthPolicy's assigned {@link OAuthPolicy#getScopes()} scopes}
* are also retrieved in the same request. This enhances performance by leveraging a single request
* to retrieve multiple related resources you know you will use.
*
* @return this instance for method chaining.
*/
T withScopes();

/**
* Ensures that when retrieving an OAuthPolicy, the OAuthPolicy's assigned {@link OAuthPolicy#getScopes()} scopes}
* are also retrieved in the same request. This enhances performance by leveraging a single request
* to retrieve multiple related resources you know you will use.
*
* @param limit defines the maximum quantity of items to be retrieved when expanding this Collection Resource. Min:1, Max: 100. The default value is 25.
* @return this instance for method chaining.
*/
T withScopes(int limit);

/**
* Ensures that when retrieving an OAuthPolicy, the OAuthPolicy's assigned {@link OAuthPolicy#getScopes()} scopes}
* are also retrieved in the same request. This enhances performance by leveraging a single request
* to retrieve multiple related resources you know you will use.
*
* @param limit defines the maximum quantity of items to be retrieved when expanding this Collection Resource. Min:1, Max: 100. The default value is 25.
* @param offset the zero-based starting index in the entire collection of the first item to return. Default is 0
* @return this instance for method chaining.
*/
T withScopes(int limit, int offset);
}