issue-1357: Add attribute allowpublic to uaa Client resource

damzog · damzog · commit 7939bf399298 · 2026-05-08T22:45:00.000+02:00
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java
@@ -133,6 +133,7 @@ void batchChangeSecret() {
                                                 .resourceId("none")
                                                 .scopes("clients.read", "clients.write")
                                                 .tokenSalt("uHICvG")
+                                                .allowPublic(true)
                                                 .build())
                                 .client(
                                         Client.builder()
@@ -155,6 +156,7 @@ void batchChangeSecret() {
                                                 .resourceId("none")
                                                 .scopes("clients.read", "clients.write")
                                                 .tokenSalt("WjlWvu")
+                                                .allowPublic(true)
                                                 .build())
                                 .build())
                 .expectComplete()
@@ -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)
@@ -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)
@@ -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")
@@ -494,6 +499,7 @@ void create() {
                                 .resourceId("none")
                                 .scopes("clients.read", "clients.write")
                                 .tokenSalt("hRZ21X")
+                                .allowPublic(true)
                                 .build())
                 .expectComplete()
                 .verify(Duration.ofSeconds(5));
@@ -819,6 +825,7 @@ void mixedActions() {
                                                 .refreshTokenValidity(7000L)
                                                 .scopes("clients.read", "clients.write")
                                                 .tokenSalt("UpzrHR")
+                                                .allowPublic(true)
                                                 .build())
                                 .build())
                 .as(StepVerifier::create)
@@ -852,6 +859,7 @@ void mixedActions() {
                                                 .resourceId("none")
                                                 .scopes("clients.read", "clients.write")
                                                 .tokenSalt("WjlWvu")
+                                                .allowPublic(true)
                                                 .build())
                                 .client(
                                         ActionClient.builder()
@@ -871,6 +879,7 @@ void mixedActions() {
                                                 .resourceId("none")
                                                 .scopes("clients.read", "clients.write")
                                                 .tokenSalt("UpzrHR")
+                                                .allowPublic(true)
                                                 .build())
                                 .build())
                 .expectComplete()
@@ -901,6 +910,7 @@ void update() {
                                 .autoApprove("clients.autoapprove")
                                 .clientId("55pTMX")
                                 .scopes("clients.new", "clients.autoapprove")
+                                .allowPublic(true)
                                 .build())
                 .as(StepVerifier::create)
                 .expectNext(
@@ -918,6 +928,7 @@ void update() {
                                 .resourceId("none")
                                 .scopes("clients.new", "clients.autoapprove")
                                 .tokenSalt("8mwCEy")
+                                .allowPublic(true)
                                 .build())
                 .expectComplete()
                 .verify(Duration.ofSeconds(5));
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_request.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_request.json
@@ -25,5 +25,6 @@
     "clients.read",
     "clients.write"
   ],
-  "token_salt": "hRZ21X"
+  "token_salt": "hRZ21X",
+  "allowpublic": true
 }
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_response.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_response.json
@@ -28,5 +28,6 @@
     "my-saml-provider"
   ],
   "name": "My Client Name",
+  "allowpublic": true,
   "lastModified": 1468364445109
 }
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_delete_response.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_delete_response.json
@@ -30,7 +30,8 @@
     ],
     "name": "My Client Name",
     "lastModified": 1468364444461,
-    "approvals_deleted": true
+    "approvals_deleted": true,
+    "allowpublic": true
   },
   {
     "scope": [
@@ -63,6 +64,7 @@
     ],
     "name": "My Client Name",
     "lastModified": 1468364444868,
-    "approvals_deleted": true
+    "approvals_deleted": true,
+    "allowpublic": true
   }
 ]
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_modify_request.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_modify_request.json
@@ -39,6 +39,7 @@
     "redirect_uri": [
       "http://test1.com",
       "http*://ant.path.wildcard/**/passback/*"
-    ]
+    ],
+    "allowpublic": true
   }
 ]
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_modify_response.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_modify_response.json
@@ -43,7 +43,8 @@
     ],
     "name": "My Client Name",
     "lastModified": 1474923482302,
-    "approvals_deleted": true
+    "approvals_deleted": true,
+    "allowpublic": true
   },
   {
     "scope": [
@@ -78,6 +79,7 @@
       "my-saml-provider"
     ],
     "name": "My Client Name",
+    "allowpublic": true,
     "lastModified": 1474923482727
   }
 ]
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_secret_response.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/POST_tx_secret_response.json
@@ -32,7 +32,8 @@
     ],
     "name": "My Client Name",
     "lastModified": 1474923482301,
-    "approvals_deleted": true
+    "approvals_deleted": true,
+    "allowpublic": true
   },
   {
     "scope": [
@@ -68,6 +69,7 @@
     ],
     "name": "My Client Name",
     "lastModified": 1474923482302,
-    "approvals_deleted": true
+    "approvals_deleted": true,
+    "allowpublic": true
   }
 ]
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/PUT_{id}_request.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/PUT_{id}_request.json
@@ -9,5 +9,6 @@
   ],
   "autoapprove": [
     "clients.autoapprove"
-  ]
+  ],
+  "allowpublic": true
 }
diff --git a/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/PUT_{id}_response.json b/cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/clients/PUT_{id}_response.json
@@ -28,5 +28,6 @@
     "my-saml-provider"
   ],
   "name": "My Client Name",
+  "allowpublic": true,
   "lastModified": 1468364443857
 }
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractClient.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractClient.java
@@ -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
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractCreateClient.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractCreateClient.java
@@ -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
      */
diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractUpdateClient.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/clients/AbstractUpdateClient.java
@@ -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
      */

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,6 @@`
`25`	`25`	`"clients.read",`
`26`	`26`	`"clients.write"`
`27`	`27`	`],`
`28`		`- "token_salt": "hRZ21X"`
	`28`	`+ "token_salt": "hRZ21X",`
	`29`	`+ "allowpublic": true`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@`
`28`	`28`	`"my-saml-provider"`
`29`	`29`	`],`
`30`	`30`	`"name": "My Client Name",`
	`31`	`+ "allowpublic": true,`
`31`	`32`	`"lastModified": 1468364445109`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@`
`30`	`30`	`],`
`31`	`31`	`"name": "My Client Name",`
`32`	`32`	`"lastModified": 1468364444461,`
`33`		`- "approvals_deleted": true`
	`33`	`+ "approvals_deleted": true,`
	`34`	`+ "allowpublic": true`
`34`	`35`	`},`
`35`	`36`	`{`
`36`	`37`	`"scope": [`
`@@ -63,6 +64,7 @@`
`63`	`64`	`],`
`64`	`65`	`"name": "My Client Name",`
`65`	`66`	`"lastModified": 1468364444868,`
`66`		`- "approvals_deleted": true`
	`67`	`+ "approvals_deleted": true,`
	`68`	`+ "allowpublic": true`
`67`	`69`	`}`
`68`	`70`	`]`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`"redirect_uri": [`
`40`	`40`	`"http://test1.com",`
`41`	`41`	`"http://ant.path.wildcard//passback/"`
`42`		`- ]`
	`42`	`+ ],`
	`43`	`+ "allowpublic": true`
`43`	`44`	`}`
`44`	`45`	`]`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@`
`43`	`43`	`],`
`44`	`44`	`"name": "My Client Name",`
`45`	`45`	`"lastModified": 1474923482302,`
`46`		`- "approvals_deleted": true`
	`46`	`+ "approvals_deleted": true,`
	`47`	`+ "allowpublic": true`
`47`	`48`	`},`
`48`	`49`	`{`
`49`	`50`	`"scope": [`
`@@ -78,6 +79,7 @@`
`78`	`79`	`"my-saml-provider"`
`79`	`80`	`],`
`80`	`81`	`"name": "My Client Name",`
	`82`	`+ "allowpublic": true,`
`81`	`83`	`"lastModified": 1474923482727`
`82`	`84`	`}`
`83`	`85`	`]`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@`
`32`	`32`	`],`
`33`	`33`	`"name": "My Client Name",`
`34`	`34`	`"lastModified": 1474923482301,`
`35`		`- "approvals_deleted": true`
	`35`	`+ "approvals_deleted": true,`
	`36`	`+ "allowpublic": true`
`36`	`37`	`},`
`37`	`38`	`{`
`38`	`39`	`"scope": [`
`@@ -68,6 +69,7 @@`
`68`	`69`	`],`
`69`	`70`	`"name": "My Client Name",`
`70`	`71`	`"lastModified": 1474923482302,`
`71`		`- "approvals_deleted": true`
	`72`	`+ "approvals_deleted": true,`
	`73`	`+ "allowpublic": true`
`72`	`74`	`}`
`73`	`75`	`]`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@`
`9`	`9`	`],`
`10`	`10`	`"autoapprove": [`
`11`	`11`	`"clients.autoapprove"`
`12`		`- ]`
	`12`	`+ ],`
	`13`	`+ "allowpublic": true`
`13`	`14`	`}`