Skip to content

issue-1357: Add attribute allowpublic to uaa Client resource #1358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
damzog wants to merge 1 commit into
base: main
Choose a base branch
from
Open

issue-1357: Add attribute allowpublic to uaa Client resource #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions ...client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ void batchChangeSecret() {
.resourceId("none")
.scopes("clients.read", "clients.write")
.tokenSalt("uHICvG")
.allowPublic(true)
.build())
.client(
Client.builder()
Expand All @@ -155,6 +156,7 @@ void batchChangeSecret() {
.resourceId("none")
.scopes("clients.read", "clients.write")
.tokenSalt("WjlWvu")
.allowPublic(true)
.build())
.build())
.expectComplete()
Expand Down Expand Up @@ -279,6 +281,7 @@ void batchDelete() {
.client(
Client.builder()
.approvalsDeleted(true)
.allowPublic(true)
.allowedProviders("uaa", "ldap", "my-saml-provider")
.authorities("clients.read", "clients.write")
.authorizedGrantType(CLIENT_CREDENTIALS)
Expand All @@ -296,6 +299,7 @@ void batchDelete() {
.client(
Client.builder()
.approvalsDeleted(true)
.allowPublic(true)
.allowedProviders("uaa", "ldap", "my-saml-provider")
.authorities("clients.read", "clients.write")
.authorizedGrantType(CLIENT_CREDENTIALS)
Expand Down Expand Up @@ -469,6 +473,7 @@ void create() {
.authorities("clients.read", "clients.write")
.authorizedGrantType(CLIENT_CREDENTIALS)
.autoApprove("true")
.allowPublic(true)
.clientId("aPq3I1")
.clientSecret("secret")
.name("My Client Name")
Expand All @@ -494,6 +499,7 @@ void create() {
.resourceId("none")
.scopes("clients.read", "clients.write")
.tokenSalt("hRZ21X")
.allowPublic(true)
.build())
.expectComplete()
.verify(Duration.ofSeconds(5));
Expand Down Expand Up @@ -819,6 +825,7 @@ void mixedActions() {
.refreshTokenValidity(7000L)
.scopes("clients.read", "clients.write")
.tokenSalt("UpzrHR")
.allowPublic(true)
.build())
.build())
.as(StepVerifier::create)
Expand Down Expand Up @@ -852,6 +859,7 @@ void mixedActions() {
.resourceId("none")
.scopes("clients.read", "clients.write")
.tokenSalt("WjlWvu")
.allowPublic(true)
.build())
.client(
ActionClient.builder()
Expand All @@ -871,6 +879,7 @@ void mixedActions() {
.resourceId("none")
.scopes("clients.read", "clients.write")
.tokenSalt("UpzrHR")
.allowPublic(true)
.build())
.build())
.expectComplete()
Expand Down Expand Up @@ -901,6 +910,7 @@ void update() {
.autoApprove("clients.autoapprove")
.clientId("55pTMX")
.scopes("clients.new", "clients.autoapprove")
.allowPublic(true)
.build())
.as(StepVerifier::create)
.expectNext(
Expand All @@ -918,6 +928,7 @@ void update() {
.resourceId("none")
.scopes("clients.new", "clients.autoapprove")
.tokenSalt("8mwCEy")
.allowPublic(true)
.build())
.expectComplete()
.verify(Duration.ofSeconds(5));
Expand Down
3 changes: 2 additions & 1 deletion cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"clients.read",
"clients.write"
],
"token_salt": "hRZ21X"
"token_salt": "hRZ21X",
"allowpublic": true
}
1 change: 1 addition & 0 deletions cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"my-saml-provider"
],
"name": "My Client Name",
"allowpublic": true,
"lastModified": 1468364445109
}
6 changes: 4 additions & 2 deletions ...undry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_delete_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
],
"name": "My Client Name",
"lastModified": 1468364444461,
"approvals_deleted": true
"approvals_deleted": true,
"allowpublic": true
},
{
"scope": [
Expand Down Expand Up @@ -63,6 +64,7 @@
],
"name": "My Client Name",
"lastModified": 1468364444868,
"approvals_deleted": true
"approvals_deleted": true,
"allowpublic": true
}
]
3 changes: 2 additions & 1 deletion ...oundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_modify_request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"redirect_uri": [
"http://test1.com",
"http*://ant.path.wildcard/**/passback/*"
]
],
"allowpublic": true
}
]
4 changes: 3 additions & 1 deletion ...undry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_modify_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
],
"name": "My Client Name",
"lastModified": 1474923482302,
"approvals_deleted": true
"approvals_deleted": true,
"allowpublic": true
},
{
"scope": [
Expand Down Expand Up @@ -78,6 +79,7 @@
"my-saml-provider"
],
"name": "My Client Name",
"allowpublic": true,
"lastModified": 1474923482727
}
]
6 changes: 4 additions & 2 deletions ...undry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_secret_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
],
"name": "My Client Name",
"lastModified": 1474923482301,
"approvals_deleted": true
"approvals_deleted": true,
"allowpublic": true
},
{
"scope": [
Expand Down Expand Up @@ -68,6 +69,7 @@
],
"name": "My Client Name",
"lastModified": 1474923482302,
"approvals_deleted": true
"approvals_deleted": true,
"allowpublic": true
}
]
3 changes: 2 additions & 1 deletion cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/PUT_{id}_request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
],
"autoapprove": [
"clients.autoapprove"
]
],
"allowpublic": true
}
1 change: 1 addition & 0 deletions cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/PUT_{id}_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"my-saml-provider"
],
"name": "My Client Name",
"allowpublic": true,
"lastModified": 1468364443857
}
7 changes: 7 additions & 0 deletions cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ abstract class AbstractClient {
@Nullable
abstract Boolean getApprovalsDeleted();

/**
* If true, allow to omit client_secret for authorization_code flow in combination with PKCE
*/
@JsonProperty("allowpublic")
@Nullable
abstract Boolean getAllowPublic();

/**
* Scopes that the client is able to grant when creating a client
*/
Expand Down
7 changes: 7 additions & 0 deletions cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractCreateClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ void checkAuthorizedGrantTypes() {
@Nullable
abstract Boolean getApprovalsDeleted();

/**
* If client allows authentication_code flow with PKCE w/o client_secret
*/
@JsonProperty("allowpublic")
@Nullable
abstract Boolean getAllowPublic();

/**
* Scopes that the client is able to grant when creating a client
*/
Expand Down
7 changes: 7 additions & 0 deletions cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractUpdateClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ void checkAuthorizedGrantType() {
@Nullable
abstract Boolean getApprovalsDeleted();

/**
* If client allows authentication_code flow with PKCE w/o client_secret
*/
@JsonProperty("allowpublic")
@Nullable
abstract Boolean getAllowPublic();

/**
* Scopes that the client is able to grant when creating a client
*/
Expand Down