Merge pull request #18 from kaferi/master

Update to v19.7

Author: andrey-kotlyarov

README.md

@@ -23,7 +23,7 @@
 
 
 
-    OpenAPI spec version: 2.0
+    OpenAPI spec version: 3.0
     
 """
 
@@ -35,7 +35,6 @@
 from .models.annotation_state import AnnotationState
 from .models.annotation_type import AnnotationType
 from .models.antialiasing_processing_type import AntialiasingProcessingType
-from .models.append_document import AppendDocument
 from .models.aspose_response import AsposeResponse
 from .models.border_corner_style import BorderCornerStyle
 from .models.border_info import BorderInfo
@@ -54,10 +53,13 @@
 from .models.doc_recognition_mode import DocRecognitionMode
 from .models.document_privilege import DocumentPrivilege
 from .models.epub_recognition_mode import EpubRecognitionMode
+from .models.error import Error
+from .models.error_details import ErrorDetails
 from .models.field_type import FieldType
-from .models.file import File
-from .models.file_exist import FileExist
 from .models.file_icon import FileIcon
+from .models.file_versions import FileVersions
+from .models.files_list import FilesList
+from .models.files_upload_result import FilesUploadResult
 from .models.font_encoding_rules import FontEncodingRules
 from .models.font_saving_modes import FontSavingModes
 from .models.font_styles import FontStyles
@@ -80,6 +82,7 @@
 from .models.link_highlighting_mode import LinkHighlightingMode
 from .models.margin_info import MarginInfo
 from .models.merge_documents import MergeDocuments
+from .models.object_exist import ObjectExist
 from .models.optimize_options import OptimizeOptions
 from .models.page_word_count import PageWordCount
 from .models.paragraph import Paragraph
@@ -104,6 +107,8 @@
 from .models.stamp import Stamp
 from .models.stamp_icon import StampIcon
 from .models.stamp_type import StampType
+from .models.storage_exist import StorageExist
+from .models.storage_file import StorageFile
 from .models.table_broken import TableBroken
 from .models.text_horizontal_alignment import TextHorizontalAlignment
 from .models.text_icon import TextIcon
@@ -124,13 +129,16 @@
 from .models.attachment_response import AttachmentResponse
 from .models.attachments import Attachments
 from .models.attachments_response import AttachmentsResponse
+from .models.bookmark import Bookmark
+from .models.bookmark_response import BookmarkResponse
+from .models.bookmarks import Bookmarks
+from .models.bookmarks_response import BookmarksResponse
 from .models.caret_annotation_response import CaretAnnotationResponse
 from .models.caret_annotations import CaretAnnotations
 from .models.caret_annotations_response import CaretAnnotationsResponse
 from .models.circle_annotation_response import CircleAnnotationResponse
 from .models.circle_annotations import CircleAnnotations
 from .models.circle_annotations_response import CircleAnnotationsResponse
-from .models.disc_usage_response import DiscUsageResponse
 from .models.document import Document
 from .models.document_page_response import DocumentPageResponse
 from .models.document_pages_response import DocumentPagesResponse
@@ -146,10 +154,7 @@
 from .models.file_attachment_annotation_response import FileAttachmentAnnotationResponse
 from .models.file_attachment_annotations import FileAttachmentAnnotations
 from .models.file_attachment_annotations_response import FileAttachmentAnnotationsResponse
-from .models.file_exist_response import FileExistResponse
 from .models.file_version import FileVersion
-from .models.file_versions_response import FileVersionsResponse
-from .models.files_response import FilesResponse
 from .models.free_text_annotation_response import FreeTextAnnotationResponse
 from .models.free_text_annotations import FreeTextAnnotations
 from .models.free_text_annotations_response import FreeTextAnnotationsResponse
@@ -209,7 +214,6 @@
 from .models.stamp_info import StampInfo
 from .models.stamps_info import StampsInfo
 from .models.stamps_info_response import StampsInfoResponse
-from .models.storage_exist_response import StorageExistResponse
 from .models.strike_out_annotation_response import StrikeOutAnnotationResponse
 from .models.strike_out_annotations import StrikeOutAnnotations
 from .models.strike_out_annotations_response import StrikeOutAnnotationsResponse

asposepdfcloud/__init__.py

@@ -22,7 +22,7 @@
 
 
 
-    OpenAPI spec version: 2.0
+    OpenAPI spec version: 3.0
     
 """
 
@@ -192,7 +192,7 @@ def __call_api(self, resource_path, method,
                                          _request_timeout=_request_timeout)
         except ApiException as error:
             if error.status == 401:
-                self.__refresh_token()
+                self.__request_token()
                 self.__add_o_auth_token(header_params)
                 response_data = self.request(method, url,
                                          query_params=query_params,
@@ -240,10 +240,10 @@ def __request_token(self):
                     }
 
         # resource path
-        resource_path = "/oauth2/token"
+        resource_path = "/connect/token"
 
         # request url
-        url = self.host.replace("/v2.0", "") + resource_path
+        url = self.host.replace("/v3.0", "") + resource_path
 
         # perform request and return response
         response_data = self.request(method, url,
@@ -252,36 +252,7 @@ def __request_token(self):
 
         data = json.loads(str(response_data.data))
         config.access_token = data['access_token']
-        config.refresh_token = data['refresh_token']
 
-    def __refresh_token(self):
-        config = Configuration()
-
-        # header parameters
-        header_params =  {"Content-Type" : "application/x-www-form-urlencoded"}
-
-        method = 'POST'
-
-        # post params
-        post_params = {
-                    "grant_type" : "refresh_token",
-                    "refresh_token" : config.refresh_token
-                    }
-
-        # resource path
-        resource_path = "/oauth2/token"
-
-        # request url
-        url = self.host.replace("/v2.0", "") + resource_path
-
-        # perform request and return response
-        response_data = self.request(method, url,
-                                     headers=header_params,
-                                     post_params=post_params)
-
-        data = json.loads(str(response_data.data))
-        config.access_token = data['access_token']
-        config.refresh_token = data['refresh_token']
 
     def __add_o_auth_token(self, header_params):
         config = Configuration()

asposepdfcloud/api_client.py

@@ -23,7 +23,7 @@
 
 
 
-    OpenAPI spec version: 2.0
+    OpenAPI spec version: 3.0
     
 """