SDK regenerated by CI server [ci skip]

Author: dynabic-billing-team

src/main/java/com/aspose/words/cloud/ApiClient.java

@@ -30,8 +30,6 @@
 import com.aspose.words.cloud.model.requests.*;
 import com.squareup.okhttp.*;
 import com.squareup.okhttp.internal.http.HttpMethod;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
 import okio.BufferedSink;
 import okio.Okio;
 import org.threeten.bp.LocalDate;
@@ -40,23 +38,15 @@
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import javax.mail.BodyPart;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMultipart;
 import javax.mail.util.ByteArrayDataSource;
 import java.io.*;
 import java.lang.reflect.Type;
-import java.math.BigInteger;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.RSAPublicKeySpec;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
@@ -84,7 +74,8 @@ public class ApiClient {
     private String refreshToken;
     private String ClientSecret;
     private String clientId;
-    private Cipher key;
+    private Cipher encryptor;
+    private EncryptorFactory encryptorProvider;
 
     public ApiClient(String clientId, String clientSecret, String baseUrl) {
         this();
@@ -111,22 +102,23 @@ public ApiClient() {
         setReadTimeout(180);
     }
 
-
     /**
-     * Gets a public key
-     * @return public key
+     * Gets an encryptor provider
+     * 
+     * @return encryptor provider
      */
-    public Cipher getKey() {
-        return key;
+    public EncryptorFactory getEncryptorProvider() {
+        return encryptorProvider;
     }
 
     /**
-     * Sets a public key
-     * @param key
+     * Sets an encryptor provider
+     * 
+     * @param encryptorProvider
      * @return api client
      */
-    public ApiClient setKey(Cipher key) {
-        this.key = key;
+    public ApiClient setEncryptorProvider(EncryptorFactory encryptorProvider) {
+        this.encryptorProvider = encryptorProvider;
         return this;
     }
 
@@ -1046,30 +1038,12 @@ public void requestToken() throws ApiException {
         }
     }
 
-    public void setRsaKey(String modulus, String exponent) throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, InvalidKeyException {
-        byte[] modulusByte = Base64.getDecoder().decode(modulus);
-        BigInteger modulusInt = new BigInteger(1, modulusByte);
-        byte[] exponentByte = Base64.getDecoder().decode(exponent);
-        BigInteger exponentInt = new BigInteger(1, exponentByte);
-        RSAPublicKeySpec spec = new RSAPublicKeySpec(modulusInt, exponentInt);
-        KeyFactory factory = KeyFactory.getInstance("RSA");
-        PublicKey key = factory.generatePublic(spec);
-        this.key = Cipher.getInstance("RSA");
-        this.key.init(Cipher.ENCRYPT_MODE, key);
-    }
-
     /**
     * AddParameterToQuery
     */
-    public void addParameterToQuery(List<Pair> queryParams, String paramName, Object paramValue) {
+    public void addParameterToQuery(List<Pair> queryParams, String paramName, Object paramValue) throws ApiException, IOException {
         if (paramName.equals("password") && paramValue != null && !paramValue.toString().isEmpty()) {
-            try {
-                queryParams.addAll(parameterToPair("encryptedPassword", Base64.getEncoder().encode(this.key.doFinal(paramValue.toString().getBytes(StandardCharsets.UTF_8)))));
-            }
-            catch (IllegalBlockSizeException e) {
-            }
-            catch (BadPaddingException e) {
-            }
+            queryParams.addAll(parameterToPair("encryptedPassword", encrypt((String) paramValue)));
         }
         else {
             queryParams.addAll(parameterToPair(paramName, paramValue));
@@ -1256,6 +1230,31 @@ public Object parseBatchPart(RequestIfc apiRequest, Request sysRequest, BodyPart
         }
     }
 
+    /**
+     * Encrypt string to base64-encoded string
+     */
+    public String encrypt(String data) throws ApiException, IOException {
+        if (data != null && !data.isEmpty()) {
+            return null;
+        }
+
+        if (this.encryptor == null) {
+            if (this.encryptorProvider == null) {
+                throw new ApiException("Encryption error: EncryptorProvider isn't set.");
+            }
+
+            this.encryptor = this.encryptorProvider.create();
+        }
+
+        try {
+            return Base64.getEncoder()
+                    .encodeToString(this.encryptor.doFinal(data.toString().getBytes(StandardCharsets.UTF_8)));
+        } 
+        catch (IllegalBlockSizeException | BadPaddingException e) {
+            throw new ApiException(e);
+        }
+    }
+
     /**
      * Find part in multipart by name
      */

src/main/java/com/aspose/words/cloud/EncryptorFactory.java

@@ -0,0 +1,42 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="EncryptorFactory.java">
+ *   Copyright (c) 2022 Aspose.Words for Cloud
+ * </copyright>
+ * <summary>
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ * </summary>
+ * --------------------------------------------------------------------------------
+ */
+
+package com.aspose.words.cloud;
+import java.io.IOException;
+import javax.crypto.Cipher;
+
+/**
+ * Data encryptor provider.
+ */
+public interface EncryptorFactory {
+    /**
+     * Create an encryptor.
+     *
+     * @return encryptor.
+     */
+    Cipher create() throws ApiException, IOException;
+}

src/main/java/com/aspose/words/cloud/SimpleEncryptorFactory.java

@@ -0,0 +1,81 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="SimpleEncryptorFactory.java">
+ *   Copyright (c) 2022 Aspose.Words for Cloud
+ * </copyright>
+ * <summary>
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ * </summary>
+ * --------------------------------------------------------------------------------
+ */
+
+package com.aspose.words.cloud;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.RSAPublicKeySpec;
+import java.util.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.NoSuchPaddingException;
+
+public class SimpleEncryptorFactory implements EncryptorFactory {
+
+    private String exponent;
+    private String modulus;
+
+    public SimpleEncryptorFactory(String exponent, String modulus) {
+        if (exponent == null || exponent.isEmpty()) {
+            throw new IllegalArgumentException("Exponent must be non empty base64 encoded string");
+        }
+
+        if (modulus == null || modulus.isEmpty()) {
+            throw new IllegalArgumentException("Modulus must be non empty base64 encoded string");
+        }
+
+        this.exponent = exponent;
+        this.modulus = modulus;
+    }
+
+    @Override
+    public Cipher create() throws ApiException, IOException {
+
+        try {
+            byte[] modulusByte = Base64.getDecoder().decode(this.modulus);
+            BigInteger modulusInt = new BigInteger(1, modulusByte);
+            byte[] exponentByte = Base64.getDecoder().decode(this.exponent);
+            BigInteger exponentInt = new BigInteger(1, exponentByte);
+            RSAPublicKeySpec spec = new RSAPublicKeySpec(modulusInt, exponentInt);
+            KeyFactory factory = KeyFactory.getInstance("RSA");
+            PublicKey key = factory.generatePublic(spec);
+            Cipher encryptor = Cipher.getInstance("RSA");
+            encryptor.init(Cipher.ENCRYPT_MODE, key);
+
+            return encryptor;
+        } 
+        catch (InvalidKeyException | NoSuchAlgorithmException | InvalidKeySpecException | NoSuchPaddingException e) {
+            throw new ApiException(e);
+        }
+    }
+}

src/main/java/com/aspose/words/cloud/api/WordsApi.java

@@ -31,19 +31,19 @@
 import com.aspose.words.cloud.model.*;
 import com.aspose.words.cloud.model.requests.*;
 import com.aspose.words.cloud.model.responses.*;
-import com.google.gson.reflect.TypeToken;
 import com.squareup.okhttp.Response;
 import java.io.IOException;
-import javax.crypto.NoSuchPaddingException;
 import javax.mail.BodyPart;
+import javax.crypto.Cipher;
 import javax.mail.MessagingException;
 import java.lang.reflect.Type;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
 import java.util.*;
+import java.io.File;
 
-public class WordsApi {
+public class WordsApi implements EncryptorFactory {
     private ApiClient apiClient;
 
     public WordsApi(String clientId, String clientSecret, String baseUrl) {
@@ -56,23 +56,7 @@ public WordsApi() {
 
     public WordsApi(ApiClient apiClient) {
         this.apiClient = apiClient;
-        try {
-            this.checkRsaKey();
-        } 
-        catch (ApiException e) {
-        }
-        catch (MessagingException e) {
-        }
-        catch (IOException e) {
-        }
-        catch (InvalidKeySpecException e) {
-        }
-        catch (NoSuchAlgorithmException e) {
-        }
-        catch (NoSuchPaddingException e) {
-        }
-        catch (InvalidKeyException e) {
-        }
+        this.apiClient.setEncryptorProvider(this);
     }
 
     public ApiClient getApiClient() {
@@ -81,23 +65,6 @@ public ApiClient getApiClient() {
 
     public void setApiClient(ApiClient apiClient) {
         this.apiClient = apiClient;
-        try {
-            this.checkRsaKey();
-        }
-        catch (ApiException e) {
-        }
-        catch (MessagingException e) {
-        }
-        catch (IOException e) {
-        }
-        catch (InvalidKeySpecException e) {
-        }
-        catch (NoSuchAlgorithmException e) {
-        }
-        catch (NoSuchPaddingException e) {
-        }
-        catch (InvalidKeyException e) {
-        }
     }
 
     @SuppressWarnings("rawtypes")
@@ -22543,8 +22510,16 @@ public Object deserializeResponse(ApiClient apiClient, Response response) throws
         return (Object[]) (apiClient.execute(call, internalRequest).getData());
     }
 
-    private void checkRsaKey() throws ApiException, MessagingException, IOException, InvalidKeySpecException, NoSuchAlgorithmException, InvalidKeyException, NoSuchPaddingException {
-        PublicKeyResponse pkResponse = this.getPublicKey(new GetPublicKeyRequest());
-        this.apiClient.setRsaKey(pkResponse.getModulus(), pkResponse.getExponent());
+    @Override
+    public Cipher create() throws ApiException, IOException {
+
+        try {
+            PublicKeyResponse pkResponse = this.getPublicKey(new GetPublicKeyRequest());
+            EncryptorFactory factory = new SimpleEncryptorFactory(pkResponse.getExponent(), pkResponse.getModulus());
+            return factory.create();
+        } 
+        catch (MessagingException e) {
+            throw new ApiException(e);
+        }
     }
 }