Merge pull request #36 from aspose-pdf-cloud/develop

update to 22.8.0

Author: kaferi

README.md

@@ -9,12 +9,9 @@ These SDKs are now fully supported. If you have any questions, see any bugs or h
 
 Extract Text & Images of a PDF document online https://products.aspose.app/pdf/parser.
 
-## Enhancements in Version 22.7
+## Enhancements in Version 22.8
 - A new version of Aspose.PDF Cloud was prepared using the latest version of Aspose.PDF for .NET.
 
-## Bugs fixed in Version 22.7
-- Text Replace API method changes background of the elements.
-
 ## Installation
 ```
     go get -u github.com/aspose-pdf-cloud/aspose-pdf-cloud-go/v22

api_client.go

@@ -176,7 +176,7 @@ func (c *APIClient) prepareRequest (
 
     // set custom header
     headerParams["x-aspose-client"] = "go sdk"
-    headerParams["x-aspose-client-version"] = "22.7.0"
+    headerParams["x-aspose-client-version"] = "22.8.0"
 
     // Detect postBody type and post.
     if postBody != nil {
@@ -420,24 +420,30 @@ func (a *APIClient) addAuth(request *http.Request) (err error) {
 }
 
 // RequestOauthToken function for requests OAuth token
-func (a *APIClient) RequestOauthToken() (error) {
-
-       resp, err := http.PostForm(strings.Replace(a.cfg.BasePath, "/v3.0", "/connect/token", -1), url.Values{
-               "grant_type": {"client_credentials"},
-               "client_id": {a.cfg.AppSid},
-               "client_secret": {a.cfg.AppKey}})
-
-       if err != nil {
-               return err
-       }
-       defer resp.Body.Close()
-
-       var tr TokenResp
-       if err = json.NewDecoder(resp.Body).Decode(&tr); err != nil {
-               return err
-       }
-       a.cfg.AccessToken = tr.AccessToken
-       return nil
+func (a *APIClient) RequestOauthToken() error {
+	resp, err := http.PostForm(
+		strings.Replace(a.cfg.BasePath, "/v3.0", "/connect/token", -1),
+		// a.cfg.BasePath+"/pdf/connect/token",
+		url.Values{
+			"grant_type":    {"client_credentials"},
+			"client_id":     {a.cfg.AppSid},
+			"client_secret": {a.cfg.AppKey},
+		},
+	)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	bodyBytes, _ := io.ReadAll(resp.Body)
+	var tr TokenResp
+	if err = json.NewDecoder(bytes.NewReader(bodyBytes)).Decode(&tr); err != nil {
+		return fmt.Errorf("%s (wrapped error: %w)", bodyBytes, err)
+	}
+	if len(tr.AccessToken) == 0 {
+		return fmt.Errorf("empty token (%s)", bodyBytes)
+	}
+	a.cfg.AccessToken = tr.AccessToken
+	return nil
 }
 
 func deserializeDTO(readCloser io.Reader, successPayload interface{}) error {

base_test.go

@@ -70,11 +70,12 @@ func getServercredsJson() string {
 }
 
 type Creds struct {
-	AppSID string
-	AppKey string
+	AppSID     string `json:"AppSID"`
+	AppKey     string `json:"AppKey"`
+	ProductUri string `json:"ProductUri"`
 }
 
-func getCreds() (appSID, appKey string) {
+func getCreds() Creds {
 	bbCreds, err := os.ReadFile(getServercredsJson())
 	if err != nil {
 		panic(err)
@@ -89,17 +90,19 @@ func getCreds() (appSID, appKey string) {
 	if len(creds.AppKey) == 0 {
 		panic("no AppKey")
 	}
-	return creds.AppSID, creds.AppKey
+	if len(creds.ProductUri) == 0 {
+		panic("no ProductUri")
+	}
+	return creds
 }
 
 func NewBaseTest() *BaseTest {
-	appSID, appKey := getCreds()
+	creds := getCreds()
 	bt := BaseTest{
 		remoteFolder:        "TempPdfCloud",
 		localTestDataFolder: "test_data",
 		TestNumber:          0,
-		// Get App key and App SID from https://aspose.cloud
-		PdfAPI: NewPdfApiService(appSID, appKey, "https://api.aspose.cloud/v3.0"),
+		PdfAPI:              NewPdfApiService(creds.AppSID, creds.AppKey, creds.ProductUri),
 	}
 	return &bt
 }