Java jersey OAuth2 add support for public client #13827 (#13828)

OpenAPITools · Oct 31, 2022 · fe5601a · fe5601a
1 parent a04b262
commit fe5601a
Show file tree

Hide file tree

Showing 12 changed files with 174 additions and 0 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -524,6 +524,22 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     throw new RuntimeException("No OAuth2 authentication configured!");
   }
 
+  /**
+   * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+   *
+   * @param clientId the client ID
+   * @return a {@link org.openapitools.client.ApiClient} object.
+   */
+  public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
   /**
    * Helper method to set the password flow for the first OAuth2 authentication.
    *

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache
@@ -158,6 +158,19 @@ public class OAuth implements Authentication {
         return this;
     }
 
+    public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe().debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe()
+                .build(authApi);
+        }
+        return this;
+    }
+
     public OAuth usePasswordFlow(String username, String password) {
         this.flow = OAuthFlow.PASSWORD;
         this.username = username;

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache
@@ -524,6 +524,22 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     throw new RuntimeException("No OAuth2 authentication configured!");
   }
 
+  /**
+   * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+   *
+   * @param clientId the client ID
+   * @return a {@link org.openapitools.client.ApiClient} object.
+   */
+  public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
   /**
    * Helper method to set the password flow for the first OAuth2 authentication.
    *

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache
@@ -158,6 +158,19 @@ public class OAuth implements Authentication {
         return this;
     }
 
+    public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe().debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe()
+                .build(authApi);
+        }
+        return this;
+    }
+
     public OAuth usePasswordFlow(String username, String password) {
         this.flow = OAuthFlow.PASSWORD;
         this.username = username;

diff --git a/...ore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java b/...ore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
@@ -446,6 +446,22 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     throw new RuntimeException("No OAuth2 authentication configured!");
   }
 
+  /**
+   * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+   *
+   * @param clientId the client ID
+   * @return a {@link org.openapitools.client.ApiClient} object.
+   */
+  public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
   /**
    * Helper method to set the password flow for the first OAuth2 authentication.
    *

diff --git a/...re/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/auth/OAuth.java b/...re/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -169,6 +169,19 @@ public OAuth setCredentials(String clientId, String clientSecret, Boolean debug)
         return this;
     }
 
+    public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe().debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe()
+                .build(authApi);
+        }
+        return this;
+    }
+
     public OAuth usePasswordFlow(String username, String password) {
         this.flow = OAuthFlow.PASSWORD;
         this.username = username;

diff --git a/...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -446,6 +446,22 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     throw new RuntimeException("No OAuth2 authentication configured!");
   }
 
+  /**
+   * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+   *
+   * @param clientId the client ID
+   * @return a {@link org.openapitools.client.ApiClient} object.
+   */
+  public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
   /**
    * Helper method to set the password flow for the first OAuth2 authentication.
    *

diff --git a/.../client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java b/.../client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -169,6 +169,19 @@ public OAuth setCredentials(String clientId, String clientSecret, Boolean debug)
         return this;
     }
 
+    public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe().debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe()
+                .build(authApi);
+        }
+        return this;
+    }
+
     public OAuth usePasswordFlow(String username, String password) {
         this.flow = OAuthFlow.PASSWORD;
         this.username = username;

diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java
@@ -530,6 +530,22 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     throw new RuntimeException("No OAuth2 authentication configured!");
   }
 
+  /**
+   * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+   *
+   * @param clientId the client ID
+   * @return a {@link org.openapitools.client.ApiClient} object.
+   */
+  public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
   /**
    * Helper method to set the password flow for the first OAuth2 authentication.
    *

diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -169,6 +169,19 @@ public OAuth setCredentials(String clientId, String clientSecret, Boolean debug)
         return this;
     }
 
+    public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe().debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe()
+                .build(authApi);
+        }
+        return this;
+    }
+
     public OAuth usePasswordFlow(String username, String password) {
         this.flow = OAuthFlow.PASSWORD;
         this.username = username;

diff --git a/...3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/...3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -530,6 +530,22 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     throw new RuntimeException("No OAuth2 authentication configured!");
   }
 
+  /**
+   * Helper method to set the credentials of a public client for the first OAuth2 authentication.
+   *
+   * @param clientId the client ID
+   * @return a {@link org.openapitools.client.ApiClient} object.
+   */
+  public ApiClient setOauthCredentialsForPublicClient(String clientId) {
+    for (Authentication auth : authentications.values()) {
+      if (auth instanceof OAuth) {
+        ((OAuth) auth).setCredentialsForPublicClient(clientId, isDebugging());
+        return this;
+      }
+    }
+    throw new RuntimeException("No OAuth2 authentication configured!");
+  }
+
   /**
    * Helper method to set the password flow for the first OAuth2 authentication.
    *

diff --git a/.../client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java b/.../client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
@@ -169,6 +169,19 @@ public OAuth setCredentials(String clientId, String clientSecret, Boolean debug)
         return this;
     }
 
+    public OAuth setCredentialsForPublicClient(String clientId, Boolean debug) {
+        if (Boolean.TRUE.equals(debug)) {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe().debug()
+                .build(authApi);
+        } else {
+            service = new ServiceBuilder(clientId)
+                .apiSecretIsEmptyStringUnsafe()
+                .build(authApi);
+        }
+        return this;
+    }
+
     public OAuth usePasswordFlow(String username, String password) {
         this.flow = OAuthFlow.PASSWORD;
         this.username = username;