doorkeeper-grants_assertion 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe45810cef0bca0a2243cd9c09d2767a1fee6289
-  data.tar.gz: a5e2f927e70a85096f7526ac8b5dbf8fbbd66109
+  metadata.gz: 7ff51a2816fe5e939a96a6dc6f20f5d277b5f3a0
+  data.tar.gz: 06f8b660742a4ed96ee2ef41a791a12d16290c9a
 SHA512:
-  metadata.gz: 8be250865b02e5588f501d71a4853f51aec57c3d8428d815dc9ffe108c96aa08c5f44bb69bff01e1bedae847e2427f0bc9acc6b6380a91bf0efbc14f322eb32e
-  data.tar.gz: 78d12750415187a141713d19556801330f42a928777c6f0af8731782a75c3d35b9b19e25fd0da67f0fc501418d51190311e9ee1858682f50dd55e1607379cdda
+  metadata.gz: a78e1f07804f3f25ce1eed17dd6ee8bae657678dc7b6a3dd8e0f9c90de62fea659bffa6047910965083ec796091f4c83122f8cb874e9f4346aed546d093ae759
+  data.tar.gz: 9d8822d3cb8c532664800adb818c69a1c2f5e6279ab2554a7d91ec14c2665c7f7af85f1d9087238684cd731e313f3e11849ef701acf2ef53bc25528972ec2225

data/.gitignore

@@ -8,3 +8,6 @@ Gemfile.lock
 .rvmrc
 *.swp
 .idea
+vendor/bundle/
+gemfiles/vendor/bundle/
+.DS_Store

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 
 rvm:
- - 2.1
  - 2.2.6
  - 2.3.3
  - 2.4
+ - 2.5
 
 gemfile:
   - gemfiles/rails_4_2.gemfile
@@ -12,10 +12,5 @@ gemfile:
   - gemfiles/rails_latest_and_doorkeeper_latest.gemfile
 
 matrix:
-  exclude:
-    - gemfile: gemfiles/rails_5_0.gemfile
-      rvm: 2.1
-    - gemfile: gemfiles/rails_latest_and_doorkeeper_latest.gemfile
-      rvm: 2.1
   allowed_failures:
     - gemfile: gemfiles/rails_latest_and_doorkeeper_latest.gemfile

data/Gemfile

@@ -1,13 +1,10 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-# Define Rails version
-gem 'rails', '~> 4.2.0'
-
-gem 'doorkeeper', '~> 4.2.0'
+source "https://rubygems.org"
 
-gem 'pry'
-gem 'sqlite3'
-gem 'factory_girl'
-gem 'appraisal'
+# Define Rails version
+gem "doorkeeper", "~> 4.2.0"
+gem "rails", "~> 4.2.0"
+gem "sqlite3"
 
 gemspec

data/README.md

@@ -8,11 +8,71 @@ https://github.com/doorkeeper-gem/doorkeeper/pull/249
 ## Installation
 
 1. Add both gems to your `Gemfile`.
-2. Add `assertion` as a `grant_flow` to your initializer.
+2. Add `assertion` as a `grant_flow` to your initializer. There are multiple ways to use it:
+  - Reuse devise configuration (returns OmniAuth AuthHash)
+  - Direct Omniauth configuration (returns OmniAuth AuthHash)
+  - Other Alternatives (they are not OmniAuth AuthHash compatible)
 
 ___
 
-Lets you define your own way of authenticating resource owners via 3rd Party
+
+
+### Reuse devise configuration
+
+Will automagically load the OmniAuth configs from Devise, and will return a OmniAuth AuthHash.
+NOTE: `server.client` will authenticate your client, if you dont need it delete `server.client` from the if.
+
+```ruby
+Doorkeeper.configure do
+  resource_owner_from_assertion do
+    if server.client && params[:provider] && params[:assertion]
+      auth = Doorkeeper::GrantsAssertion::Devise::OmniAuth.auth_hash(
+        provider: params.fetch(:provider),
+        assertion: params.fetch(:assertion)
+      )
+      User.where(email: auth.info.email).first if auth
+    end
+  end
+  # add your supported grant types and other extensions
+  grant_flows %w(assertion authorization_code implicit password client_credentials)
+end
+```
+
+### Direct Omniauth configuration
+
+Reuses OmniAuth strategy implementation, such as facebook or google.
+This allows you to use the auth_hash, which will return a OmniAuth AuthHash
+NOTE: `server.client` will authenticate your client, if you dont need it delete `server.client` from the if.
+
+```ruby
+Doorkeeper.configure do
+  resource_owner_from_assertion do
+    if server.client && params[:provider] && params[:assertion]
+      case params.fetch(:provider)
+      when "google"
+        auth = Doorkeeper::GrantsAssertion::OmniAuth.oauth2_wrapper(
+          provider: "google",
+          strategy_class: OmniAuth::Strategies:::GoogleOauth2,
+          client_id: ENV["GOOGLE_CLIENT_ID"],
+          client_secret: ENV["GOOGLE_CLIENT_SECRET"],
+          client_options: { skip_image_info: false },
+          assertion: params.fetch(:assertion)
+        ).auth_hash rescue nil
+        unless auth.nil?
+          # your custom finders - just like in devise omniauth
+          User.find_by(google_id: auth['id'])
+        end
+      end
+    end
+  end
+  # add your supported grant types and other extensions
+  grant_flows %w(assertion authorization_code implicit password client_credentials)
+end
+```
+
+### Other Alternatives
+
+Also, lets you define your own way of authenticating resource owners via 3rd Party
 applications. For example, via Facebook:
 
 ```ruby
@@ -48,3 +108,12 @@ IETF standard: http://tools.ietf.org/html/rfc7521
 ## Supported versions
 
 Assertion grant extension for Doorkeeper is tested with Rails 4.2 and 5.0.
+
+## Contributing
+
+After adding the feature and funtionality, please run
+```
+ bundle exec appraisal install
+```
+
+This will update gems in for travis ci tests.

data/Rakefile

@@ -1,8 +1,10 @@
-require 'bundler/setup'
-require 'rspec/core/rake_task'
-require 'appraisal'
+# frozen_string_literal: true
 
-desc 'Default: run specs.'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "appraisal"
+
+desc "Default: run specs."
 task :default => :spec
 
 desc "Run all specs"
@@ -11,8 +13,8 @@ RSpec::Core::RakeTask.new(:spec)
 namespace :doorkeeper do
   desc "Install doorkeeper in dummy app"
   task :install do
-    cd 'spec/dummy'
-    system 'bundle exec rails g doorkeeper:install --force'
+    cd "spec/dummy"
+    system "bundle exec rails g doorkeeper:install --force"
   end
 end
 

data/doorkeeper-grants_assertion.gemspec

@@ -1,22 +1,41 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "doorkeeper/grants_assertion/version"
+
 Gem::Specification.new do |s|
   s.name        = 'doorkeeper-grants_assertion'
-  s.version     = '0.1.0'
+  s.version     = Doorkeeper::GrantsAssertion::VERSION
   s.authors     = ['Tute Costa']
   s.email       = ['tutecosta@gmail.com']
-  s.homepage    = "https://github.com/doorkeeper-gem/doorkeeper/doorkeeper-grants-assertion"
+  s.homepage    = "https://github.com/doorkeeper-gem/doorkeeper-grants-assertion"
   s.summary     = "Assertion grant extension for Doorkeeper."
   s.description = "Assertion grant extension for Doorkeeper."
   s.license     = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- test/*`.split("\n")
+  s.files         = `git ls-files -z`.split("\x0").reject { |f|
+    f.match(%r{^(test|spec|features)/})
+  }
+  s.test_files    = ` /*`.split("\n")
   s.require_paths = ["lib"]
 
   s.add_dependency "railties", ">= 3.1"
   s.add_dependency "doorkeeper", ">= 4.0"
+
   s.add_development_dependency "rspec-rails", ">= 2.11.4"
-  s.add_development_dependency "capybara", ">= 2.2.0"
-  s.add_development_dependency "factory_girl", "~> 2.6.4"
-  s.add_development_dependency "generator_spec", "~> 0.9.0"
-  s.add_development_dependency "database_cleaner", "~> 1.2.0"
+  s.add_development_dependency "capybara", "~> 2.18.0"
+  s.add_development_dependency "factory_bot", "~> 4.8.2"
+  s.add_development_dependency "generator_spec", "~> 0.9.4"
+  s.add_development_dependency "database_cleaner", "~> 1.6.2"
+  s.add_development_dependency "pry", ">= 0.11.3"
+  s.add_development_dependency "appraisal", "~> 2.2.0"
+  s.add_development_dependency "omniauth-oauth2", "~> 1.5.0"
+  s.add_development_dependency "omniauth-facebook", "~> 4.0.0"
+  s.add_development_dependency "omniauth-google-oauth2", "~> 0.5.3"
+  s.add_development_dependency "webmock", "~> 3.3.0"
+  s.add_development_dependency "devise", "~> 4.4.3"
+
 end

data/gemfiles/rails_4_2.gemfile

@@ -4,9 +4,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
 gem "doorkeeper", "~> 4.2.0"
-gem "pry"
 gem "sqlite3"
-gem "factory_girl"
-gem "appraisal"
 
 gemspec path: "../"

data/gemfiles/rails_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    doorkeeper-grants_assertion (0.1.0)
+    doorkeeper-grants_assertion (0.2.0)
       doorkeeper (>= 4.0)
       railties (>= 3.1)
 
@@ -49,30 +49,44 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
+    bcrypt (3.1.12)
     builder (3.2.3)
-    capybara (2.15.4)
+    capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     crass (1.0.2)
-    database_cleaner (1.2.0)
+    database_cleaner (1.6.2)
+    devise (4.4.3)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
     diff-lcs (1.3)
     doorkeeper (4.2.6)
       railties (>= 4.2)
     erubis (2.7.0)
-    factory_girl (4.8.1)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
+    faraday (0.12.2)
+      multipart-post (>= 1.2, < 3)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    hashdiff (0.3.7)
+    hashie (3.5.7)
     i18n (0.8.6)
+    jwt (1.5.6)
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -82,15 +96,37 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_mime (0.1.4)
+    mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
-    pry (0.11.1)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (4.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-google-oauth2 (0.5.3)
+      jwt (>= 1.5)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.5)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
+    orm_adapter (0.5.0)
+    pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.0)
+    public_suffix (3.0.2)
     rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -119,6 +155,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.1.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rspec-core (3.6.0)
       rspec-support (~> 3.6.0)
     rspec-expectations (3.6.0)
@@ -136,6 +175,7 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    safe_yaml (1.0.4)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -148,24 +188,35 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webmock (3.3.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
-  capybara (>= 2.2.0)
-  database_cleaner (~> 1.2.0)
+  appraisal (~> 2.2.0)
+  capybara (~> 2.18.0)
+  database_cleaner (~> 1.6.2)
+  devise (~> 4.4.3)
   doorkeeper (~> 4.2.0)
   doorkeeper-grants_assertion!
-  factory_girl
-  generator_spec (~> 0.9.0)
-  pry
+  factory_bot (~> 4.8.2)
+  generator_spec (~> 0.9.4)
+  omniauth-facebook (~> 4.0.0)
+  omniauth-google-oauth2 (~> 0.5.3)
+  omniauth-oauth2 (~> 1.5.0)
+  pry (>= 0.11.3)
   rails (~> 4.2.0)
   rspec-rails (>= 2.11.4)
   sqlite3
+  webmock (~> 3.3.0)
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

data/gemfiles/rails_5_0.gemfile

@@ -4,9 +4,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
 gem "doorkeeper", "~> 4.2.0"
-gem "pry"
 gem "sqlite3"
-gem "factory_girl"
-gem "appraisal"
 
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    doorkeeper-grants_assertion (0.1.0)
+    doorkeeper-grants_assertion (0.2.0)
       doorkeeper (>= 4.0)
       railties (>= 3.1)
 
@@ -52,30 +52,44 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
+    bcrypt (3.1.12)
     builder (3.2.3)
-    capybara (2.15.4)
+    capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     crass (1.0.2)
-    database_cleaner (1.2.0)
+    database_cleaner (1.6.2)
+    devise (4.4.3)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
     diff-lcs (1.3)
     doorkeeper (4.2.6)
       railties (>= 4.2)
     erubis (2.7.0)
-    factory_girl (4.8.1)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
+    faraday (0.12.2)
+      multipart-post (>= 1.2, < 3)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    hashdiff (0.3.7)
+    hashie (3.5.7)
     i18n (0.8.6)
+    jwt (1.5.6)
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -85,16 +99,38 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_mime (0.1.4)
+    mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nio4r (1.2.1)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
-    pry (0.11.1)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (4.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-google-oauth2 (0.5.3)
+      jwt (>= 1.5)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.5)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
+    orm_adapter (0.5.0)
+    pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.0)
+    public_suffix (3.0.2)
     rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -122,6 +158,9 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.1.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rspec-core (3.6.0)
       rspec-support (~> 3.6.0)
     rspec-expectations (3.6.0)
@@ -139,6 +178,7 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    safe_yaml (1.0.4)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -151,27 +191,38 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webmock (3.3.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal
-  capybara (>= 2.2.0)
-  database_cleaner (~> 1.2.0)
+  appraisal (~> 2.2.0)
+  capybara (~> 2.18.0)
+  database_cleaner (~> 1.6.2)
+  devise (~> 4.4.3)
   doorkeeper (~> 4.2.0)
   doorkeeper-grants_assertion!
-  factory_girl
-  generator_spec (~> 0.9.0)
-  pry
+  factory_bot (~> 4.8.2)
+  generator_spec (~> 0.9.4)
+  omniauth-facebook (~> 4.0.0)
+  omniauth-google-oauth2 (~> 0.5.3)
+  omniauth-oauth2 (~> 1.5.0)
+  pry (>= 0.11.3)
   rails (~> 5.0.0)
   rspec-rails (>= 2.11.4)
   sqlite3
+  webmock (~> 3.3.0)
 
 BUNDLED WITH
-   1.16.0
+   1.16.2