access_token_agent 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0fd60d58c6d3a25047e8dc8658c0e020aead8ae7
-  data.tar.gz: 91938386479d3131acf3f0276e2999847aed42a4
+SHA256:
+  metadata.gz: 9ce5b9bb39e762a8602e908ed0fd3f90a5a90a1ab5692b37512fd51fca5ffcbc
+  data.tar.gz: eb3bec64d9424a5197fc19e93ae26dd0d59f29a33fe3f1141dbffeed5e28ac9d
 SHA512:
-  metadata.gz: b4847fe284c32ae55edcfbee16843b9aac31862418f9ebdc98a565c75a83628a7690651272489eaa9bca2b38759e8ea005d05230c4b380491b101e8fd001bce0
-  data.tar.gz: ca7f0a9d57f69a6b097f4a531743f54c957533671701c7f33cea1cf744e83ddf026d0bc85709be7e3c10f430bf760f23d64c4659cdf783b801f09047a8990d09
+  metadata.gz: e6d2d273fb9013401936d16db02677ca8f84e843fe1634d79a2e03edab29eac96ee395d73275640177d610974bf652c1fe44303484d6150c22596db914118ee5
+  data.tar.gz: 1395a40b82a22e93cd3ff04b7b61fb56d5c76a281dc567f5713a5e3cdbec6558d545c506668f51ee7a374b277576b6bd8b931b0ecf64c6b470d5381f82250304

data/.gitignore

@@ -2,5 +2,6 @@ Gemfile.lock
 coverage/
 tmp/
 
+.ruby-version
 .ruby-gemset
 access_token_agent-*.gem

data/.gitlab-ci.yml

@@ -0,0 +1,54 @@
+image: ruby:2.7
+
+stages:
+  - test
+  - publish
+
+before_script:
+  - bundle config jobs 8
+  - bundle install --path=/tmp/bundler --quiet
+
+rubocop:
+  stage: test
+  image: ruby:2.2
+  script:
+    - bundle exec rubocop
+
+rspec_latest:
+  stage: test
+  image: ruby
+  script:
+    - bundle exec rspec
+
+rspec_2.6:
+  stage: test
+  image: ruby:2.6
+  script:
+    - bundle exec rspec
+
+rspec_2.5:
+  stage: test
+  image: ruby:2.5
+  script:
+    - bundle exec rspec
+
+rspec_2.2:
+  stage: test
+  image: ruby:2.2
+  script:
+    - bundle exec rspec
+
+publish_gem:
+  stage: publish
+  script:
+    - mkdir -p ~/.gem
+    - |
+      cat << EOF > ~/.gem/credentials
+      ---
+      :rubygems_api_key: ${RUBYGEMS_API_KEY}
+      EOF
+    - chmod 0600 ~/.gem/credentials
+    - gem build access_token_agent.gemspec
+    - gem push $(find `pwd` -name "access_token_agent-*.gem")
+  only:
+    - master

data/.rubocop.yml

@@ -20,6 +20,16 @@ Metrics/BlockLength:
     - 'config/environments/*.rb' # instead of excluding all :configure methods
     - 'config/routes.rb'
 
+# The maximum amount of positional arguments in a method really shouldn't exceed
+# the rubocop default of 5.
+# However, keyword arguments do not make a method signature as unreadable as positional
+# arguments. There are valid cases for longer argument lists (e.g. data objects or
+# DSLs with implicit default values).
+# In those cases keyword args provide a good balance between readability and the need to
+# pass more arguments into an object.
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,6 +1,7 @@
-## master
+## 3.5.0
 
-*no unreleased changes*
+- Support requesting scopes
+- Add requirement for Ruby 2.2 to gemspec (this was an implicit requirement before)
 
 ## 3.4.0
 

data/README.md

@@ -1,7 +1,4 @@
 [![Gem Version](https://badge.fury.io/rb/access_token_agent.svg)](https://badge.fury.io/rb/access_token_agent)
-[![Build Status](https://travis-ci.org/kaeuferportal/access_token_agent.svg?branch=master)](https://travis-ci.org/kaeuferportal/access_token_agent)
-[![Code Climate](https://codeclimate.com/github/kaeuferportal/access_token_agent/badges/gpa.svg)](https://codeclimate.com/github/kaeuferportal/access_token_agent)
-[![Test Coverage](https://codeclimate.com/github/kaeuferportal/access_token_agent/badges/coverage.svg)](https://codeclimate.com/github/kaeuferportal/access_token_agent/coverage)
 
 # AccessTokenAgent
 
@@ -40,6 +37,8 @@ Optional parameters:
 * `access_token_path` - Allows to customize the HTTP path where the
   access token needs to be requested.
   **Default:** `/oauth/token`
+* `scopes` - An array of scopes to be requested from the authorization server
+  **Default:** no scopes
 
 ### Example
 

data/access_token_agent.gemspec

@@ -5,23 +5,24 @@ require 'access_token_agent/version'
 Gem::Specification.new do |s|
   s.name        = 'access_token_agent'
   s.version     = AccessTokenAgent::VERSION
-  s.date        = '2016-04-08'
+  s.date        = '2020-10-02'
   s.summary     = 'Handles authentication against an OAuth2 provider'
-  s.homepage    = 'https://github.com/kaeuferportal/access_token_agent'
-  s.description = 'Retrieves an access token from an OAuth2 provider' \
+  s.homepage    = 'https://github.com/aroundhome/access_token_agent'
+  s.description = 'Retrieves an access token from an OAuth2 provider ' \
                   'using the supplied credentials.'
-  s.authors     = ['Beko Käuferportal GmbH']
-  s.email       = 'oss@kaeuferportal.de'
+  s.authors     = ['be Around GmbH']
+  s.email       = 'oss@aroundhome.de'
   s.license     = 'MIT'
   s.files       = `git ls-files -z`.split("\x0")
                                    .reject { |f| f.match(%r{^spec/}) }
 
-  s.add_development_dependency 'bundler', '~> 1.11'
-  s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
+  s.required_ruby_version = '>= 2.2'
+
+  s.add_development_dependency 'bundler', '> 1.11', '< 3'
   s.add_development_dependency 'pry', '~> 0.10'
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rubocop', '0.51'
   s.add_development_dependency 'simplecov', '~> 0.16'
-  s.add_development_dependency 'vcr', '~> 3.0'
-  s.add_development_dependency 'webmock', '~> 1.24'
+  s.add_development_dependency 'vcr', '~> 5.0'
+  s.add_development_dependency 'webmock', '~> 3.0'
 end

data/lib/access_token_agent/connector.rb

@@ -12,12 +12,14 @@ module AccessTokenAgent
                    client_id:,
                    client_secret:,
                    fake_auth: false,
-                   access_token_path: '/oauth/token')
+                   access_token_path: '/oauth/token',
+                   scopes: nil)
       @host = host
       @client_id = client_id
       @client_secret = client_secret
       @fake_auth = fake_auth
       @access_token_path = access_token_path
+      @scopes = scopes
     end
 
     def http_auth_header
@@ -58,7 +60,7 @@ module AccessTokenAgent
     def perform_request
       request = Net::HTTP::Post.new(auth_uri)
       request.basic_auth @client_id, @client_secret
-      request.form_data = { 'grant_type' => 'client_credentials' }
+      request.form_data = form_data
       use_tls = auth_uri.scheme == 'https'
       Net::HTTP.start(auth_uri.hostname,
                       auth_uri.port,
@@ -70,5 +72,11 @@ module AccessTokenAgent
     def auth_uri
       @auth_uri ||= URI("#{@host}#{@access_token_path}")
     end
+
+    def form_data
+      result = { 'grant_type' => 'client_credentials' }
+      result['scope'] = @scopes.join(' ') if @scopes
+      result
+    end
   end
 end

data/lib/access_token_agent/version.rb

@@ -1,3 +1,3 @@
 module AccessTokenAgent
-  VERSION = '3.4.0'.freeze
+  VERSION = '3.5.0'.freeze
 end

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: access_token_agent
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
-- Beko Käuferportal GmbH
+- be Around GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -100,39 +92,39 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
-description: Retrieves an access token from an OAuth2 providerusing the supplied credentials.
-email: oss@kaeuferportal.de
+        version: '3.0'
+description: Retrieves an access token from an OAuth2 provider using the supplied
+  credentials.
+email: oss@aroundhome.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -149,7 +141,7 @@ files:
 - lib/access_token_agent/unauthorized_error.rb
 - lib/access_token_agent/unsupported_token_type_error.rb
 - lib/access_token_agent/version.rb
-homepage: https://github.com/kaeuferportal/access_token_agent
+homepage: https://github.com/aroundhome/access_token_agent
 licenses:
 - MIT
 metadata: {}
@@ -161,15 +153,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Handles authentication against an OAuth2 provider

data/.ruby-version

@@ -1 +0,0 @@
-2.1.10

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-script:
-  - bundle exec rspec && codeclimate-test-reporter
-  - bundle exec rubocop
-
-addons:
-  code_climate:
-    repo_token:
-      secure: "tsEpSMfYQHfnm5l9zkdksmTcdV/hjq28HsKh7+tXefWbNbMksrzWlonuZsoQSeLx8OdG5dcGREY3JVbWUl8CxILZ/j8rse0CBpW1S/sy7sz7KQEaBgTq+BxJiFyjPibul91X7TcMHVLpo2c2bIM353HJW4Sf0gT5rhbykek2YHXsvHXlDv4dkE/PL0yZylgDi8zC6dXl9IrjsqgPcTwtCAOM2o1+NhNBiyBWJqQyfhv2N72dml3mk8rQ9WszyRhHmIUhHehdgYcbOrydlEclOHwuszIQd0z2wpJ9HMlvQFtmH/muW4XTf/VNu3XaZr1OYwzBZBeC9Ngfoqn/7Bs0p815NrRcKc9oq+hIyjyd6Mj7Asqcs1+JxakzcVdW6Enf3ZL7F7fsmmB4mQkATEcpBv8G4aN3lFkBmIZdx16oyMQWrLPPzsFXgSdARdUczdtgfnAFT3IB311CnT6zxPCL8FBI/KiHK9FXc6FBGv030doIhr3pDUjMkx35VYN5cvixf+oHMYg4/XuoO+HGwdViA/P8gAUGs5bQL5kY6jcYSTsa8KlzKfgUcK1buWblHfTSEKdMOnKRSBvfS9S3VcPt5ZpZ62Cfbqfjn4lPa5UxcOyb3abk3s2ikKbftGUQk8k4qlhednki3yV71xKhpQsiO/ufNCnp6jXAV2p/KoM2QjA="