aptible-auth 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00328550f86b01c32a92affe4e03732823568896937d4789151bd458ef60d119'
-  data.tar.gz: 762c0481e463f560f9ac56ef4228d985a01f79c343c341e6cc16dca442c77d41
+  metadata.gz: 7149e22dc5b4312e17d2b6c3ba4ca28f66be30dfa279639caa2d44277019e121
+  data.tar.gz: eb4361df78b1cace82024b72c67f270f1c93a013f3f21a6a5fbe6b3f9d2aeff1
 SHA512:
-  metadata.gz: 0a970d42b7b94aa7d1995b1c4f7e72ba880339efc402fb3e77e8e8e3a18bcb2174dfeea3cb8707270eac99877ef809f6793f3b3f8b94b28087b27e655f020e3a
-  data.tar.gz: 598365febae878bdb08df3ecaf00f7e894d85ce914664e797c1a8d838091a7f6820575de2e128b84d4e3e20325679a2a58f0fcb99420a04d3672b12170278088
+  metadata.gz: 0df7b7e3c90027786a38571116d4c142ccb2bf7a8bcb346893cd5e1f8b3316ecee7facf2d6aa465f444da8d79a4aaf91ca3f164d74c589003648655ab858c2e7
+  data.tar.gz: dcc58a8174e38ae47d2af44bed42dd1cea0b4dd9981cdde4a96b1069b5881e2cd34ce367b4fc1367f21798079b157254d4ae341848bcb9cf96ae7f119204a2f5

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/Gemfile

@@ -1,7 +1,2 @@
 source 'https://rubygems.org'
-
-gem 'activesupport', '~> 4.0'
-gem 'rack', '~> 1.6'
-
-# Specify your gem's dependencies in aptible-auth.gemspec
 gemspec

data/README.md

@@ -14,8 +14,6 @@ Add the following line to your application's Gemfile.
 
 And then run `bundle install`.
 
-A forked version of the OAuth2 gem is necessary until [intridea/oauth2#165](https://github.com/intridea/oauth2/pull/165) and [intridea/oauth2#166](https://github.com/intridea/oauth2/pull/166) are merged.
-
 ## Usage
 
 First, get a token:

data/aptible-auth.gemspec

@@ -22,10 +22,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aptible-resource', '~> 1.0'
   spec.add_dependency 'gem_config'
-  spec.add_dependency 'oauth2-aptible', '~> 0.10.0'
+  spec.add_dependency 'oauth2', '~> 1.4'
 
   spec.add_development_dependency 'aptible-tasks', '>= 0.6.0'
-  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/aptible/auth/token.rb

@@ -1,4 +1,6 @@
 require 'oauth2'
+require 'oauth2/response_parser'
+require 'oauth2/strategy/token_exchange'
 
 module Aptible
   module Auth

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

data/lib/oauth2/response_parser.rb

@@ -0,0 +1,5 @@
+# rubocop:disable all
+# NOTE: This code has been in oauth2 master since 2018 but is awaiting a 2.0 release of oauth2
+OAuth2::Response.register_parser(:json, ['application/json', 'text/javascript', 'application/hal+json', 'application/vnd.collection+json', 'application/vnd.api+json']) do |body|
+  MultiJson.load(body) rescue body # rubocop:disable RescueModifier
+end

data/lib/oauth2/strategy/token_exchange.rb

@@ -0,0 +1,40 @@
+# rubocop:disable all
+module OAuth2
+  module Strategy
+    # The Token Exchange strategy
+    #
+    # @see https://tools.ietf.org/html/draft-ietf-oauth-token-exchange-03#section-4.1
+    class TokenExchange < Base
+      GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:token-exchange'
+
+      # Not used for this strategy
+      #
+      # @raise [NotImplementedError]
+      def authorize_url
+        fail(NotImplementedError, 'The authorization endpoint is not used in this strategy')
+      end
+
+      # Retrieve an access token given the specified End User username and password.
+      #
+      # @param [String] username the End User username
+      # @param [String] password the End User password
+      # @param [Hash] params additional params
+      def get_token(actor_token, actor_token_type, subject_token, subject_token_type, params = {}, opts = {})
+        params = {'grant_type'          => GRANT_TYPE,
+                  'actor_token'         => actor_token,
+                  'actor_token_type'    => actor_token_type,
+                  'subject_token'       => subject_token,
+                  'subject_token_type'  => subject_token_type
+        }.merge(client_params).merge(params)
+        @client.get_token(params, opts)
+      end
+    end
+  end
+
+  # Add strategy to OAuth2::Client
+  class Client
+    def token_exchange
+      @token_exchange ||= OAuth2::Strategy::TokenExchange.new(self)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oauth2-aptible
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: aptible-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +168,8 @@ files:
 - lib/aptible/auth/user.rb
 - lib/aptible/auth/version.rb
 - lib/aptible/auth/whitelist_membership.rb
+- lib/oauth2/response_parser.rb
+- lib/oauth2/strategy/token_exchange.rb
 - spec/aptible/auth/agent_spec.rb
 - spec/aptible/auth/organization_spec.rb
 - spec/aptible/auth/resource_spec.rb
@@ -209,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Ruby client for auth.aptible.com