campact_user_service 4.3.2 → 4.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.ruby-version +1 -1
- data/CHANGELOG.md +8 -0
- data/Gemfile +2 -2
- data/VERSION +1 -1
- data/lib/campact_user_service/client.rb +3 -24
- metadata +13 -21
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0ae6682d72d0f82ab541e2a7c4e34867803061234c2070c559e7b24897286822
|
|
4
|
+
data.tar.gz: 5f355511f0aa925d5930856e7bb90f746e584b5ad837025093499b5d56bfaf39
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7543a883e7de24c2047b57dfbaa3b54691bf8914fcfa63df90fe52e88bb353f1d5a4c974f5258192f4d8bb8de51663a3f546b2f68a2d2179a0faaca61e2d311f
|
|
7
|
+
data.tar.gz: 05be71df422f33315daeef31901a1f57962a0040bdfa39e3b327d979a88955cdf283ed7f1219673bc903fd03c45f43f016929700c241371ab54c7f99fb530dc5
|
data/.ruby-version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
4.0.
|
|
1
|
+
4.0.9
|
data/CHANGELOG.md
CHANGED
data/Gemfile
CHANGED
|
@@ -2,7 +2,7 @@ source "https://rubygems.org"
|
|
|
2
2
|
|
|
3
3
|
gem 'rotp', '~> 6'
|
|
4
4
|
gem 'faraday', '~> 2.14'
|
|
5
|
-
gem 'json', '
|
|
5
|
+
gem 'json', '>= 2.1', '< 4'
|
|
6
6
|
|
|
7
7
|
group :development do
|
|
8
8
|
gem 'rake'
|
|
@@ -11,7 +11,7 @@ group :development do
|
|
|
11
11
|
gem 'shoulda', '>= 0'
|
|
12
12
|
gem 'webmock', '>= 0'
|
|
13
13
|
gem 'rdoc', '~> 6.0', '>= 6.0.4'
|
|
14
|
-
gem 'simplecov', '
|
|
14
|
+
gem 'simplecov', '~> 0.22'
|
|
15
15
|
gem 'pry-byebug', '~> 3.6'
|
|
16
16
|
gem 'faraday-detailed_logger', '~> 2.1', '>= 2.1.2'
|
|
17
17
|
gem 'rubocop'
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
4.3.
|
|
1
|
+
4.3.4
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
require 'faraday'
|
|
2
2
|
require 'json'
|
|
3
|
-
require 'rotp'
|
|
4
3
|
require 'campact_user_service/response_error'
|
|
5
4
|
|
|
6
5
|
module CampactUserService
|
|
@@ -8,18 +7,19 @@ module CampactUserService
|
|
|
8
7
|
TIMEOUT = 60.freeze
|
|
9
8
|
OPEN_TIMEOUT = 20.freeze
|
|
10
9
|
|
|
11
|
-
attr_reader :connection, :host, :port, :
|
|
10
|
+
attr_reader :connection, :host, :port, :basic_auth
|
|
12
11
|
|
|
13
12
|
def initialize(options)
|
|
14
13
|
@host = options.fetch(:host)
|
|
15
14
|
@port = options[:port]
|
|
16
|
-
@
|
|
15
|
+
@basic_auth = options[:basic_auth]
|
|
17
16
|
faraday_options = default_faraday_options.merge(options.delete(:faraday) || {})
|
|
18
17
|
adapter = faraday_options.delete(:adapter) || Faraday.default_adapter
|
|
19
18
|
|
|
20
19
|
@connection = Faraday.new(endpoint, faraday_options) do |faraday|
|
|
21
20
|
faraday.adapter adapter
|
|
22
21
|
faraday.request :json
|
|
22
|
+
faraday.request :authorization, :basic, basic_auth[:user], basic_auth[:password] if basic_auth
|
|
23
23
|
end
|
|
24
24
|
end
|
|
25
25
|
|
|
@@ -44,9 +44,6 @@ module CampactUserService
|
|
|
44
44
|
req.body = options[:body]
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
-
if topt_authorization
|
|
48
|
-
req.headers['authorization'] = authorization(topt_authorization)
|
|
49
|
-
end
|
|
50
47
|
end
|
|
51
48
|
|
|
52
49
|
case response.status
|
|
@@ -93,23 +90,5 @@ module CampactUserService
|
|
|
93
90
|
end
|
|
94
91
|
end
|
|
95
92
|
|
|
96
|
-
def authorization(totp_options)
|
|
97
|
-
user = totp_options.fetch(:user)
|
|
98
|
-
secret = totp_options.fetch(:secret)
|
|
99
|
-
|
|
100
|
-
token = [user, auth_pass(secret)].join(':')
|
|
101
|
-
|
|
102
|
-
"Token #{token}"
|
|
103
|
-
end
|
|
104
|
-
|
|
105
|
-
def auth_pass(secret)
|
|
106
|
-
totp_secret = ROTP::Base32.encode(secret)
|
|
107
|
-
|
|
108
|
-
ROTP::TOTP.new(totp_secret, {
|
|
109
|
-
digest: 'sha256',
|
|
110
|
-
digits: 8,
|
|
111
|
-
interval: 30
|
|
112
|
-
}).now
|
|
113
|
-
end
|
|
114
93
|
end
|
|
115
94
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: campact_user_service
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.3.
|
|
4
|
+
version: 4.3.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- ControlShift
|
|
@@ -27,30 +27,22 @@ dependencies:
|
|
|
27
27
|
name: json
|
|
28
28
|
requirement: !ruby/object:Gem::Requirement
|
|
29
29
|
requirements:
|
|
30
|
-
- - "
|
|
30
|
+
- - ">="
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
32
|
version: '2.1'
|
|
33
|
+
- - "<"
|
|
34
|
+
- !ruby/object:Gem::Version
|
|
35
|
+
version: '4'
|
|
33
36
|
type: :runtime
|
|
34
37
|
prerelease: false
|
|
35
38
|
version_requirements: !ruby/object:Gem::Requirement
|
|
36
39
|
requirements:
|
|
37
|
-
- - "
|
|
40
|
+
- - ">="
|
|
38
41
|
- !ruby/object:Gem::Version
|
|
39
42
|
version: '2.1'
|
|
40
|
-
-
|
|
41
|
-
name: rotp
|
|
42
|
-
requirement: !ruby/object:Gem::Requirement
|
|
43
|
-
requirements:
|
|
44
|
-
- - "~>"
|
|
43
|
+
- - "<"
|
|
45
44
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: '
|
|
47
|
-
type: :runtime
|
|
48
|
-
prerelease: false
|
|
49
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
50
|
-
requirements:
|
|
51
|
-
- - "~>"
|
|
52
|
-
- !ruby/object:Gem::Version
|
|
53
|
-
version: '6'
|
|
45
|
+
version: '4'
|
|
54
46
|
- !ruby/object:Gem::Dependency
|
|
55
47
|
name: byebug
|
|
56
48
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -167,16 +159,16 @@ dependencies:
|
|
|
167
159
|
name: simplecov
|
|
168
160
|
requirement: !ruby/object:Gem::Requirement
|
|
169
161
|
requirements:
|
|
170
|
-
- -
|
|
162
|
+
- - "~>"
|
|
171
163
|
- !ruby/object:Gem::Version
|
|
172
|
-
version: 0.
|
|
164
|
+
version: '0.22'
|
|
173
165
|
type: :development
|
|
174
166
|
prerelease: false
|
|
175
167
|
version_requirements: !ruby/object:Gem::Requirement
|
|
176
168
|
requirements:
|
|
177
|
-
- -
|
|
169
|
+
- - "~>"
|
|
178
170
|
- !ruby/object:Gem::Version
|
|
179
|
-
version: 0.
|
|
171
|
+
version: '0.22'
|
|
180
172
|
- !ruby/object:Gem::Dependency
|
|
181
173
|
name: webmock
|
|
182
174
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -235,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
235
227
|
- !ruby/object:Gem::Version
|
|
236
228
|
version: '0'
|
|
237
229
|
requirements: []
|
|
238
|
-
rubygems_version: 4.0.
|
|
230
|
+
rubygems_version: 4.0.20
|
|
239
231
|
specification_version: 4
|
|
240
232
|
summary: Ruby wrapper for Campact User Service
|
|
241
233
|
test_files: []
|