Updating org.apache.oltu.oauth2.client (OpenAPITools#13411)

Updating the OAuth2 client (although obsolete, it's still productive in openapi-generator) due to security problems related to the underlying libraries * sonatype-2022-3061 * sonatype-2012-0050 Update pom.mustache
jblakeney · Oct 19, 2022 · 514dbca · 514dbca
1 parent a3fbb82
commit 514dbca
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 5 deletions.
diff --git a/...i-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache b/...i-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
@@ -56,6 +56,7 @@ public class OAuthOkHttpClient implements HttpClient {
                     response.body().string(),
                     response.body().contentType().toString(),
                     response.code(),
+                    response.headers().toMultimap(),
                     responseClass);
         } catch (IOException e) {
             throw new OAuthSystemException(e);

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -299,7 +299,7 @@
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         {{/hasOAuthMethods}}
         <dependency>

diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml
@@ -291,7 +291,7 @@
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/...-gson-dynamicOperations/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java b/...-gson-dynamicOperations/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
@@ -55,6 +55,7 @@ public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map
                     response.body().string(),
                     response.body().contentType().toString(),
                     response.code(),
+                    response.headers().toMultimap(),
                     responseClass);
         } catch (IOException e) {
             throw new OAuthSystemException(e);

diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml b/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml
@@ -291,7 +291,7 @@
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/...tp-gson-group-parameter/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java b/...tp-gson-group-parameter/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
@@ -55,6 +55,7 @@ public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map
                     response.body().string(),
                     response.body().contentType().toString(),
                     response.code(),
+                    response.headers().toMultimap(),
                     responseClass);
         } catch (IOException e) {
             throw new OAuthSystemException(e);

diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
@@ -291,7 +291,7 @@
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/...tp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java b/...tp-gson-parcelableModel/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
@@ -55,6 +55,7 @@ public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map
                     response.body().string(),
                     response.body().contentType().toString(),
                     response.code(),
+                    response.headers().toMultimap(),
                     responseClass);
         } catch (IOException e) {
             throw new OAuthSystemException(e);

diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -291,7 +291,7 @@
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/...tstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java b/...tstore/java/okhttp-gson/src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
@@ -55,6 +55,7 @@ public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map
                     response.body().string(),
                     response.body().contentType().toString(),
                     response.code(),
+                    response.headers().toMultimap(),
                     responseClass);
         } catch (IOException e) {
             throw new OAuthSystemException(e);