Optimize Ruby SDK

Author: gordonge

lib/aspose_diagram_cloud/api/diagram_file_api.rb

@@ -18,6 +18,22 @@ class DiagramFileApi
 
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
+      request_token
+    end
+
+     #
+     # Gets a request token from server
+     #
+     def request_token
+      config = @api_client.config
+      base_path = config.base_path 
+      config.base_path = '/'
+      request_url = "/oauth2/token"
+      post_data = "grant_type=client_credentials" + "&client_id=" + config.api_key['app_sid'] + "&client_secret=" + config.api_key['api_key']
+      data, status_code, header = @api_client.call_api(:POST, request_url, :body => post_data, :return_type => 'Object')
+      @api_client.config.access_token = data[:access_token]
+      @api_client.config.base_path = base_path
+      @api_client.default_headers["Authorization"] ="Bearer " + data[:access_token]
     end
 
     # Read document info or export.
@@ -30,6 +46,7 @@ def initialize(api_client = ApiClient.default)
     # @return [File]
     def diagram_file_get_diagram(name, opts = {})
       data, _status_code, _headers = diagram_file_get_diagram_with_http_info(name, opts)
+      request_token if _status_code == 401
       return data
     end
 
@@ -96,6 +113,7 @@ def diagram_file_get_diagram_with_http_info(name, opts = {})
     # @return [SaveResponse]
     def diagram_file_post_save_as(name, opts = {})
       data, _status_code, _headers = diagram_file_post_save_as_with_http_info(name, opts)
+      request_token if _status_code == 401
       return data
     end
 
@@ -163,6 +181,7 @@ def diagram_file_post_save_as_with_http_info(name, opts = {})
     # @return [SaaSposeResponse]
     def diagram_file_put_create(name, opts = {})
       data, _status_code, _headers = diagram_file_put_create_with_http_info(name, opts)
+      request_token if _status_code == 401
       return data
     end
 
@@ -227,6 +246,7 @@ def diagram_file_put_create_with_http_info(name, opts = {})
     # @return [SaaSposeResponse]
     def diagram_file_put_upload(name, opts = {})
       data, _status_code, _headers = diagram_file_put_upload_with_http_info(name, opts)
+      request_token if _status_code == 401
       return data
     end
 

lib/aspose_diagram_cloud/api_client.rb

@@ -49,7 +49,6 @@ def self.default
     def call_api(http_method, path, opts = {})
       request = build_request(http_method, path, opts)
       response = request.run
-
       if @config.debugging
         @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
       end

lib/aspose_diagram_cloud/version.rb

@@ -11,5 +11,5 @@
 =end
 
 module AsposeDiagramCloud
-  VERSION = "18.10.2"
+  VERSION = "18.10.3"
 end

spec/api/diagram_file_api_spec.rb

@@ -19,18 +19,10 @@
 describe 'DiagramFileApi' do
   before do
     # run before each test
-     # run before each test
-     if $access_token == nil then
-      conf = AsposeDiagramCloud::Configuration.new
-      conf.base_path = ""
-      instance = AsposeDiagramCloud::OAuthApi.new(AsposeDiagramCloud::ApiClient.new(conf))
-      $access_token = instance.o_auth_post($grant_type,$client_id,$client_secret).access_token
-  end
-
-  conf = AsposeDiagramCloud::Configuration.new
-  conf.access_token = $access_token	
-  client = AsposeDiagramCloud::ApiClient.new(conf)
-  client.default_headers["Authorization"] ="Bearer " + $access_token
+    conf = AsposeDiagramCloud::Configuration.new
+    conf.api_key['app_sid'] = $client_id
+    conf.api_key['api_key'] = $client_secret
+    client = AsposeDiagramCloud::ApiClient.new(conf)
     @instance = AsposeDiagramCloud::DiagramFileApi.new(client)
   end