campact_user_service 3.0.0 → 4.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +24 -0
- data/.ruby-version +1 -1
- data/Gemfile +1 -2
- data/README.md +1 -1
- data/VERSION +1 -1
- data/campact_user_service.gemspec +9 -11
- data/lib/campact_user_service/account.rb +1 -1
- data/lib/campact_user_service/client.rb +3 -3
- data/spec/account_spec.rb +1 -1
- data/spec/client_spec.rb +5 -5
- metadata +8 -34
- data/.travis.yml +0 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 558b63f52138a71633f121ad7418b8903c7c781bea38c6f17cee3eb3ff168573
|
4
|
+
data.tar.gz: f031af26c529fadfa0b2a8c0223154fa66624d2630e82c0bf7dd3d9f261ac671
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 40e314a23b014f000e2b2039c82e8bb669f640b32dd05731ec0cca583b94867d306da6d7f2e3d3cc97f05a38c84cb39ee7a189a57aca187389c5c4ca30f1f7a2
|
7
|
+
data.tar.gz: 8b01531c1d7507181cb23fc5518f40f1b7528f1e0d8e9b8a983442806e7e2c608e3d6712706499c4697cb2c0aa678843de6392860a7c59ef3e8c31c56331e84a
|
@@ -0,0 +1,24 @@
|
|
1
|
+
name: CI
|
2
|
+
on: [push]
|
3
|
+
|
4
|
+
jobs:
|
5
|
+
test:
|
6
|
+
runs-on: ubuntu-latest
|
7
|
+
steps:
|
8
|
+
- uses: actions/checkout@v2
|
9
|
+
- uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
|
10
|
+
with:
|
11
|
+
ruby-version: 2.7
|
12
|
+
bundler-cache: true
|
13
|
+
- run: bundle install
|
14
|
+
- run: bundle exec rspec
|
15
|
+
rubocop:
|
16
|
+
runs-on: ubuntu-latest
|
17
|
+
steps:
|
18
|
+
- uses: actions/checkout@v2
|
19
|
+
- uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
|
20
|
+
with:
|
21
|
+
ruby-version: 2.7
|
22
|
+
bundler-cache: true
|
23
|
+
- run: bundle install
|
24
|
+
- run: bundle exec rubocop
|
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.
|
1
|
+
2.7.5
|
data/Gemfile
CHANGED
data/README.md
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
# campact-user-service
|
2
|
-
[![
|
2
|
+
[![CI Status](https://github.com/controlshift/campact-user-service/actions/workflows/ci.yml/badge.svg)](https://github.com/controlshift/campact-user-service/actions/workflows/ci.yml)
|
3
3
|
|
4
4
|
a ruby gem that wraps the Campact user service API
|
5
5
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
4.0.0
|
@@ -2,16 +2,16 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: campact_user_service
|
5
|
+
# stub: campact_user_service 4.0.0 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "campact_user_service".freeze
|
9
|
-
s.version = "
|
9
|
+
s.version = "4.0.0"
|
10
10
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib".freeze]
|
13
13
|
s.authors = ["ControlShift".freeze]
|
14
|
-
s.date = "
|
14
|
+
s.date = "2021-12-16"
|
15
15
|
s.description = "Ruby wrapper for Campact User Service".freeze
|
16
16
|
s.email = "hello@controlshiftlabs.com".freeze
|
17
17
|
s.extra_rdoc_files = [
|
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
|
|
19
19
|
"README.md"
|
20
20
|
]
|
21
21
|
s.files = [
|
22
|
+
".github/workflows/ci.yml",
|
22
23
|
".rubocop.yml",
|
23
24
|
".ruby-gemset",
|
24
25
|
".ruby-version",
|
25
|
-
".travis.yml",
|
26
26
|
"Gemfile",
|
27
27
|
"LICENSE",
|
28
28
|
"README.md",
|
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
|
|
43
43
|
]
|
44
44
|
s.homepage = "http://github.com/controlshift/campact_user_service".freeze
|
45
45
|
s.licenses = ["MIT".freeze]
|
46
|
-
s.rubygems_version = "3.1.
|
46
|
+
s.rubygems_version = "3.1.6".freeze
|
47
47
|
s.summary = "Ruby wrapper for Campact User Service".freeze
|
48
48
|
|
49
49
|
if s.respond_to? :specification_version then
|
@@ -51,9 +51,8 @@ Gem::Specification.new do |s|
|
|
51
51
|
end
|
52
52
|
|
53
53
|
if s.respond_to? :add_runtime_dependency then
|
54
|
-
s.add_runtime_dependency(%q<
|
55
|
-
s.add_runtime_dependency(%q<
|
56
|
-
s.add_runtime_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
|
54
|
+
s.add_runtime_dependency(%q<rotp>.freeze, ["~> 6"])
|
55
|
+
s.add_runtime_dependency(%q<faraday>.freeze, ["~> 1.0"])
|
57
56
|
s.add_runtime_dependency(%q<json>.freeze, ["~> 2.1"])
|
58
57
|
s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
|
59
58
|
s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
|
@@ -66,9 +65,8 @@ Gem::Specification.new do |s|
|
|
66
65
|
s.add_development_dependency(%q<faraday-detailed_logger>.freeze, ["~> 2.1", ">= 2.1.2"])
|
67
66
|
s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
|
68
67
|
else
|
69
|
-
s.add_dependency(%q<
|
70
|
-
s.add_dependency(%q<
|
71
|
-
s.add_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
|
68
|
+
s.add_dependency(%q<rotp>.freeze, ["~> 6"])
|
69
|
+
s.add_dependency(%q<faraday>.freeze, ["~> 1.0"])
|
72
70
|
s.add_dependency(%q<json>.freeze, ["~> 2.1"])
|
73
71
|
s.add_dependency(%q<byebug>.freeze, [">= 0"])
|
74
72
|
s.add_dependency(%q<rspec>.freeze, [">= 0"])
|
@@ -1,12 +1,12 @@
|
|
1
1
|
require 'faraday'
|
2
2
|
require 'json'
|
3
|
-
require 'base32'
|
4
3
|
require 'rotp'
|
5
4
|
require 'campact_user_service/response_error'
|
6
5
|
|
7
6
|
module CampactUserService
|
8
7
|
class Client
|
9
|
-
TIMEOUT =
|
8
|
+
TIMEOUT = 60.freeze
|
9
|
+
OPEN_TIMEOUT = 20.freeze
|
10
10
|
|
11
11
|
attr_reader :connection, :host, :port, :topt_authorization
|
12
12
|
|
@@ -34,7 +34,7 @@ module CampactUserService
|
|
34
34
|
response = connection.send(verb.to_sym) do |req|
|
35
35
|
req.url path
|
36
36
|
req.options.timeout = TIMEOUT
|
37
|
-
req.options.open_timeout =
|
37
|
+
req.options.open_timeout = OPEN_TIMEOUT
|
38
38
|
if options.key?(:cookies)
|
39
39
|
req.headers['Cookie'] = format_cookies(options[:cookies])
|
40
40
|
end
|
data/spec/account_spec.rb
CHANGED
@@ -18,7 +18,7 @@ describe CampactUserService::Account do
|
|
18
18
|
it 'should return true where a valid user object is returned' do
|
19
19
|
stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
|
20
20
|
.to_return(body: {
|
21
|
-
"
|
21
|
+
"external_id": "id-123"
|
22
22
|
}.to_json)
|
23
23
|
|
24
24
|
expect(subject.exists?).to be_truthy
|
data/spec/client_spec.rb
CHANGED
@@ -53,7 +53,7 @@ describe CampactUserService::Client do
|
|
53
53
|
it 'should raise error if status code is 3xx, 4xx or 5xx' do
|
54
54
|
expect(request_builder).to receive(:url).with('/foo/bar')
|
55
55
|
expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
|
56
|
-
expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::
|
56
|
+
expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
|
57
57
|
allow(response).to receive(:status).and_return(unexpected_status_code)
|
58
58
|
allow(response).to receive(:body).and_return('An error occurred')
|
59
59
|
|
@@ -68,7 +68,7 @@ describe CampactUserService::Client do
|
|
68
68
|
it 'should return nil if status code is 404' do
|
69
69
|
expect(request_builder).to receive(:url).with('/foo/bar')
|
70
70
|
expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
|
71
|
-
expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::
|
71
|
+
expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
|
72
72
|
allow(response).to receive(:status).and_return(404)
|
73
73
|
|
74
74
|
response = subject.send(method_under_test, '/foo/bar')
|
@@ -97,7 +97,7 @@ describe CampactUserService::Client do
|
|
97
97
|
it 'should perform get request on provided path and return true if response is 204' do
|
98
98
|
expect(request_builder).to receive(:url).with('/foo/bar')
|
99
99
|
expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
|
100
|
-
expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::
|
100
|
+
expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
|
101
101
|
allow(response).to receive(:status).and_return(204)
|
102
102
|
|
103
103
|
expect(subject.get_request('/foo/bar')).to be_truthy
|
@@ -109,7 +109,7 @@ describe CampactUserService::Client do
|
|
109
109
|
before :each do
|
110
110
|
allow(request_builder).to receive(:url).with('/foo/bar')
|
111
111
|
allow(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
|
112
|
-
allow(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::
|
112
|
+
allow(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
|
113
113
|
allow(request_builder).to receive(:headers).and_return(headers_builder)
|
114
114
|
end
|
115
115
|
|
@@ -131,7 +131,7 @@ describe CampactUserService::Client do
|
|
131
131
|
allow(response).to receive(:status).and_return(200)
|
132
132
|
allow(response).to receive(:body).and_return(nil)
|
133
133
|
|
134
|
-
totp_secret = Base32.encode('shh! a secret!')
|
134
|
+
totp_secret = ROTP::Base32.encode('shh! a secret!')
|
135
135
|
|
136
136
|
totp = double
|
137
137
|
expect(totp).to receive(:now).and_return('totp_token')
|
metadata
CHANGED
@@ -1,67 +1,41 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: campact_user_service
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 4.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ControlShift
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-12-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
|
-
- !ruby/object:Gem::Dependency
|
14
|
-
name: base32
|
15
|
-
requirement: !ruby/object:Gem::Requirement
|
16
|
-
requirements:
|
17
|
-
- - "~>"
|
18
|
-
- !ruby/object:Gem::Version
|
19
|
-
version: 0.3.2
|
20
|
-
type: :runtime
|
21
|
-
prerelease: false
|
22
|
-
version_requirements: !ruby/object:Gem::Requirement
|
23
|
-
requirements:
|
24
|
-
- - "~>"
|
25
|
-
- !ruby/object:Gem::Version
|
26
|
-
version: 0.3.2
|
27
13
|
- !ruby/object:Gem::Dependency
|
28
14
|
name: rotp
|
29
15
|
requirement: !ruby/object:Gem::Requirement
|
30
16
|
requirements:
|
31
17
|
- - "~>"
|
32
18
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
34
|
-
- - ">="
|
35
|
-
- !ruby/object:Gem::Version
|
36
|
-
version: 3.3.1
|
19
|
+
version: '6'
|
37
20
|
type: :runtime
|
38
21
|
prerelease: false
|
39
22
|
version_requirements: !ruby/object:Gem::Requirement
|
40
23
|
requirements:
|
41
24
|
- - "~>"
|
42
25
|
- !ruby/object:Gem::Version
|
43
|
-
version: '
|
44
|
-
- - ">="
|
45
|
-
- !ruby/object:Gem::Version
|
46
|
-
version: 3.3.1
|
26
|
+
version: '6'
|
47
27
|
- !ruby/object:Gem::Dependency
|
48
28
|
name: faraday
|
49
29
|
requirement: !ruby/object:Gem::Requirement
|
50
30
|
requirements:
|
51
|
-
- - "
|
52
|
-
- !ruby/object:Gem::Version
|
53
|
-
version: 0.12.2
|
54
|
-
- - "<"
|
31
|
+
- - "~>"
|
55
32
|
- !ruby/object:Gem::Version
|
56
33
|
version: '1.0'
|
57
34
|
type: :runtime
|
58
35
|
prerelease: false
|
59
36
|
version_requirements: !ruby/object:Gem::Requirement
|
60
37
|
requirements:
|
61
|
-
- - "
|
62
|
-
- !ruby/object:Gem::Version
|
63
|
-
version: 0.12.2
|
64
|
-
- - "<"
|
38
|
+
- - "~>"
|
65
39
|
- !ruby/object:Gem::Version
|
66
40
|
version: '1.0'
|
67
41
|
- !ruby/object:Gem::Dependency
|
@@ -238,10 +212,10 @@ extra_rdoc_files:
|
|
238
212
|
- LICENSE
|
239
213
|
- README.md
|
240
214
|
files:
|
215
|
+
- ".github/workflows/ci.yml"
|
241
216
|
- ".rubocop.yml"
|
242
217
|
- ".ruby-gemset"
|
243
218
|
- ".ruby-version"
|
244
|
-
- ".travis.yml"
|
245
219
|
- Gemfile
|
246
220
|
- LICENSE
|
247
221
|
- README.md
|
@@ -278,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
278
252
|
- !ruby/object:Gem::Version
|
279
253
|
version: '0'
|
280
254
|
requirements: []
|
281
|
-
rubygems_version: 3.
|
255
|
+
rubygems_version: 3.1.6
|
282
256
|
signing_key:
|
283
257
|
specification_version: 4
|
284
258
|
summary: Ruby wrapper for Campact User Service
|