campact_user_service 2.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 214a865845390e44559c068f95a74ad8a85a46ff83eb5192edcc8e0b4f39440d
-  data.tar.gz: 7b2664936fec33426d6807f114a7820cb34455d5d9e2278fd017f14b13c720f9
+  metadata.gz: 6e9cb5aee16e6996f096b2a784d87d425fca96e5bcb04af1c6bb226bc7f6e3a6
+  data.tar.gz: 9a245ab3f8ba1f0ba86f3b7c630f1f4df86714bb58f553bc045685edec6e3081
 SHA512:
-  metadata.gz: 362b5d1d2735112327bb6b1f4c4d3137a719c565af5e37ef81bbf58958ea57400f9753c69b6132513a56bcd6639a1c0a565b84d28eda48833602cd2265bd6490
-  data.tar.gz: 8ea75a760589072fb567c3548f0b147f5420477ebbfae0009cf31614af365d3982c485b77857ead0af601df814c182d75a105056a65f8e0fa38d160f8e8a6493
+  metadata.gz: 4e1b4f9916af9c8142811589bd3683de92d4189b32de5968f3df42bd85930bb1d6d857e392d1c669c8cda0cdceb280676f162c0d20f69db33961d50249a6e1af
+  data.tar.gz: bdb5d97db34b872a4d50e8dee355a53f5e2700766c524dc280c26e9b1ed6d5a322654207ae38f0a9e7cb940ffa8dcec97d7bd466423c4c58ac5a61760d8525a0

data/.rubocop.yml

@@ -0,0 +1,26 @@
+AllCops:
+  DisabledByDefault: true
+
+Security:
+  Enabled: true
+
+Bundler/DuplicatedGem:
+  Enabled: true
+Bundler/InsecureProtocolSource:
+  Enabled: true
+Layout/IndentationStyle:
+  Enabled: true
+Layout/SpaceInsideRangeLiteral:
+  Enabled: true
+Lint:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Naming/AsciiIdentifiers:
+  Enabled: true
+Naming/ClassAndModuleCamelCase:
+  Enabled: true
+Naming/ConstantName:
+  Enabled: true
+Naming/FileName:
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+2.6.6

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.6
+cache: bundler
+before_install:
+  - gem install bundler
+script:
+  - bundle exec rspec
+  - bundle exec rubocop 

data/Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
-gem 'base32', '~> 0.3.2'
-gem 'rotp', '~> 3.3', '>= 3.3.1'
+gem 'rotp', '~> 6'
 gem 'faraday', '>= 0.12.2', '< 1.0'
 gem 'json', '~> 2.1'
 
@@ -11,9 +10,9 @@ group :development do
   gem 'shoulda', '>= 0'
   gem 'webmock', '>= 0'
   gem 'rdoc', '~> 6.0', '>= 6.0.4'
-  gem 'bundler', '~> 1.16', '>= 1.16.2'
-  gem 'juwelier', '~> 2.4', '>= 2.4.9'
+  gem 'juwelier', git: 'https://github.com/flajann2/juwelier.git'
   gem 'simplecov', '= 0.16.1'
   gem 'pry-byebug', '~> 3.6'
   gem 'faraday-detailed_logger', '~> 2.1', '>= 2.1.2'
+  gem 'rubocop'
 end

data/README.md

@@ -1,4 +1,6 @@
 # campact-user-service
+[![Build Status](https://travis-ci.org/controlshift/campact-user-service.svg?branch=master)](https://travis-ci.org/controlshift/campact-user-service)
+
 a ruby gem that wraps the Campact user service API
 
 ## License

data/VERSION

@@ -1 +1 @@
-2.0.1
+3.1.1

data/campact_user_service.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: campact_user_service 2.0.1 ruby lib
+# stub: campact_user_service 3.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "campact_user_service".freeze
-  s.version = "2.0.1"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["ControlShift".freeze]
-  s.date = "2019-08-12"
+  s.date = "2020-10-14"
   s.description = "Ruby wrapper for Campact User Service".freeze
   s.email = "hello@controlshiftlabs.com".freeze
   s.extra_rdoc_files = [
@@ -19,8 +19,10 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".rubocop.yml",
     ".ruby-gemset",
     ".ruby-version",
+    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.md",
@@ -41,15 +43,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/controlshift/campact_user_service".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "Ruby wrapper for Campact User Service".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<base32>.freeze, ["~> 0.3.2"])
-      s.add_runtime_dependency(%q<rotp>.freeze, ["~> 3.3", ">= 3.3.1"])
+      s.add_runtime_dependency(%q<rotp>.freeze, ["~> 6"])
       s.add_runtime_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
       s.add_runtime_dependency(%q<json>.freeze, ["~> 2.1"])
       s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
@@ -57,14 +58,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.0", ">= 6.0.4"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.16", ">= 1.16.2"])
-      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.9"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
       s.add_development_dependency(%q<simplecov>.freeze, ["= 0.16.1"])
       s.add_development_dependency(%q<pry-byebug>.freeze, ["~> 3.6"])
       s.add_development_dependency(%q<faraday-detailed_logger>.freeze, ["~> 2.1", ">= 2.1.2"])
+      s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<base32>.freeze, ["~> 0.3.2"])
-      s.add_dependency(%q<rotp>.freeze, ["~> 3.3", ">= 3.3.1"])
+      s.add_dependency(%q<rotp>.freeze, ["~> 6"])
       s.add_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
       s.add_dependency(%q<json>.freeze, ["~> 2.1"])
       s.add_dependency(%q<byebug>.freeze, [">= 0"])
@@ -72,15 +72,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_dependency(%q<webmock>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 6.0", ">= 6.0.4"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.16", ">= 1.16.2"])
-      s.add_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.9"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
       s.add_dependency(%q<simplecov>.freeze, ["= 0.16.1"])
       s.add_dependency(%q<pry-byebug>.freeze, ["~> 3.6"])
       s.add_dependency(%q<faraday-detailed_logger>.freeze, ["~> 2.1", ">= 2.1.2"])
+      s.add_dependency(%q<rubocop>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<base32>.freeze, ["~> 0.3.2"])
-    s.add_dependency(%q<rotp>.freeze, ["~> 3.3", ">= 3.3.1"])
+    s.add_dependency(%q<rotp>.freeze, ["~> 6"])
     s.add_dependency(%q<faraday>.freeze, [">= 0.12.2", "< 1.0"])
     s.add_dependency(%q<json>.freeze, ["~> 2.1"])
     s.add_dependency(%q<byebug>.freeze, [">= 0"])
@@ -88,11 +87,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>.freeze, [">= 0"])
     s.add_dependency(%q<webmock>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 6.0", ">= 6.0.4"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.16", ">= 1.16.2"])
-    s.add_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.9"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, ["= 0.16.1"])
     s.add_dependency(%q<pry-byebug>.freeze, ["~> 3.6"])
     s.add_dependency(%q<faraday-detailed_logger>.freeze, ["~> 2.1", ">= 2.1.2"])
+    s.add_dependency(%q<rubocop>.freeze, [">= 0"])
   end
 end
 

data/example.rb

@@ -3,7 +3,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'campact_user_service'
 require 'faraday/detailed_logger'
 
-def instrument_connection_with_extended_logging(client, username, password)
+def instrument_connection_with_extended_logging(client)
   default_options = {
     ssl: { verify: true },
     headers: {
@@ -15,12 +15,11 @@ def instrument_connection_with_extended_logging(client, username, password)
 
   faraday_builder = ->(faraday) do
     faraday.response :detailed_logger
-    faraday.basic_auth username, password
     faraday.adapter Faraday.default_adapter
   end
 
   instrumented_connection = Faraday.new(
-    "#{client.scheme}://#{client.host}:#{client.port}",
+    "https://#{client.host}",
     default_options,
     &faraday_builder
   )
@@ -33,14 +32,21 @@ end
 puts "Which user service are you going to use?\n\t1) session\n\t2) user"
 option = gets.chomp
 
-# Get username
-puts "I'll need your API credentials"
-puts "Enter your API username"
-username = gets.chomp
+# Get TOTP credentials
+username = if ENV['TOTP_USER'].nil?
+  puts "I'll need your API credentials"
+  puts "Enter your TOTP user"
+  gets.chomp
+else
+  ENV['TOTP_USER']
+end
 
-# Get password
-puts "I'll need your password now"
-password = gets.chomp
+secret = if ENV['TOTP_SECRET'].nil?
+  puts "Enter your TOTP secret"
+  gets.chomp
+else
+  ENV['TOTP_SECRET']
+end
 
 # Now connect to the right API
 user_service = case option
@@ -49,11 +55,10 @@ when '1'
   token = gets.chomp
   session = CampactUserService.session(
     token,
-    'campact-demo-session',
+    'campact-staging-session',
     {
-      scheme: 'http',
-      host: 'demo.campact.de',
-      port: '10004'
+      host: 'weact-adapter.staging.campact.de',
+      topt_authorization: {user: username, secret: secret}
     }
   )
 when '2'
@@ -62,19 +67,18 @@ when '2'
   account = CampactUserService.account(
     user_id,
     {
-      scheme: 'http',
-      host: 'demo.campact.de',
-      port: '10003'
+      host: 'weact-adapter.staging.campact.de',
+      topt_authorization: {user: username, secret: secret}
     }
   )
 else
   raise 'Invalid option'
 end
 
-instrument_connection_with_extended_logging(user_service.client, username, password)
+instrument_connection_with_extended_logging(user_service.client)
 
 puts "Waiting for your command..."
 require 'pry-byebug'
-binding.pry
+binding.pry # rubocop:disable Lint/Debugger
 
-puts 'Goodbye!'
+puts 'Goodbye!'

data/lib/campact_user_service/account.rb

@@ -8,7 +8,7 @@ module CampactUserService
     end
 
     def exists?
-      account && account["id"]
+      account && !account['external_id'].nil?
     end
 
     def subscribed_to_newsletter?
@@ -37,15 +37,11 @@ module CampactUserService
       account['preferences']
     end
 
-    def donor_info
-      account['donorclass']
-    end
-
     private
 
     def account
       escaped_user_id = CGI.escape(user_id)
-      @account_info ||= (client.get_request("api/v1/accounts/#{escaped_user_id}") || {})
+      @account_info ||= (client.get_request("v1/accounts/#{escaped_user_id}") || {})
     end
   end
 end

data/lib/campact_user_service/client.rb

@@ -1,26 +1,23 @@
 require 'faraday'
 require 'json'
-require 'base32'
 require 'rotp'
 require 'campact_user_service/response_error'
 
 module CampactUserService
   class Client
-    TIMEOUT = 5.freeze
+    TIMEOUT = 60.freeze
+    OPEN_TIMEOUT = 20.freeze
 
-    attr_reader :connection, :scheme, :host, :port
+    attr_reader :connection, :host, :port, :topt_authorization
 
     def initialize(options)
-      @scheme = options.fetch(:scheme, 'https')
       @host = options.fetch(:host)
       @port = options[:port]
+      @topt_authorization = options[:topt_authorization]
       faraday_options = default_faraday_options.merge(options.delete(:faraday) || {})
       adapter = faraday_options.delete(:adapter) || Faraday.default_adapter
 
       @connection = Faraday.new(endpoint, faraday_options) do |faraday|
-        if options.has_key?(:enable_auth)
-          faraday.basic_auth options[:username], options[:password]
-        end
         faraday.adapter adapter
       end
     end
@@ -37,10 +34,14 @@ module CampactUserService
       response = connection.send(verb.to_sym) do |req|
         req.url path
         req.options.timeout = TIMEOUT
-        req.options.open_timeout = TIMEOUT
-        if options.has_key?(:cookies)
+        req.options.open_timeout = OPEN_TIMEOUT
+        if options.key?(:cookies)
           req.headers['Cookie'] = format_cookies(options[:cookies])
         end
+
+        if topt_authorization
+          req.headers['authorization'] = authorization(topt_authorization)
+        end
       end
 
       case response.status
@@ -70,7 +71,7 @@ module CampactUserService
     end
 
     def endpoint
-      endpoint = "#{scheme}://#{host}"
+      endpoint = "https://#{host}"
       if !port.nil?
         endpoint << ":#{port}"
       end
@@ -86,5 +87,24 @@ module CampactUserService
           cookies.map {|k,v| "#{k}=#{v};" }.join
       end
     end
+
+    def authorization(totp_options)
+      user = totp_options.fetch(:user)
+      secret = totp_options.fetch(:secret)
+
+      token = [user, auth_pass(secret)].join(':')
+
+      "Token #{token}"
+    end
+
+    def auth_pass(secret)
+      totp_secret = ROTP::Base32.encode(secret)
+
+      ROTP::TOTP.new(totp_secret, {
+        digest: 'sha256',
+        digits: 8,
+        interval: 30
+      }).now
+    end
   end
 end

data/lib/campact_user_service/session.rb

@@ -8,10 +8,6 @@ module CampactUserService
       @session_cookie_name = session_cookie_name
     end
 
-    def exists?
-      session && session['id']
-    end
-
     def user_id
       session["user_id"]
     end

data/spec/account_spec.rb

@@ -16,16 +16,16 @@ describe CampactUserService::Account do
 
   describe '#exists?' do
     it 'should return true where a valid user object is returned' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
-          "id": "id-123"
+          "external_id": "id-123"
         }.to_json)
 
       expect(subject.exists?).to be_truthy
     end
 
     it 'should not return true where an invalid user object is returned' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "error": true
         }.to_json)
@@ -41,7 +41,7 @@ describe CampactUserService::Account do
         client,
         malicious_user_id
       )
-      stub_request(:get, "https://test.com/api/v1/accounts/%09%0D")
+      stub_request(:get, "https://test.com/v1/accounts/%09%0D")
         .to_return(body: '', status: 404)
 
       expect(malicious_subject.exists?).to be_falsey
@@ -53,7 +53,7 @@ describe CampactUserService::Account do
         client,
         malicious_user_id
       )
-      stub_request(:get, "https://test.com/api/v1/accounts/foo@example.com%2Fsecrets")
+      stub_request(:get, "https://test.com/v1/accounts/foo@example.com%2Fsecrets")
         .to_return(body: '', status: 404)
 
       expect(malicious_subject.exists?).to be_falsey
@@ -62,7 +62,7 @@ describe CampactUserService::Account do
 
   describe '#name' do
     it 'should retrieve all of the names and gender of the user' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "name": {
             "firstname": "Alice",
@@ -84,7 +84,7 @@ describe CampactUserService::Account do
 
   describe '#email' do
     it 'should retrieve the email address of the user' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "emailaddress": {
             "emailaddress": "foobar@example.com"
@@ -96,7 +96,7 @@ describe CampactUserService::Account do
     end
 
     it 'should return nil where no email address is set' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "emailaddress": {}
         }.to_json)
@@ -108,7 +108,7 @@ describe CampactUserService::Account do
 
   describe '#address' do
     it 'should retrieve the address of the user' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "postaladdress": {
             "street": "123 Fake Street",
@@ -125,7 +125,7 @@ describe CampactUserService::Account do
 
   describe '#subscribed_to_newsletter?' do
     it 'should be true where the user is subscribed' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "emailaddress": {
             "emailaddress": "foobar@example.com",
@@ -137,7 +137,7 @@ describe CampactUserService::Account do
     end
 
     it 'should be false where the user is not subscribed' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "emailaddress": {
             "emailaddress": "foobar@example.com",
@@ -149,7 +149,7 @@ describe CampactUserService::Account do
     end
 
     it 'should be false where user subscription is different than newsletter' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "emailaddress": {
             "emailaddress": "foobar@example.com",
@@ -163,7 +163,7 @@ describe CampactUserService::Account do
 
   describe '#allow_prefill?' do
     it 'should allow prefilling where the user has opted-in' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "preferences": {
             "prefill_forms": "allowed"
@@ -174,7 +174,7 @@ describe CampactUserService::Account do
     end
 
     it 'should not allow prefilling where the user has not decided' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "preferences": {
             "prefill_forms": "undecided"
@@ -185,7 +185,7 @@ describe CampactUserService::Account do
     end
 
     it 'should not allow prefilling where the user has opted out' do
-      stub_request(:get, "https://test.com/api/v1/accounts/#{user_id}")
+      stub_request(:get, "https://test.com/v1/accounts/#{user_id}")
         .to_return(body: {
           "preferences": {
             "prefill_forms": "disallowed"

data/spec/client_spec.rb

@@ -4,7 +4,6 @@ describe CampactUserService::Client do
   describe 'initialization' do
     let(:options) {
       {
-        scheme: 'https',
         host: 'demo.campact.de',
         port: '10003',
         faraday: { a_custom_option: 'foo', adapter: :an_adapter }
@@ -24,7 +23,7 @@ describe CampactUserService::Client do
     end
 
     it 'should use default faraday options for connection' do
-      expect(Faraday).to receive(:new) do |endpoint, initialization_options|
+      expect(Faraday).to receive(:new) do |_endpoint, initialization_options|
         expect(initialization_options[:ssl][:verify]).to be_truthy
         expect(initialization_options[:headers]['Accept']).to eq "application/json;q=0.1"
         expect(initialization_options[:headers]['Accept-Charset']).to eq "utf-8"
@@ -38,7 +37,7 @@ describe CampactUserService::Client do
       options[:faraday][:ssl] = {verify: false}
       options[:faraday][:headers] = {'Accept'=>'custom-accept-header', 'Accept-Charset'=>'custom-accept-charset-header', 'User-Agent'=>'custom-user-agent-header'}
 
-      expect(Faraday).to receive(:new) do |endpoint, initialization_options|
+      expect(Faraday).to receive(:new) do |_endpoint, initialization_options|
         expect(initialization_options[:ssl][:verify]).to be_falsey
         expect(initialization_options[:headers]['Accept']).to eq 'custom-accept-header'
         expect(initialization_options[:headers]['Accept-Charset']).to eq 'custom-accept-charset-header'
@@ -54,7 +53,7 @@ describe CampactUserService::Client do
       it 'should raise error if status code is 3xx, 4xx or 5xx' do
         expect(request_builder).to receive(:url).with('/foo/bar')
         expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-        expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+        expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
         allow(response).to receive(:status).and_return(unexpected_status_code)
         allow(response).to receive(:body).and_return('An error occurred')
 
@@ -69,7 +68,7 @@ describe CampactUserService::Client do
     it 'should return nil if status code is 404' do
       expect(request_builder).to receive(:url).with('/foo/bar')
       expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
       allow(response).to receive(:status).and_return(404)
 
       response = subject.send(method_under_test, '/foo/bar')
@@ -98,7 +97,7 @@ describe CampactUserService::Client do
     it 'should perform get request on provided path and return true if response is 204' do
       expect(request_builder).to receive(:url).with('/foo/bar')
       expect(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+      expect(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
       allow(response).to receive(:status).and_return(204)
 
       expect(subject.get_request('/foo/bar')).to be_truthy
@@ -110,7 +109,7 @@ describe CampactUserService::Client do
       before :each do
         allow(request_builder).to receive(:url).with('/foo/bar')
         allow(request_builder_options).to receive(:timeout=).with(CampactUserService::Client::TIMEOUT)
-        allow(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::TIMEOUT)
+        allow(request_builder_options).to receive(:open_timeout=).with(CampactUserService::Client::OPEN_TIMEOUT)
         allow(request_builder).to receive(:headers).and_return(headers_builder)
       end
 
@@ -128,6 +127,23 @@ describe CampactUserService::Client do
         subject.get_request('/foo/bar', cookies: {'foo' => 'bar', 'xyz' => 'abc'})
       end
 
+      it 'should set TOTP authorization header' do
+        allow(response).to receive(:status).and_return(200)
+        allow(response).to receive(:body).and_return(nil)
+
+        totp_secret = ROTP::Base32.encode('shh! a secret!')
+
+        totp = double
+        expect(totp).to receive(:now).and_return('totp_token')
+        expect(ROTP::TOTP).to receive(:new).with(totp_secret, hash_including(digest: 'sha256', digits: 8, interval: 30)).and_return(totp)
+
+        expect(headers_builder).to receive(:[]=).with('authorization', 'Token api_user:totp_token')
+
+        subject = CampactUserService::Client.new(host: 'demo.campact.de', topt_authorization: {user: 'api_user', secret: 'shh! a secret!'})
+
+        subject.get_request('/foo/bar')
+      end
+
       it 'should parse JSON response on successful response' do
         allow(response).to receive(:status).and_return(200)
         allow(response).to receive(:body).and_return({a_field: 'foo', another_field: 'bar'}.to_json)

data/spec/session_spec.rb

@@ -7,24 +7,6 @@ describe CampactUserService::Session do
 
   subject { CampactUserService::Session.new(client, session_id, session_cookie_name) }
 
-  describe '#exists?' do
-    it 'should be truthy when the session exists' do
-      stub_request(:get, 'https://test.com/v1/sessions')
-        .with(headers: {'Cookie' => "cus-session=#{session_id};"})
-        .to_return(body: {id: 'session-id'}.to_json)
-
-      expect(subject.exists?).to be_truthy
-    end
-
-    it "should be falsey when the session doesn't exist" do
-      stub_request(:get, 'https://test.com/v1/sessions')
-        .with(headers: {'Cookie' => "cus-session=#{session_id};"})
-        .to_return(body: '', status: 404)
-
-      expect(subject.exists?).to be_falsey
-    end
-  end
-
   describe '#user_id' do
     it 'should be present' do
       stub_request(:get, 'https://test.com/v1/sessions')

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rspec'
 require 'webmock/rspec'
 require 'campact_user_service'
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
 
 RSpec.configure do |config|
   config.include WebMock::API

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: campact_user_service
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - ControlShift
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: base32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -154,46 +134,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.16.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +196,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for Campact User Service
 email: hello@controlshiftlabs.com
 executables: []
@@ -250,8 +218,10 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -273,7 +243,7 @@ homepage: http://github.com/controlshift/campact_user_service
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -288,8 +258,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Ruby wrapper for Campact User Service
 test_files: []