amocrm-rails 0.0.3 → 0.0.7

data/lib/amocrm-rails.rb

@@ -2,32 +2,54 @@ require 'amocrm-rails/amocrm_error'
 require 'amocrm-rails/request'
 require 'amocrm-rails/api_request'
 require 'amocrm-rails/response'
+require 'concern'
+require 'helper'
 
 module AmocrmRails
   class << self
-    def generate_access_token(client_id=AmocrmRails.client_id, client_secret=AmocrmRails.client_secret, refresh_token=nil, count=0)
+    def generate_access_token(**options)
+      user_id = AmocrmRails.try(:user_id)
+      client_id = options[:client_id] || AmocrmRails.client_id
+      client_secret = options[:client_secret] || AmocrmRails.client_secret
+      refresh_token = options[:refresh_token] || AmocrmRails.try(:refresh_token)
+      count = options[:count].to_i
       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|
-          data[k] = v
-          AmocrmRails::register k.underscore.to_sym, v
+          if user_id.present?
+            data[user_id] = {} if data[user_id].nil?
+            data[user_id][k] = v
+          else
+            data[k] = v
+          end
+          AmocrmRails::register(k.underscore.to_sym, v)
         end
         File.open("config/amocrm_token.yml", 'w') { |f| YAML.dump(data, f) }
-      elsif count < 3
-        AmocrmRails.generate_access_token(client_id, client_secret, AmocrmRails.refresh_token, count+1)
+      elsif count < 3 && AmocrmRails.refresh_token.present?
+        AmocrmRails.generate_access_token(client_id: client_id,
+                                          client_secret: client_secret,
+                                          refresh_token:AmocrmRails.refresh_token,
+                                          count: count+1)
       end
     end
 

data/lib/amocrm-rails/api_request.rb

@@ -14,10 +14,10 @@ module AmocrmRails
         end
         parse_response(response)
       rescue => e
-        if e.response.try(:code) == 401 && first_time
+        if [401, 402].include?(e.response.dig(:status)) && first_time
           AmocrmRails.generate_access_token
           self.post(params: params, headers: headers, body: body, first_time: false)
-        elsif e.response.try(:code) == 429
+        elsif e.response.dig(:status) == 429
           sleep(1.second)
           self.post(params: params, headers: headers, body: body, first_time: false)
         else
@@ -35,10 +35,10 @@ module AmocrmRails
         end
         parse_response(response)
       rescue => e
-        if e.response.try(:code) == 401 && first_time
+        if [401, 402].include?(e.response.dig(:status)) && first_time
           AmocrmRails.generate_access_token
           self.patch(params: params, headers: headers, body: body, first_time: false)
-        elsif e.response.try(:code) == 429
+        elsif e.response.try(:status) == 429
           sleep(1.second)
           self.patch(params: params, headers: headers, body: body, first_time: false)
         else
@@ -56,10 +56,10 @@ module AmocrmRails
         end
         parse_response(response)
       rescue => e
-        if e.response.try(:code) == 401 && first_time
+        if [401, 402].include?(e.response.dig(:status)) && first_time
           AmocrmRails.generate_access_token
           self.put(params: params, headers: headers, body: body, first_time: false)
-        elsif e.response.try(:code) == 429
+        elsif e.response.dig(:status) == 429
           sleep(1.second)
           self.put(params: params, headers: headers, body: body, first_time: false)
         else
@@ -77,10 +77,10 @@ module AmocrmRails
         end
         parse_response(response)
       rescue => e
-        if e.response.try(:code) == 401 && first_time
+        if [401, 402].include?(e.response.dig(:status)) && first_time
           AmocrmRails.generate_access_token
           self.get(params: params, headers: headers, first_time: false)
-        elsif e.response.try(:code) == 429
+        elsif e.response.try(:status) == 429
           sleep(1.second)
           self.get(params: params, headers: headers, body: body, first_time: false)
         else
@@ -98,10 +98,10 @@ module AmocrmRails
         end
         parse_response(response)
       rescue => e
-        if e.response.try(:code) == 401 && first_time
+        if [401, 402].include?(e.response.dig(:status)) && first_time
           AmocrmRails.generate_access_token
           self.delete(params: params, headers: headers, first_time: false)
-        elsif e.response.try(:code) == 429
+        elsif e.response.try(:stattus) == 429
           sleep(1.second)
           self.delete(params: params, headers: headers, body: body, first_time: false)
         else

data/lib/concern.rb

@@ -0,0 +1,30 @@
+module AmocrmRails
+  module Concern
+    extend ActiveSupport::Concern
+
+    private
+
+    def update_auth_code
+      if user_signed_in?
+        AmocrmRails::register :user_id, current_user.id
+        if File.exist?('config/amocrm.yml')
+          data = YAML.load_file('config/amocrm.yml')
+          return nil if data.dig(Rails.env, current_user.id).nil?
+          data[Rails.env][current_user.id].each do |k, v|
+            AmocrmRails::register k.underscore.to_sym, v
+          end
+
+          if File.exist?('config/amocrm_token.yml')
+            token_data = YAML.load_file("config/amocrm_token.yml")
+            token_data[current_user.id] = {} if data.dig(current_user.id).nil?
+            token_data[current_user.id].each do |k, v|
+              config::register k.underscore.to_sym, v
+            end
+          end
+
+          AmocrmRails.generate_access_token if AmocrmRails.access_token.nil? && AmocrmRails.code.present?
+        end
+      end
+    end
+  end
+end

data/lib/generators/amocrm_rails/install/install_generator.rb

@@ -4,10 +4,31 @@ module AmocrmRails
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path('templates', __dir__)
 
+    class_option :with, type: :string, default: ''
+
     def generate_install
-      copy_file 'amocrm.yml', 'config/amocrm.yml'
+      with = options['with']
       copy_file 'amocrm_token.yml', 'config/amocrm_token.yml'
-      copy_file 'amocrm.rb', 'config/initializers/amocrm.rb'
+
+      if with.to_s.downcase == 'devise'
+        copy_file 'devise/app/controllers/amocrm_controller.rb', 'app/controllers/amocrm_controller.rb'
+        copy_file 'devise/app/views/amocrm/code.html.erb', 'app/views/amocrm/code.html.erb'
+        copy_file 'devise/app/views/amocrm/link.html.erb', 'app/views/amocrm/link.html.erb'
+        copy_file 'devise/config/amocrm.yml', 'config/amocrm.yml'
+        copy_file 'devise/config/initializers/amocrm.rb', 'config/initializers/amocrm.rb'
+        route "get '/amocrm' => 'amocrm#code'"
+        route "get '/amocrm/link' => 'amocrm#link'"
+        route "post '/amocrm/webhook/:name' => 'amocrm#webhook'"
+
+        inject_into_file 'app/controllers/application_controller.rb', after: "class ApplicationController < ActionController::Base\n" do <<-'RUBY'
+          include AmocrmRails::Concern
+          before_action :update_auth_code
+        RUBY
+        end
+      else
+        copy_file 'amocrm.rb', 'config/initializers/amocrm.rb'
+        copy_file 'amocrm.yml', 'config/amocrm.yml'
+      end
     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.yml

@@ -2,14 +2,11 @@ defaults: &defaults
   CLIENT_ID: '***'
   CLIENT_SECRET: '***'
   CODE: '***'
-  redirect_uri: https://yourdomain.ru
+  redirect_uri: https://yourdomain.ru/amocrm
   api_endpoint: https://yourdomain.amocrm.ru
-  URL_TOKEN: 'https://yourdomain.amocrm.ru/oauth2/access_token'
-  REDIRECT_URI: 'https://yourdomain.com'
+  URL_TOKEN: https://yourdomain.amocrm.ru/oauth2/access_token
 production:
   <<: *defaults
-  URL_TOKEN: 'https://yourdomain.amocrm.ru/oauth2/access_token'
-  REDIRECT_URI: 'https://yourdomain.ru'
 development:
   <<: *defaults
 test:

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: ''

data/lib/generators/amocrm_rails/install/templates/devise/app/controllers/amocrm_controller.rb

@@ -0,0 +1,37 @@
+class AmocrmController < ApplicationController
+  before_action :authenticate_user!, except: [:webhook]
+
+  def link
+  end
+
+  def code
+    if current_user.id == params[:state].to_i
+      if File.exist?('config/amocrm.yml')
+        data = YAML.load_file('config/amocrm.yml')
+        data[Rails.env][current_user.id] = {} if data[Rails.env][current_user.id].nil?
+        params.each do |k, v|
+          data[Rails.env][current_user.id][k] = v
+          AmocrmRails::register k.underscore.to_sym, v
+        end
+        File.open("config/amocrm.yml", 'w') { |f| YAML.dump(data, f) }
+      end
+    end
+    @code = params[:code]
+    response = AmocrmRails::Request.account.retrieve(params: {
+      with: 'amojo_id,amojo_rights,users_groups,task_types,version,entity_names,datetime_settings'
+    })
+    @account = response.body
+  end
+
+  def webhook
+    webhook_name = params[:name]
+  end
+
+  private
+
+  def authenticate_user!
+    unless user_signed_in?
+      redirect_to new_user_session_path
+    end
+  end
+end

data/lib/generators/amocrm_rails/install/templates/devise/app/views/amocrm/code.html.erb

@@ -0,0 +1,11 @@
+<div style="width: 100%; padding: 100px; text-align: center;">
+  Your code:
+  <code>
+    <%= @code %>
+  </code>
+  <hr>
+  Your account:
+  <code>
+    <%= @account.to_json %>
+  </code>
+</div>

data/lib/generators/amocrm_rails/install/templates/devise/app/views/amocrm/link.html.erb

@@ -0,0 +1,6 @@
+<div style="width: 100%; padding: 100px; text-align: center;">
+
+  <%= link_to "Установить интеграцию",
+              amocrm_oauth_url(state: current_user.try(:id)),
+              class: 'btn btn-primary' %>
+</div>

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

@@ -0,0 +1,16 @@
+require 'amocrm'
+
+AmocrmRails.setup do |config|
+  if File.exist?('config/amocrm.yml')
+    processed = YAML.load_file('config/amocrm.yml')[Rails.env]
+
+    processed.each do |k, v|
+      config::register k.underscore.to_sym, v
+    end
+
+    config::Request.timeout = 60
+    config::Request.open_timeout = 60
+    config::Request.symbolize_keys = true
+    config::Request.debug = false
+  end
+end

data/lib/generators/amocrm_rails/install/templates/devise/config/initializers/amocrm.rb

@@ -0,0 +1,8 @@
+require 'amocrm-rails'
+
+AmocrmRails.setup do |config|
+  config::Request.timeout = 60
+  config::Request.open_timeout = 60
+  config::Request.symbolize_keys = true
+  config::Request.debug = false
+end

data/lib/helper.rb

@@ -0,0 +1,5 @@
+module AmocrmHelper
+  def amocrm_oauth_url(state: nil, mode: 'post_message', client_id: AmocrmRails::client_id)
+    "https://www.amocrm.ru/oauth?client_id=#{client_id}&mode=#{mode}&state=#{state}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amocrm-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - Pavel Osetrov
@@ -52,11 +52,18 @@ files:
 - lib/amocrm-rails/request.rb
 - lib/amocrm-rails/response.rb
 - lib/amocrm-rails/version.rb
+- lib/concern.rb
 - lib/generators/amocrm_rails/install/USAGE
 - lib/generators/amocrm_rails/install/install_generator.rb
 - lib/generators/amocrm_rails/install/templates/amocrm.rb
 - lib/generators/amocrm_rails/install/templates/amocrm.yml
 - lib/generators/amocrm_rails/install/templates/amocrm_token.yml
+- lib/generators/amocrm_rails/install/templates/devise/app/controllers/amocrm_controller.rb
+- lib/generators/amocrm_rails/install/templates/devise/app/views/amocrm/code.html.erb
+- lib/generators/amocrm_rails/install/templates/devise/app/views/amocrm/link.html.erb
+- lib/generators/amocrm_rails/install/templates/devise/config/amocrm.rb
+- lib/generators/amocrm_rails/install/templates/devise/config/initializers/amocrm.rb
+- lib/helper.rb
 homepage: https://github.com/osetrov/amocrm
 licenses:
 - MIT