SDK regenerated by CI server [ci skip]

Author: dynabic-billing-team

dev/api/api_client.go

@@ -69,6 +69,7 @@ var (
 type APIClient struct {
     cfg 	*models.Configuration
     common 	service 		// Reuse a single struct instead of allocating one for each service on the heap.
+    key    *rsa.PublicKey // public key to encrypt data
 
      // API Services
     WordsApi	*WordsApiService
@@ -89,10 +90,6 @@ func NewAPIClient(cfg *models.Configuration) (client *APIClient, err error) {
         return nil, errors.New("ClientId must be non-empty string")
     }
 
-	if cfg.Timeout == 0 {
-		cfg.HttpClient.Timeout = cfg.Timeout
-	}
-
     if cfg.ClientSecret == "" {
         return nil, errors.New("ClientSecret must be non-empty string")
     }
@@ -103,6 +100,8 @@ func NewAPIClient(cfg *models.Configuration) (client *APIClient, err error) {
         return nil, errors.New("BaseUrl must be valid URL")
     }
 
+    cfg.HttpClient.Timeout = cfg.Timeout.Duration
+
     c := &APIClient{}
     c.cfg = cfg
     c.common.client = c
@@ -203,41 +202,7 @@ func (c *APIClient) NewContextWithToken(ctx context.Context) (ctxWithToken conte
         return nil, err
     }
 
-
-	contextWithToken := context.WithValue(ctx, models.ContextAccessToken, result.AccessToken)
-
-	rsaKeyData, _, err := c.WordsApi.GetPublicKey(contextWithToken, &models.GetPublicKeyRequest{})
-
-	if err != nil {
-		return nil, err
-	}
-
-    exponentBytes, err := base64.StdEncoding.DecodeString(rsaKeyData.Exponent) 
-
-	if err != nil {
-		return nil, err
-	}
-
-	var eBytes []byte
-	if len(exponentBytes) < 8 {
-		eBytes = make([]byte, 8-len(exponentBytes), 8)
-		eBytes = append(eBytes, exponentBytes...)
-	} else {
-		eBytes = exponentBytes
-	}
-
-	modulusBytes, err := base64.StdEncoding.DecodeString(rsaKeyData.Modulus)
-
-	if err != nil {
-		return nil, err
-	}
-
-	publicKey := rsa.PublicKey{
-		N: big.NewInt(0).SetBytes(modulusBytes),
-		E: int(binary.BigEndian.Uint64(eBytes)),
-	}
-
-	return context.WithValue(contextWithToken, models.ContextPasswordEncryptionKey, publicKey), nil
+	return context.WithValue(ctx, models.ContextAccessToken, result.AccessToken), nil
 }
 
 // prepareRequest build the request
@@ -304,7 +269,7 @@ func (c *APIClient) prepareRequest (
     for k, v := range data.QueryParams {
         for _, iv := range v {
             if k == "Password" && iv != "" {
-                encrypted, err := encrypt(ctx, iv)
+                encrypted, err := c.encrypt(ctx, iv)
 
                 if err != nil {
                     return nil, err
@@ -375,21 +340,61 @@ func (c *APIClient) prepareRequest (
 }
 
 // encrypt string with RSA key from context
-func encrypt(ctx context.Context, data string) (string, error) {
+func (c *APIClient) encrypt(ctx context.Context, data string) (string, error) {
 
-    if ctx.Value(models.ContextPasswordEncryptionKey) == nil {
-        return "", errors.New("Context doesn't contain RSA key")
-    }
+	if data == "" {
+		return data, nil
+	}
 
-    key := ctx.Value(models.ContextPasswordEncryptionKey).(rsa.PublicKey)
+	if c.key == nil {
 
-    encrypted, err := rsa.EncryptPKCS1v15(rand.Reader, &key, []byte(data))
+		modulus := c.cfg.Modulus
+		exponent := c.cfg.Exponent
 
-    if err != nil {
-        return "", err
-    }
+		if modulus == "" || exponent == "" {
+			rsaKeyData, _, err := c.WordsApi.GetPublicKey(ctx, &models.GetPublicKeyRequest{})
+
+			if err != nil {
+				return "", err
+			}
+
+			modulus = rsaKeyData.Modulus
+			exponent = rsaKeyData.Exponent
+		}
+
+		exponentBytes, err := base64.StdEncoding.DecodeString(exponent)
+
+		if err != nil {
+			return "", err
+		}
+
+		var eBytes []byte
+		if len(exponentBytes) < 8 {
+			eBytes = make([]byte, 8-len(exponentBytes), 8)
+			eBytes = append(eBytes, exponentBytes...)
+		} else {
+			eBytes = exponentBytes
+		}
+
+		modulusBytes, err := base64.StdEncoding.DecodeString(modulus)
+
+		if err != nil {
+			return "", err
+		}
+
+		c.key = &rsa.PublicKey{
+			N: big.NewInt(0).SetBytes(modulusBytes),
+			E: int(binary.BigEndian.Uint64(eBytes)),
+		}
+	}
+
+	encrypted, err := rsa.EncryptPKCS1v15(rand.Reader, c.key, []byte(data))
+
+	if err != nil {
+		return "", err
+	}
 
-    return base64.StdEncoding.EncodeToString(encrypted), nil
+	return base64.StdEncoding.EncodeToString(encrypted), nil
 }
 
 // Add a file to the multipart request

dev/api/models/configuration.go

@@ -29,6 +29,7 @@ package models
 
 import (
 	"encoding/json"
+	"errors"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -82,7 +83,9 @@ type Configuration struct {
 	DebugMode     bool              `json:"DebugMode,omitempty"`
 	DefaultHeader map[string]string `json:"DefaultHeader,omitempty"`
 	HttpClient    *http.Client
-    Timeout       time.Duration
+	Timeout       Duration `json:"Timeout,omitempty"`
+	Modulus       string   `json:"Modulus,omitempty"`
+	Exponent      string   `json:"Exponent,omitempty"`
 }
 
 func NewConfiguration(configFilePath string) (pConfig *Configuration, err error) {
@@ -118,4 +121,34 @@ func (w *WordsApiErrorResponse) Error() string {
 	}
 
 	return string(out)
-}
+}
+
+
+type Duration struct {
+	time.Duration
+}
+
+func (d Duration) MarshalJSON() ([]byte, error) {
+	return json.Marshal(d.String())
+}
+
+func (d *Duration) UnmarshalJSON(b []byte) error {
+	var v interface{}
+	if err := json.Unmarshal(b, &v); err != nil {
+		return err
+	}
+	switch value := v.(type) {
+	case float64:
+		d.Duration = time.Duration(value)
+		return nil
+	case string:
+		var err error
+		d.Duration, err = time.ParseDuration(value)
+		if err != nil {
+			return err
+		}
+		return nil
+	default:
+		return errors.New("invalid duration")
+	}
+}

dev/api/models/document_entry.go

@@ -30,24 +30,24 @@ package models
 // Represents a document which will be appended to the original resource document.
 type DocumentEntryResult struct {
     // Represents a document which will be appended to the original resource document.
-    Href string `json:"Href,omitempty"`
+    EncryptedPassword string `json:"EncryptedPassword,omitempty"`
 
     // Represents a document which will be appended to the original resource document.
-    ImportFormatMode string `json:"ImportFormatMode,omitempty"`
+    Href string `json:"Href,omitempty"`
 
     // Represents a document which will be appended to the original resource document.
-    Password string `json:"Password,omitempty"`
+    ImportFormatMode string `json:"ImportFormatMode,omitempty"`
 }
 
 type DocumentEntry struct {
     // Represents a document which will be appended to the original resource document.
-    Href *string `json:"Href,omitempty"`
+    EncryptedPassword *string `json:"EncryptedPassword,omitempty"`
 
     // Represents a document which will be appended to the original resource document.
-    ImportFormatMode *string `json:"ImportFormatMode,omitempty"`
+    Href *string `json:"Href,omitempty"`
 
     // Represents a document which will be appended to the original resource document.
-    Password *string `json:"Password,omitempty"`
+    ImportFormatMode *string `json:"ImportFormatMode,omitempty"`
 }
 
 type IDocumentEntry interface {

dev/api/models/pdf_encryption_details_data.go

@@ -36,7 +36,7 @@ type PdfEncryptionDetailsDataResult struct {
     OwnerPassword string `json:"OwnerPassword,omitempty"`
 
     // Container class for details of encryption.
-    Permissions string `json:"Permissions,omitempty"`
+    Permissions []string `json:"Permissions,omitempty"`
 
     // Container class for details of encryption.
     UserPassword string `json:"UserPassword,omitempty"`
@@ -50,7 +50,7 @@ type PdfEncryptionDetailsData struct {
     OwnerPassword *string `json:"OwnerPassword,omitempty"`
 
     // Container class for details of encryption.
-    Permissions *string `json:"Permissions,omitempty"`
+    Permissions []string `json:"Permissions,omitempty"`
 
     // Container class for details of encryption.
     UserPassword *string `json:"UserPassword,omitempty"`

dev/api/models/pdf_permissions.go

@@ -0,0 +1,45 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="pdf_permissions.go">
+ *   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 models
+
+// Specifies the operations that are allowed to a user on an encrypted PDF document.
+type PdfPermissions string
+
+// List of PdfPermissions
+const (
+    DISALLOWALL PdfPermissions = "DisallowAll"
+    PRINTING PdfPermissions = "Printing"
+    MODIFYCONTENTS PdfPermissions = "ModifyContents"
+    CONTENTCOPY PdfPermissions = "ContentCopy"
+    MODIFYANNOTATIONS PdfPermissions = "ModifyAnnotations"
+    FILLIN PdfPermissions = "FillIn"
+    CONTENTCOPYFORACCESSIBILITY PdfPermissions = "ContentCopyForAccessibility"
+    DOCUMENTASSEMBLY PdfPermissions = "DocumentAssembly"
+    HIGHRESOLUTIONPRINTING PdfPermissions = "HighResolutionPrinting"
+    ALLOWALL PdfPermissions = "AllowAll"
+)

dev/api/words_api.go

@@ -14866,4 +14866,13 @@ func (a *WordsApiService) batch(ctx context.Context, withoutIntermediateResults
 	}
 
 	return successPayload, response, err
+}
+
+
+/* Encrypts string on APi key.
+ * @param ctx context.Context for authentication, logging, tracing, etc.
+ * @data data to encrypt.
+@return encrypted data. */
+func (a *WordsApiService) Encrypt(ctx context.Context, data string) (string, error) {
+	return a.client.encrypt(ctx, data)
 }

dev/tests/base_test.go

@@ -122,7 +122,7 @@ func GetConfigFilePath() (path string) {
 
 func PrepareTest(t *testing.T, config *models.Configuration) (apiClient *api.APIClient, ctx context.Context) {
 
-    config.Timeout = time.Minute
+    config.Timeout.Duration = time.Minute
 	client, err := api.NewAPIClient(config)
 
 	if err != nil {
@@ -337,6 +337,38 @@ func Test_Encrypted_Document(t *testing.T) {
 		t.Error(err)
 	}
 
+	assert.NotNil(t, actual.Paragraphs, "Validate GetDocumentParagraphs response.")
+	assert.NotNil(t, actual.Paragraphs.ParagraphLinkList, "Validate GetDocumentParagraphs response.")
+	assert.Equal(t, 2, len(actual.Paragraphs.ParagraphLinkList), "Validate GetDocumentParagraphs response.")
+}
+
+func Test_Encrypted_Document_With_Encrypted_Password(t *testing.T) {
+	config := ReadConfiguration(t)
+	client, ctx := PrepareTest(t, config)
+	remoteDataFolder := remoteBaseTestDataFolder + "/DocumentElements/Paragraphs"
+	localFile := "Common/DocWithPassword.docx"
+	remoteFileName := "TestGetEncryptedDocumentParagraphs.docx"
+
+	UploadNextFileToStorage(t, ctx, client, GetLocalFile(localFile), remoteDataFolder+"/"+remoteFileName)
+
+	encryptedPassword, _ := client.WordsApi.Encrypt(ctx, "12345")
+
+	options := map[string]interface{}{
+		"nodePath":          "sections/0",
+		"folder":            remoteDataFolder,
+		"encryptedPassword": encryptedPassword,
+	}
+
+	request := &models.GetParagraphsRequest{
+		Name:      ToStringPointer(remoteFileName),
+		Optionals: options,
+	}
+
+	actual, _, err := client.WordsApi.GetParagraphs(ctx, request)
+	if err != nil {
+		t.Error(err)
+	}
+
 	assert.NotNil(t, actual.Paragraphs, "Validate GetDocumentParagraphs response.")
 	assert.NotNil(t, actual.Paragraphs.ParagraphLinkList, "Validate GetDocumentParagraphs response.")
 	assert.Equal(t, 2, len(actual.Paragraphs.ParagraphLinkList), "Validate GetDocumentParagraphs response.")

dev/tests/load_web_document_test.go

@@ -40,8 +40,8 @@ func Test_LoadWebDocument_LoadWebDocument(t *testing.T) {
     client, ctx := PrepareTest(t, config)
     requestDataSaveOptions := models.DocSaveOptionsData{
         FileName: ToStringPointer("google.doc"),
-        DmlEffectsRenderingMode: ToStringPointer("1"),
-        DmlRenderingMode: ToStringPointer("1"),
+        DmlEffectsRenderingMode: ToStringPointer("None"),
+        DmlRenderingMode: ToStringPointer("DrawingML"),
         UpdateSdtContent: ToBoolPointer(false),
         ZipOutput: ToBoolPointer(false),
     }