#18252 - [REQ] add sessionToken support to AWS4Auth (#18253)

OpenAPITools · Apr 11, 2024 · 97c1dc8 · 97c1dc8
1 parent 44ae981
commit 97c1dc8
Show file tree

Hide file tree

Showing 15 changed files with 197 additions and 0 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -652,6 +652,29 @@ public class ApiClient {
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        {{#withAWSV4Signature}}
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof AWS4Auth) {
+                ((AWS4Auth) auth).setCredentials(accessKey, secretKey, sessionToken);
+                ((AWS4Auth) auth).setRegion(region);
+                ((AWS4Auth) auth).setService(service);
+                return;
+            }
+        }
+        {{/withAWSV4Signature}}
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...es/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/AWS4Auth.mustache b/...es/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/auth/AWS4Auth.mustache
@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
@@ -41,6 +42,10 @@ public class AWS4Auth implements Authentication {
     this.credentials = AwsBasicCredentials.create(accessKey, secretKey);
   }
 
+  public void setCredentials(String accessKey, String secretKey, String sessionToken) {
+    this.credentials = AwsSessionCredentials.create(accessKey, secretKey, sessionToken);
+  }
+
   public void setRegion(String region) {
     this.region = region;
   }

diff --git a/...les/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java b/...les/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
@@ -491,6 +491,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/ApiClient.java b/...client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/ApiClient.java
@@ -465,6 +465,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...nt/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiClient.java b/...nt/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/ApiClient.java
@@ -465,6 +465,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/ApiClient.java b/...client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/ApiClient.java
@@ -547,6 +547,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...tore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/ApiClient.java b/...tore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/ApiClient.java
@@ -559,6 +559,27 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        for (Authentication auth : authentications.values()) {
+            if (auth instanceof AWS4Auth) {
+                ((AWS4Auth) auth).setCredentials(accessKey, secretKey, sessionToken);
+                ((AWS4Auth) auth).setRegion(region);
+                ((AWS4Auth) auth).setService(service);
+                return;
+            }
+        }
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/.../java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/auth/AWS4Auth.java b/.../java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/auth/AWS4Auth.java
@@ -27,6 +27,7 @@
 
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
@@ -52,6 +53,10 @@ public void setCredentials(String accessKey, String secretKey) {
     this.credentials = AwsBasicCredentials.create(accessKey, secretKey);
   }
 
+  public void setCredentials(String accessKey, String secretKey, String sessionToken) {
+    this.credentials = AwsSessionCredentials.create(accessKey, secretKey, sessionToken);
+  }
+
   public void setRegion(String region) {
     this.region = region;
   }

diff --git a/...e/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiClient.java b/...e/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/ApiClient.java
@@ -564,6 +564,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...ore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/ApiClient.java b/...ore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/ApiClient.java
@@ -547,6 +547,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...e/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/ApiClient.java b/...e/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/ApiClient.java
@@ -550,6 +550,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java b/...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
@@ -553,6 +553,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...t/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/...t/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/ApiClient.java
@@ -547,6 +547,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...t/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/...t/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/ApiClient.java
@@ -547,6 +547,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *

diff --git a/...les/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java b/...les/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
@@ -621,6 +621,19 @@ public void setAWS4Configuration(String accessKey, String secretKey, String regi
         throw new RuntimeException("No AWS4 authentication configured!");
     }
 
+    /**
+     * Helper method to set credentials for AWSV4 Signature
+     *
+     * @param accessKey Access Key
+     * @param secretKey Secret Key
+     * @param sessionToken Session Token
+     * @param region Region
+     * @param service Service to access to
+     */
+    public void setAWS4Configuration(String accessKey, String secretKey, String sessionToken, String region, String service) {
+        throw new RuntimeException("No AWS4 authentication configured!");
+    }
+
     /**
      * Set the User-Agent header's value (by adding to the default header map).
      *