amocrm-rails 0.0.1 → 0.0.5

data/lib/amocrm-rails.rb

@@ -6,19 +6,27 @@ require 'amocrm-rails/response'
 module AmocrmRails
   class << self
     def generate_access_token(client_id=AmocrmRails.client_id, client_secret=AmocrmRails.client_secret, refresh_token=nil, count=0)
+      refresh_token ||= AmocrmRails.try(:refresh_token)
       params = {
         client_id: client_id,
         client_secret: client_secret,
-        grant_type: 'authorization_code',
-        redirect_uri: AmocrmRails.redirect_uri
       }
       if refresh_token.present?
+        params[:grant_type] = 'refresh_token'
         params[:refresh_token] = refresh_token
       else
+        params[:grant_type] = 'authorization_code'
         params[:code] = AmocrmRails.code
       end
+      params[:redirect_uri] = AmocrmRails.redirect_uri
       response = Faraday.post(AmocrmRails.url_token, params.to_json, "Content-Type" => "application/json")
-      if response.status < 200 || response.status > 204
+      if AmocrmRails::Request.debug
+        logger = AmocrmRails::Request.logger || ::Logger.new(STDOUT)
+        logger.info "---generate_access_token---"
+        logger.info "params: #{params}"
+        logger.info "Responding with #{response.status.inspect} => #{response.body.inspect}"
+      end
+      if response.status >= 200 && response.status <= 204
         response_token = JSON.parse(response.body)
         data = YAML.load_file("config/amocrm_token.yml")
         response_token.each do |k, v|
@@ -26,7 +34,7 @@ module AmocrmRails
           AmocrmRails::register k.underscore.to_sym, v
         end
         File.open("config/amocrm_token.yml", 'w') { |f| YAML.dump(data, f) }
-      elsif count < 3
+      elsif count < 3 && AmocrmRails.refresh_token.present?
         AmocrmRails.generate_access_token(client_id, client_secret, AmocrmRails.refresh_token, count+1)
       end
     end

data/lib/amocrm-rails/api_request.rb

@@ -17,6 +17,9 @@ module AmocrmRails
         if e.response.try(:code) == 401 && first_time
           AmocrmRails.generate_access_token
           self.post(params: params, headers: headers, body: body, first_time: false)
+        elsif e.response.try(:code) == 429
+          sleep(1.second)
+          self.post(params: params, headers: headers, body: body, first_time: false)
         else
           handle_error(e)
         end
@@ -35,6 +38,9 @@ module AmocrmRails
         if e.response.try(:code) == 401 && first_time
           AmocrmRails.generate_access_token
           self.patch(params: params, headers: headers, body: body, first_time: false)
+        elsif e.response.try(:code) == 429
+          sleep(1.second)
+          self.patch(params: params, headers: headers, body: body, first_time: false)
         else
           handle_error(e)
         end
@@ -53,6 +59,9 @@ module AmocrmRails
         if e.response.try(:code) == 401 && first_time
           AmocrmRails.generate_access_token
           self.put(params: params, headers: headers, body: body, first_time: false)
+        elsif e.response.try(:code) == 429
+          sleep(1.second)
+          self.put(params: params, headers: headers, body: body, first_time: false)
         else
           handle_error(e)
         end
@@ -71,6 +80,9 @@ module AmocrmRails
         if e.response.try(:code) == 401 && first_time
           AmocrmRails.generate_access_token
           self.get(params: params, headers: headers, first_time: false)
+        elsif e.response.try(:code) == 429
+          sleep(1.second)
+          self.get(params: params, headers: headers, body: body, first_time: false)
         else
           handle_error(e)
         end
@@ -89,6 +101,9 @@ module AmocrmRails
         if e.response.try(:code) == 401 && first_time
           AmocrmRails.generate_access_token
           self.delete(params: params, headers: headers, first_time: false)
+        elsif e.response.try(:code) == 429
+          sleep(1.second)
+          self.delete(params: params, headers: headers, body: body, first_time: false)
         else
           handle_error(e)
         end
@@ -211,7 +226,7 @@ module AmocrmRails
     end
 
     def base_api_url
-      "#{AmocrmRails.api_endpoint}/api/v2/"
+      "#{AmocrmRails.api_endpoint}/api/v4/"
     end
   end
 end

data/lib/generators/amocrm_rails/install/templates/amocrm.rb

@@ -15,8 +15,8 @@ AmocrmRails.setup do |config|
       end
     end
 
-    config::Request.timeout = 15
-    config::Request.open_timeout = 15
+    config::Request.timeout = 60
+    config::Request.open_timeout = 60
     config::Request.symbolize_keys = true
     config::Request.debug = false
   end

data/lib/generators/amocrm_rails/install/templates/amocrm_token.yml

@@ -1,4 +1,4 @@
 token_type: Bearer
 expires_in: 86400
 access_token: '***'
-refresh_token: '***'
+refresh_token: ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amocrm-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Pavel Osetrov
@@ -79,5 +79,5 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Amocrm
+summary: Rails wrapper API AmoCrm
 test_files: []