amocrm-rails 0.0.6 → 0.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.markdown +2 -2
- data/lib/amocrm-rails.rb +2 -1
- data/lib/generators/amocrm_rails/install/templates/amocrm.rb +3 -3
- data/lib/generators/amocrm_rails/install/templates/devise/app/controllers/amocrm_controller.rb +5 -1
- data/lib/generators/amocrm_rails/install/templates/devise/app/views/amocrm/code.html.erb +5 -0
- data/lib/generators/amocrm_rails/install/templates/devise/config/amocrm.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 24b56ed99f1db6e8b323b9fc228bb04be8e514b02a60d47bbe300251e8b58e24
|
4
|
+
data.tar.gz: 2b4bf6cd8bc6e85f65ab0a18413f6b68b6c6687533508ea7d71ca1a13ea66731
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dac56a60cf1309221623915c78100e17072d7e50671b5eda5d8f35f96a503912f23dc1580ba3812896f00476eba99c29ccf4510d235b9dc8b210a6d2d8e2a1be
|
7
|
+
data.tar.gz: e6d0ccf3d2e5b6c0f313a1cc679cbf02a0b724f70e3a8a5a53631b658a2c54b7ee6bce7cc9d9ef208bb6953db6d6ce8820df0382849232358767f9c24c56d771
|
data/README.markdown
CHANGED
@@ -212,9 +212,9 @@ https://yourdomain/amocrm/link
|
|
212
212
|
|
213
213
|
После вы будуте перенаправлены на страницу https://yourdomain.com/amocrm
|
214
214
|
|
215
|
-
![alt Страница с кнопкой](https://storage.deppa.ru/uploads/
|
215
|
+
![alt Страница с кнопкой](https://storage.deppa.ru/uploads/amo_code_and_account.png)
|
216
216
|
|
217
|
-
Если вы увидили код - всё в порядке, копировать код нет необходимости, страницу можно закрыть.
|
217
|
+
Если вы увидили код и информацию об аккаунте - всё в порядке, копировать код нет необходимости, страницу можно закрыть.
|
218
218
|
|
219
219
|
Если вы не используете [gem Devise](https://github.com/heartcombo/devise), то вам необходимо реализовать в
|
220
220
|
application_controller.rb методы `current_user` для получения текущего пользователя, `user_signed_in?` для проверки
|
data/lib/amocrm-rails.rb
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
require 'faraday'
|
1
2
|
require 'amocrm-rails/amocrm_error'
|
2
3
|
require 'amocrm-rails/request'
|
3
4
|
require 'amocrm-rails/api_request'
|
@@ -45,7 +46,7 @@ module AmocrmRails
|
|
45
46
|
AmocrmRails::register(k.underscore.to_sym, v)
|
46
47
|
end
|
47
48
|
File.open("config/amocrm_token.yml", 'w') { |f| YAML.dump(data, f) }
|
48
|
-
elsif count < 3 && AmocrmRails.refresh_token.present?
|
49
|
+
elsif count < 3 && AmocrmRails.try(:refresh_token).present?
|
49
50
|
AmocrmRails.generate_access_token(client_id: client_id,
|
50
51
|
client_secret: client_secret,
|
51
52
|
refresh_token:AmocrmRails.refresh_token,
|
@@ -1,17 +1,17 @@
|
|
1
|
-
require 'amocrm'
|
1
|
+
require 'amocrm-rails'
|
2
2
|
|
3
3
|
AmocrmRails.setup do |config|
|
4
4
|
if File.exist?('config/amocrm.yml')
|
5
5
|
processed = YAML.load_file('config/amocrm.yml')[Rails.env]
|
6
6
|
|
7
7
|
processed.each do |k, v|
|
8
|
-
config::register k.underscore.to_sym, v
|
8
|
+
config::register k.to_s.underscore.to_sym, v
|
9
9
|
end
|
10
10
|
|
11
11
|
if File.exist?('config/amocrm_token.yml')
|
12
12
|
token_data = YAML.load_file("config/amocrm_token.yml")
|
13
13
|
token_data.each do |k, v|
|
14
|
-
config::register k.underscore.to_sym, v
|
14
|
+
config::register k.to_s.underscore.to_sym, v
|
15
15
|
end
|
16
16
|
end
|
17
17
|
|
data/lib/generators/amocrm_rails/install/templates/devise/app/controllers/amocrm_controller.rb
CHANGED
@@ -11,12 +11,16 @@ class AmocrmController < ApplicationController
|
|
11
11
|
data[Rails.env][current_user.id] = {} if data[Rails.env][current_user.id].nil?
|
12
12
|
params.each do |k, v|
|
13
13
|
data[Rails.env][current_user.id][k] = v
|
14
|
-
AmocrmRails::register k.underscore.to_sym, v
|
14
|
+
AmocrmRails::register k.to_s.underscore.to_sym, v
|
15
15
|
end
|
16
16
|
File.open("config/amocrm.yml", 'w') { |f| YAML.dump(data, f) }
|
17
17
|
end
|
18
18
|
end
|
19
19
|
@code = params[:code]
|
20
|
+
response = AmocrmRails::Request.account.retrieve(params: {
|
21
|
+
with: 'amojo_id,amojo_rights,users_groups,task_types,version,entity_names,datetime_settings'
|
22
|
+
})
|
23
|
+
@account = response.body
|
20
24
|
end
|
21
25
|
|
22
26
|
def webhook
|
@@ -1,11 +1,11 @@
|
|
1
|
-
require 'amocrm'
|
1
|
+
require 'amocrm-rails'
|
2
2
|
|
3
3
|
AmocrmRails.setup do |config|
|
4
4
|
if File.exist?('config/amocrm.yml')
|
5
5
|
processed = YAML.load_file('config/amocrm.yml')[Rails.env]
|
6
6
|
|
7
7
|
processed.each do |k, v|
|
8
|
-
config::register k.underscore.to_sym, v
|
8
|
+
config::register k.to_s.underscore.to_sym, v
|
9
9
|
end
|
10
10
|
|
11
11
|
config::Request.timeout = 60
|