amocrm-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3bc05a6130ce9c1517987f919c9cea7899763b658113095523a8666bd6347a9
-  data.tar.gz: f1233ee73dfc1d46bc6d29ebb86bd5626c2be6d5bf7119a617dacc78fc4e099c
+  metadata.gz: 62e5324a456fdc52f8455190fdc7c5d55e3cca449c837259366c732e3f11ffc0
+  data.tar.gz: 13cf6d39b9b5c6b824fa53b476aeae5d8e6b056c1b36fb6bdea12e0435624a4a
 SHA512:
-  metadata.gz: bd796c99c3f4a4931693a6065c0127aab66335547b14c8632bd9c6e5ba7237b155e07f0c77fdd820d2039f500d4d319aa86e11b79027b33a4172355d677d663f
-  data.tar.gz: 9b179d31d65a7c4ff53edfcbf4a610151698b39e0759caa9251c2a4671eb1f2925993996071cd0f805cd875c66eda3ee00f30c9f5d10f8aad8585d49754e1fa0
+  metadata.gz: e0bc864c80a9adee3e062b17978074dae509ec67a6d656cb7f5989945a7c6981a7b8b0f55e789b1a445567af8c76f4909af156270481b112fb61119ae77be52f
+  data.tar.gz: 7acd4c01f0d42cbc3168f26b2cf2c2589b1a26818c4d624891abde8cc889e65b45d3040d398c56edb3cec73498b026c96e0258136475f964f8488c4e6e442a54

data/README.markdown

@@ -2,6 +2,8 @@
 
 ## Оглавление
 0. [Установка](#install)
+   1. [Упрощенная авторизация](#easy_auth)
+   2. [Авторизация через перенаправления пользователя (требуется gem Devise)](#devise_auth)
 1. [Параметры аккаунта](#account)
 2. [Сделки](#leads)
     1. [Список сделок](#leads_retrieve)
@@ -166,9 +168,57 @@
 
 и запустите `bundle install`.
 
-Затем: `rails g amocrm_rails:install`
+Для упрощенной авторизации: 
 
-В файл `config/amocrm.yml` вставьте ваши данные.
+`rails g amocrm_rails:install`
+
+Для авторизации через перенаправление пользователя (требуется [gem devise](https://github.com/heartcombo/devise)):
+
+`rails g amocrm_rails:install --with=devise`
+
+### Получение CLIENT_ID, CLIENT_SECRET и CODE
+
+#### <a name="easy_auth"></a> Упрощенная авторизация
+
+1. Переходим на страницу интеграций https://yourdomain.amocrm.ru/settings/widgets/ и нажимаем "+ СОЗДАТЬ ИНТЕГРАЦИЮ"
+![alt Страница виджетов](https://storage.deppa.ru/uploads/widgets.png)
+2. Заполняем поля, в первое поле вводим https://yourdomain.com/amocrm и нажимаем "Сохранить"
+![alt Создание интеграции](https://storage.deppa.ru/uploads/widget_add.png)
+3. Переходим на таб "Ключи и доступы". Код авторизации работает 20 минут.
+![alt Создание интеграции](https://storage.deppa.ru/uploads/widget_keys.png)
+
+В файл `config/amocrm.yml` вставляем данные.
+
+#### <a name="devise_auth"></a> Авторизация через перенаправления пользователя (требуется [gem Devise](https://github.com/heartcombo/devise))
+
+Выполняем все шаги как при [упрощенной авторизации](#easy_auth)
+
+Ссылка на получение кода:
+```rhtml
+<%= link_to "Установить интеграцию",
+          amocrm_oauth_url(state: current_user.try(:id)),
+          class: 'btn btn-primary' %>
+```
+Пример доступен по адресу:
+`
+https://yourdomain/amocrm/link
+`
+
+![alt Страница с кнопкой](https://storage.deppa.ru/uploads/amo_link.png)
+
+Нажимаем на кнопку, логинимся в амо и даём права приложению
+
+![alt Авторизация в amo](https://storage.deppa.ru/uploads/amo_form.png)
+
+После вы будуте перенаправлены на страницу https://yourdomain.com/amocrm
+
+![alt Страница с кнопкой](https://storage.deppa.ru/uploads/amo_code.png)
+
+Если вы увидили код - всё в порядке, копировать код нет необходимости, страницу можно закрыть.
+
+Если вы не используете [gem Devise](https://github.com/heartcombo/devise), то вам необходимо реализовать в
+application_controller.rb методы `current_user` для получения текущего пользователя, `user_signed_in?` для проверки
+авторизован ли посетитель на вашем сайте и `new_user_session_path` для получения пути к странице авторизции.
 
 Вы можете изменять `timeout`, `open_timeout`, `faraday_adapter`, `proxy`, `symbolize_keys`, `logger`, и `debug`:
 
@@ -298,7 +348,7 @@ p(response.body)
 ```ruby
 body = [
   {
-    source_name: "ОАО Коспромсервис",
+    source_name: "ООО Деппа",
     source_uid: "a1fee7c0fc436088e64ba2e8822ba2b3",
     created_at: 1510261200,
     _embedded: {
@@ -315,7 +365,7 @@ body = [
       ],
       companies: [
         {
-          name: "ОАО Коспромсервис"
+          name: "ООО Деппа"
         }
       ]
     },
@@ -324,7 +374,7 @@ body = [
       uniq: "a1fe231cc88e64ba2e8822ba2b3ewrw",
       duration: 54,
       service_code: "CkAvbEwPam6sad",
-      link: "https://example.com",
+      link: "https://deppa.ru",
       phone: 79998888888,
       called_at: 1510261200,
       from: "onlinePBX"
@@ -339,7 +389,7 @@ p(response.body)
 ```ruby
 body = [
   {
-    source_name: "ОАО Коспромсервис",
+    source_name: "ООО Деппа",
     source_uid: "a1fee7c0fc436088e64ba2e8822ba2b3",
     created_at: 1590830520,
     _embedded: {
@@ -376,7 +426,7 @@ body = [
       ],
       companies: [
         {
-          name: "ОАО Коспромсервис"
+          name: "ООО Деппа"
         }
       ]
     },
@@ -385,7 +435,7 @@ body = [
       form_id: "a1fee7c0fc436088e64ba2e8822ba2b3ewrw",
       form_sent_at: 1590830520,
       form_name: "Форма заявки для полёта в космос",
-      form_page: "https://example.com",
+      form_page: "https://deppa.ru",
       referer: "https://www.google.com/search?&q=elon+musk"
     }
   }
@@ -561,7 +611,7 @@ contacts = response.body[:_embedded][:contacts]
 ```ruby
 params = {
   filter: { 
-    name: "ОАО Коспромсервис"
+    name: "ООО Деппа"
   }
 }
 response = AmocrmRails::Request.companies.retrieve(params: params)
@@ -1376,21 +1426,21 @@ tag_id = tags.first[:id]
 ### <a name="add_tags_to_entity"></a> [Добавление тегов к сущности](https://www.amocrm.ru/developers/content/crm_platform/tags-api#add-tags-to-entity)
 ```ruby
 body_item = {
-  "_embedded": {
-    "tags": [
+  _embedded: {
+    tags: [
       {
-        "id": tag_id
+        id: tag_id
       }
     ]
   }
 }
 body = [
   {
-    "id": object_id,
-    "_embedded": {
-      "tags": [
+    id: object_id,
+    _embedded: {
+      tags: [
         {
-          "id": tag_id
+          id: tag_id
         }
       ]
     }
@@ -1417,15 +1467,15 @@ AmocrmRails::Request.contacts(customer_id).update(body: body_item)
 
 ```ruby
 body_item = {
-  "_embedded": {
-    "tags": nil
+  _embedded: {
+    tags: nil
   }
 }
 body = [
   {
-    "id": object_id,
-    "_embedded": {
-      "tags": nil
+    id: object_id,
+    _embedded: {
+      tags: nil
     }
   }
 ]
@@ -1591,7 +1641,7 @@ body = [
       uniq: "8f52d38a-5fb3-406d-93a3-a4832dc28f8b",
       duration: 60,
       source: "onlinePBX",
-      link: "https://example.com",
+      link: "https://deppa.ru",
       phone: "+79999999999"
     }
   },
@@ -1602,7 +1652,7 @@ body = [
       uniq: "8f52d38a-5fb3-406d-93a3-a4832dc28f8b",
       duration: 60,
       source: "onlinePBX",
-      link: "https://example.com",
+      link: "https://deppa.ru",
       phone: "+79999999999"
     }
   },
@@ -1624,7 +1674,7 @@ body_item = {
     uniq: "8f52d38a-5fb3-406d-93a3-a4832dc28f8b",
     duration: 60,
     source: "onlinePBX",
-    link: "https://example.com",
+    link: "https://deppa.ru",
     phone: "+79999999999"
   }
 }
@@ -1662,7 +1712,7 @@ body = [
       uniq: "8f52d38a-5fb3-406d-93a3-a4832dc28f8b",
       duration: 60,
       source: "onlinePBX",
-      link: "https://example.com",
+      link: "https://deppa.ru",
       phone: "+79999999999"
     }
   },
@@ -1673,7 +1723,7 @@ body = [
       uniq: "8f52d38a-5fb3-406d-93a3-a4832dc28f8b",
       duration: 60,
       source: "onlinePBX",
-      link: "https://example.com",
+      link: "https://deppa.ru",
       phone: "+79999999999"
     }
   },
@@ -1695,7 +1745,7 @@ body_item = {
     uniq: "8f52d38a-5fb3-406d-93a3-a4832dc28f8b",
     duration: 60,
     source: "onlinePBX",
-    link: "https://example.com",
+    link: "https://deppa.ru",
     phone: "+79999999999"
   }
 }
@@ -1858,7 +1908,6 @@ response = AmocrmRails::Request.customers.transactions(transaction_id).delete
 p(response.body)
 ```
 ### <a name="customer_bonus_points_update"></a> [Списание/начисление бонусных баллов покупателю](https://www.amocrm.ru/developers/content/crm_platform/customers-api#customer–bonus-points-update)
-
 ```ruby
 body = {
   earn: 500
@@ -1876,48 +1925,362 @@ status_id = statuses.first[:id]
 ### <a name="customers_statuses_detail"></a> [Получение статуса покупателей по ID](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#customer-status-detail)
 ```ruby
 response = AmocrmRails::Request.customers.statuses(status_id).retrieve
+status = response.body
+```
+### <a name="customers_statuses_add"></a> [Добавление статусов в воронку](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#customers-statuses-add)
+```ruby
+body = [
+  {
+    name: "Новый статус",
+    sort: 100,
+    color: "#fffeb2"
+  },
+  {
+    name: "Новый статус 2",
+    sort: 200,
+    color: "#fffeb2"
+  }
+]
+response = AmocrmRails::Request.customers.statuses.create(body: body)
+p(response.body)
 statuses = response.body[:_embedded][:statuses]
 status_id = statuses.first[:id]
 ```
-### <a name="customers_statuses_add"></a> [Добавление статусов в воронку](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#customers-statuses-add)
 ### <a name="customers_statuses_edit"></a> [Редактирование статуса покупателей](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#customers-status-edit)
+```ruby
+body = {
+  name: "Новое название для статуса",
+  color: "#c1e0ff"
+}
+response = AmocrmRails::Request.customers.statuses(status_id).update(body: body)
+customer = response.body
+```
 ### <a name="customer_status_delete"></a> [Удаление статуса покупателей](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#customer-status-delete)
+```ruby
+AmocrmRails::Request.customers.statuses(status_id).delete
+```
 ### <a name="segments_list"></a> [Список сегментов покупателей](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#segments-list)
+```ruby
+response = AmocrmRails::Request.customers.segments
+segments = response.body[:_embedded][:segments]
+segment_id = segments.first[:id]
+```
 ### <a name="segments_detail"></a> [Получение сегмента покупателей по ID](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#segment-detail)
+```ruby
+response = AmocrmRails::Request.customers.segments(segment_id).retrieve
+segment = response.body
+```
 ### <a name="segments_add"></a> [Добавление сегмента покупателей](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#segment-add)
+```ruby
+body = {
+  name: "Сегмент для примера",
+  color: "ae003f"
+}
+response = AmocrmRails::Request.customers.segments.create(body: body)
+p(response.body)
+segment = response.body
+segment_id = segment[:id]
+```
 ### <a name="segments_edit"></a> [Редактирование сегмента покупателей](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#segment-edit)
+```ruby
+body = {
+  name: "Новое имя для сегмента",
+  color: "ae003f"
+}
+response = AmocrmRails::Request.customers.segments(segment_id).update(body: body)
+segment = response.body
+```
 ### <a name="segment_delete"></a> [Удаление сегмента покупателей](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#segment-delete)
+```ruby
+AmocrmRails::Request.customers.segments(segment_id).delete
+```
 ### <a name="customers_statuses_colors"></a> [Доступные цвета статусов](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#customers-statuses-colors)
 ### <a name="customers_statuses_colors"></a> [Доступные цвета сегментов](https://www.amocrm.ru/developers/content/crm_platform/customers-statuses-api#segments-colors)
 
 ## <a name="users"></a> [Пользователи](https://www.amocrm.ru/developers/content/crm_platform/users-api)
 ### <a name="users_list"></a> [Список пользователей](https://www.amocrm.ru/developers/content/crm_platform/users-api#users-list)
+```ruby
+params = {
+  with: 'group',
+  page: 0,
+  limit: 10
+}
+response = AmocrmRails::Request.users.retrieve
+users = response.body[:_embedded][:users]
+user_id = users.first[:id]
+```
 ### <a name="users_detail"></a> [Получение пользователя по ID](https://www.amocrm.ru/developers/content/crm_platform/users-api#user-detail)
+```ruby
+params = {
+  with: 'group'
+}
+response = AmocrmRails::Request.users(user_id).retrieve(params: params)
+user = response.body
+user_id = user[:id]
+```
 ### <a name="users_add"></a> [Добавление пользователей](https://www.amocrm.ru/developers/content/crm_platform/users-api#users-add)
+```ruby
+body = [
+  {
+    name: "Павел Осетров",
+    email: 'pavel.osetrov@me.com'
+  }
+]
+response = AmocrmRails::Request.users.create(body: body)
+p(response.body)
+users = response.body[:_embedded][:users]
+user_id = users.first[:id]
+```
 ### <a name="roles_list"></a> [Список ролей пользователей](https://www.amocrm.ru/developers/content/crm_platform/users-api#roles-list)
+```ruby
+params = {
+  with: 'users',
+  page: 0,
+  limit: 10
+}
+response = AmocrmRails::Request.roles.retrieve
+roles = response.body[:_embedded][:roles]
+role_id = roles.first[:id]
+```
 ### <a name="roles_detail"></a> [Получение роли по ID](https://www.amocrm.ru/developers/content/crm_platform/users-api#role-detail)
+```ruby
+params = {
+  with: 'users'
+}
+response = AmocrmRails::Request.roles(role_id).retrieve(params: params)
+role = response.body
+role_id = user[:id]
+```
 ### <a name="roles_add"></a> [Добавление ролей](https://www.amocrm.ru/developers/content/crm_platform/users-api#roles-add)
+```ruby
+body = [
+  {
+    name: "role 3",
+    rights: {
+      leads: {
+        add: "A",
+        edit: "G",
+        view: "G",
+        delete: "G",
+        export: "G"
+      },
+      tasks: {
+        edit: "A",
+        delete: "A"
+      },
+      contacts: {
+        add: "A",
+        edit: "A",
+        view: "A",
+        delete: "A",
+        export: "A"
+      },
+      companies: {
+        add: "A",
+        edit: "A",
+        view: "A",
+        delete: "A",
+        export: "A"
+      },
+      mail_access: true,
+      status_rights: [
+        {
+          entity_type: "leads",
+          pipeline_id: 16056,
+          status_id: 20542166,
+          rights: {
+            edit: "A",
+            view: "A",
+            delete: "A",
+            export: "A"
+          }
+        }
+      ],
+      catalog_access: true
+    }
+  }
+]
+response = AmocrmRails::Request.roles.create(body: body)
+p(response.body)
+roles = response.body[:_embedded][:roles]
+role_id = roles.first[:id]
+```
 ### <a name="roles_edit"></a> [Редактирование роли](https://www.amocrm.ru/developers/content/crm_platform/users-api#role-edit)
+```ruby
+body = {
+  name: "role 3 modified",
+  rights: {
+    contacts: {
+      add: "A",
+      edit: "D",
+      view: "D",
+      delete: "D",
+      export: "D"
+    },
+    status_rights: nil
+  }
+}
+response = AmocrmRails::Request.roles(role_id).update(body: body)
+role = response.body
+```
+
 ### <a name="roles_delete"></a> [Удаление роли](https://www.amocrm.ru/developers/content/crm_platform/users-api#role-delete)
+```ruby
+AmocrmRails::Request.roles(role_id).delete
+```
 ### <a name="users_common_rights"></a> [Общие обозначения прав пользователей](https://www.amocrm.ru/developers/content/crm_platform/users-api#common-rights)
 ### <a name="users_rights_dependence"></a> [Зависимости прав пользователей](https://www.amocrm.ru/developers/content/crm_platform/users-api#rights-dependence)
 
 ## <a name="products"></a> [Товары](https://www.amocrm.ru/developers/content/crm_platform/products-api)
 ## <a name="webhooks"></a> [Вебхуки](https://www.amocrm.ru/developers/content/crm_platform/webhooks-api)
 ### <a name="webhooks_list"></a> [Список установленных вебхуков в аккаунте](https://www.amocrm.ru/developers/content/crm_platform/webhooks-api#webhooks-list)
+```ruby
+response = AmocrmRails::Request.webhooks.retrieve
+webhooks = response.body[:_embedded][:webhooks]
+webhook_id = webhooks.first[:id]
+```
 ### <a name="webhooks_subscribe"></a> [Подписка на вебхук](https://www.amocrm.ru/developers/content/crm_platform/webhooks-api#webhook-subscribe)
+```ruby
+body = {
+  destination: "https://deppa.ru",
+  settings: [
+    "add_lead"
+  ],
+  sort: 10
+}
+response = AmocrmRails::Request.webhooks.create(body: body)
+p(response.body)
+webhook = response.body
+webhook_id = webhook[:id]
+```
 ### <a name="webhooks_delete"></a> [Отписка от событий](https://www.amocrm.ru/developers/content/crm_platform/webhooks-api#webhooks-delete)
+```ruby
+AmocrmRails::Request.webhooks(webhook_id).delete
+```
 ### <a name="webhooks_available_actions"></a> [Возможные событий](https://www.amocrm.ru/developers/content/crm_platform/webhooks-api#webhooks-available-actions)
 
 ## <a name="widgets"></a> [Виджеты](https://www.amocrm.ru/developers/content/crm_platform/widgets-api)
 ### <a name="widgets_list"></a> [Список виджетов](https://www.amocrm.ru/developers/content/crm_platform/widgets-api#widgets-list)
+```ruby
+params = {
+  page: 0,
+  limit: 10
+}
+response = AmocrmRails::Request.widgets.retrieve
+widgets = response.body[:_embedded][:widgets]
+widget_code = widgets.first[:code]
+```
 ### <a name="widgets_detail"></a> [Информация о виджете по его коду](https://www.amocrm.ru/developers/content/crm_platform/widgets-api#widget-detail)
+```ruby
+response = AmocrmRails::Request.widgets(widget_code).retrieve
+widget = response.body
+```
 ### <a name="widgets_install"></a> [Установка виджета в аккаунт](https://www.amocrm.ru/developers/content/crm_platform/widgets-api#widget-install)
+```ruby
+body = {
+  login: "example",
+  password: "eXaMp1E",
+  script_path: "https://deppa.ru/"
+}
+response = AmocrmRails::Request.widgets.create(body: body)
+p(response.body)
+widget = response.body
+```
 ### <a name="widgets_uninstall"></a> [Удаление установки виджета](https://www.amocrm.ru/developers/content/crm_platform/widgets-api#widget-uninstall)
+```ruby
+AmocrmRails::Request.widgets(widget_code).delete
+```
 ### <a name="widgets_continue"></a> [Подтверждение выполнения блока виджета в Salesbot](https://www.amocrm.ru/developers/content/crm_platform/widgets-api#widget-continue)
-
+```ruby
+body = {
+  data: {
+    status: "success"
+  },
+  execute_handlers: [
+    {
+      handler: "show",
+      params: {
+        type: "text",
+        value: "Здесь текст"
+      }
+    },
+    {
+      handler: "show",
+      params: {
+        type: "buttons",
+        value: "Нажми на кнопку",
+        buttons: [
+          "1ая кнопка",
+          "2ая кнопка",
+          "3ая кнопка",
+          "4ая кнопка"
+        ]
+      }
+    },
+    {
+      handler: "show",
+      params: {
+        type: "buttons_url",
+        value: "Кнопки со ссылками",
+        buttons: [
+          "https://amocrm.ru",
+          "https://deppa.ru"
+        ]
+      }
+    },
+    {
+      handler: "goto",
+      params: {
+        type: "question|answer|finish",
+        step: 5
+      }
+    }
+  ]
+}
+AmocrmRails::Request.salesbot(bot_id).continue(continue_id).create(body: body)
+AmocrmRails::Request.marketingbot(bot_id).continue(continue_id).create(body: body)
+```
 ## <a name="calls"></a> [Добавление звонков](https://www.amocrm.ru/developers/content/crm_platform/calls-api)
-
+```ruby
+body = [
+  {
+    duration: 10,
+    source: "example_integration",
+    phone: "123123",
+    link: "https://deppa.ru/audio.mp3",
+    direction: "inbound",
+    call_result: "Успешный разговор",
+    call_status: 4
+  }
+]
+response = AmocrmRails::Request.calls.create(body: body)
+p(response.body)
+calls = response.body[:_embedded][:calls]
+```
 ## <a name="salesbot"></a> [Salebot](https://www.amocrm.ru/developers/content/api/salesbot-api)
-
+```ruby
+body = [
+  {
+    bot_id: 565,
+    entity_id: 76687686,
+    entity_type: 1
+  }
+]
+response = AmocrmRails::Request.salesbot.run.create(body: body)
+p(response.body)
+```
 ## <a name="short_links"></a> [Короткие ссылки](https://www.amocrm.ru/developers/content/crm_platform/short_links)
+```ruby
+body = [
+  {
+    url:"https://deppa.ru",
+    metadata:{
+      entity_type:"contacts",
+      entity_id:11070881
+    }
+  }
+]
+response = AmocrmRails::Request.short_links.create(body: body)
+p(response.body)
+short_links = response.body[:_embedded][:short_links]
+```

data/lib/amocrm-rails.rb

@@ -2,11 +2,17 @@ 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)
-      refresh_token ||= AmocrmRails.try(:refresh_token)
+    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,
@@ -30,12 +36,20 @@ module AmocrmRails
         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.refresh_token.present?
-        AmocrmRails.generate_access_token(client_id, client_secret, AmocrmRails.refresh_token, count+1)
+        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.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/devise/app/controllers/amocrm_controller.rb

@@ -0,0 +1,33 @@
+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]
+  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,6 @@
+<div style="width: 100%; padding: 100px; text-align: center;">
+  Your code:
+  <code>
+    <%= @code %>
+  </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.5
+  version: 0.0.6
 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