omniauth-fidor 0.0.0 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2YyNzhiNzYzOGNiMWIyZjFlY2Y0MThmMmU3ZDlkNGRmZTk4MTcxNg==
+    MWFjN2E3ZDkyNTg0ODUxYzIzNGNiYmZjMjcyYjk5Mzg4YmE0MWYxMw==
   data.tar.gz: !binary |-
-    NGQ4M2IxZDk3ZDNlYWRlOGE3ZGEwMWMxMzQzNWI4MGNkOTZkNjI4ZA==
+    ZGJhYTQ2NTdiYWY2NjJiY2ZiMWVkNTI0Yzg2NDEyMTZiYWVkOThiMw==
 SHA512:
   metadata.gz: !binary |-
-    ZjY5NmM0ZTYzN2E2ODdmN2NkNWU3ZmUzOTE5MGIzOWZhM2U4YWNhODZiNzU1
-    YmFjODA0NWYyZWJhMDc4OWIxZjMyNWYzYzQ5NGUzNzYyZTVhZmI5YzUyNmM1
-    Zjk0MzI4NWViMWFjYjI1YWYwZDgxYmFjM2QzZGExMzMxMTliODU=
+    NDJlOGJkMDEyZWFkZTQyMmI3MWQwZDI2OTk2ZDVkNDZkOTdkODE4ZTY1N2E5
+    MWU2OGRiNTcyNWI5YTk0NjBlMzcxYzkwYmQ0YjhhMjU1YzEzMTY3OGJiY2M4
+    YWU4MmJiMDQ3YzJlZTJkYmMxMWQ5N2Q0OTQ4YTUxNDdhY2Q1YzM=
   data.tar.gz: !binary |-
-    OTU2MjAzMTU1MmI1MDhiMDdmMDhiMDk1ZGVhOTZmZWRiMzE3MzE1ZjNmMDJk
-    NjljZGMyODE0Nzk5MDY0NGJlOTkxNGFjMDcxYjE0NmJlNjE3YWUzZWRiMTRk
-    NTAzM2FlMDVmMjJiNmRjYTlhZDEzMzBmNGMzZDI2NzNiNjkwYmM=
+    ZjI0NzEyOTUyM2NlNWM0M2M1OGQyNTI2MzYwMTc1Njc1MTM4NjlhOWE0ZmFk
+    MWRlNzFmMWRlZTkyYjNjMzcyYjRlYzk4NzNiMTcyZDcxYmE2ZDM4ZmFjMWY1
+    MDlkMTMyMmEwOTIxNzA0ZmQwYzI4YWQ1NmNiZjU5N2I5ZjRhMDU=

data/CHANGELOG

@@ -1 +1,4 @@
+v0.1.0
+  - Introduces staging/production flag for builder
+  - Fixes bug with requesting user info by adding required request headers
 v0.0.0 Initial version.

data/Manifest

@@ -4,10 +4,8 @@ Manifest
 README.md
 Rakefile
 lib/omniauth-fidor.rb
-lib/omniauth/fidor/config.rb
 lib/omniauth/fidor/version.rb
 lib/omniauth/strategies/fidor.rb
 test/helper.rb
-test/omniauth/fidor/config_test.rb
 test/omniauth/fidor/version_test.rb
 test/omniauth/strategies/fidor_test.rb

data/README.md

@@ -47,8 +47,18 @@ new version, update the version number in the `CHANGELOG`, and then run `rake
 release`, which will create a git tag for the version, push git commits and
 tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-You can also override the API and OAuth URLs used by setting values for the
-`FIDOR_API_URL` and/or `FIDOR_OAUTH_URL` environment variables.
+You can also use the sandbox versions of the API and OAuth URLs for testing by
+passing an optional fourth parameter to the builder:
+
+```ruby
+use OmniAuth::Builder do
+  provider :fidor, ENV['FIDOR_KEY'], ENV['FIDOR_SECRET'], false
+end
+```
+
+If you need to use endpoints that differ from Fidor's production or sandbox
+environments, you can override them by setting the `FIDOR_API_URL` and/or
+`FIDOR_OAUTH_URL` environment variables.
 
 ## Contributing
 

data/lib/omniauth/strategies/fidor.rb

@@ -1,32 +1,24 @@
 require 'omniauth-oauth2'
-require 'omniauth/fidor/config'
 
 module OmniAuth
   module Strategies
     class Fidor < OmniAuth::Strategies::OAuth2
-      option :authorize_options, [:authorization_code]
+      FIDOR_API_HEADERS = {
+        :headers => {
+          'Accept' => 'application/vnd.fidor.de; version=1,text/json',
+          'Content-Type' => 'application/json',
+        },
+      }.freeze
+      FIDOR_API_URL = 'https://api.fidor.de'
+      FIDOR_SANDBOX_URL = 'https://aps.fidor.de'
+      FIDOR_OAUTH_URL = 'https://apm.fidor.de'
 
-      option :client_options, {
-        :authorize_url => OmniAuth::Fidor::Config.authorize_url,
-        :site => OmniAuth::Fidor::Config.site,
-        :token_url => OmniAuth::Fidor::Config.token_url,
-      }
-
-      option :scope, ['user']
-
-      def request_phase
-        super
-      end
+      args [:client_id, :client_secret, :production?]
 
-      def authorize_params
-        super.tap do |params|
-          %w[client_options scopes].each do |v|
-            if request.params[v]
-              params[v.to_sym] = request.params[v]
-            end
-          end
-        end
-      end
+      option :production?, true
+      option :token_params, {
+        grant_type: 'authorization_code',
+      }
 
       uid { raw_info['id'].to_s }
 
@@ -43,14 +35,58 @@ module OmniAuth
         {:raw_info => raw_info}
       end
 
+      def build_access_token
+        verifier = request.params["code"]
+        client.auth_code.get_token(verifier, {:client_id => client.id, :redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)))
+      end
+
+      def client
+        options.client_options.authorize_url = build_oauth_url('/oauth/authorize')
+        options.client_options.site = build_api_url
+        options.client_options.token_url = build_oauth_url('/oauth/token')
+
+        super
+      end
+
+      def authorize_params
+        super.tap do |params|
+          %w[client_options scopes].each do |v|
+            if request.params[v]
+              params[v.to_sym] = request.params[v]
+            end
+          end
+        end
+      end
+
       def raw_info
-        access_token.options[:mode] = :query
-        @raw_info ||= access_token.get('users/current').parsed
+        @raw_info ||= access_token.get('users/current', FIDOR_API_HEADERS).parsed
       end
 
       def email
         raw_info['email']
       end
+
+      private
+
+      def build_api_url
+        if ENV['FIDOR_API_URL']
+          ENV['FIDOR_API_URL']
+        elsif options.production?
+          FIDOR_API_URL
+        else
+          FIDOR_SANDBOX_URL
+        end + '/'
+      end
+
+      def build_oauth_url(path)
+        if ENV['FIDOR_OAUTH_URL']
+          ENV['FIDOR_OAUTH_URL']
+        elsif options.production?
+          FIDOR_OAUTH_URL
+        else
+          FIDOR_SANDBOX_URL
+        end + path
+      end
     end
   end
 end

data/omniauth-fidor.gemspec

@@ -1,51 +1,51 @@
 # -*- encoding: utf-8 -*-
-# stub: omniauth-fidor 0.0.0 ruby lib
+# stub: omniauth-fidor 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "omniauth-fidor"
-  s.version = "0.0.0"
+  s.name = "omniauth-fidor".freeze
+  s.version = "0.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Sasha Gerrand"]
-  s.date = "2016-04-17"
-  s.description = "An OmniAuth OAuth2 based strategy for the Fidor Banking API."
-  s.email = "rubygems-omniauth-fidor@sgerrand.com"
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE.txt", "README.md", "lib/omniauth-fidor.rb", "lib/omniauth/fidor/config.rb", "lib/omniauth/fidor/version.rb", "lib/omniauth/strategies/fidor.rb"]
-  s.files = ["CHANGELOG", "LICENSE.txt", "Manifest", "README.md", "Rakefile", "lib/omniauth-fidor.rb", "lib/omniauth/fidor/config.rb", "lib/omniauth/fidor/version.rb", "lib/omniauth/strategies/fidor.rb", "omniauth-fidor.gemspec", "test/helper.rb", "test/omniauth/fidor/config_test.rb", "test/omniauth/fidor/version_test.rb", "test/omniauth/strategies/fidor_test.rb"]
-  s.homepage = "https://github.com/sgerrand/omniauth-fidor"
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--line-numbers", "--title", "Omniauth-fidor", "--main", "README.md"]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
-  s.rubyforge_project = "omniauth-fidor"
-  s.rubygems_version = "2.4.5"
-  s.summary = "OmniAuth strategy for the Fidor Banking API."
-  s.test_files = ["test/omniauth/fidor/config_test.rb", "test/omniauth/fidor/version_test.rb", "test/omniauth/strategies/fidor_test.rb"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Sasha Gerrand".freeze]
+  s.date = "2016-04-19"
+  s.description = "An OmniAuth OAuth2 based strategy for the Fidor Banking API.".freeze
+  s.email = "rubygems-omniauth-fidor@sgerrand.com".freeze
+  s.extra_rdoc_files = ["CHANGELOG".freeze, "LICENSE.txt".freeze, "README.md".freeze, "lib/omniauth-fidor.rb".freeze, "lib/omniauth/fidor/version.rb".freeze, "lib/omniauth/strategies/fidor.rb".freeze]
+  s.files = ["CHANGELOG".freeze, "LICENSE.txt".freeze, "Manifest".freeze, "README.md".freeze, "Rakefile".freeze, "lib/omniauth-fidor.rb".freeze, "lib/omniauth/fidor/version.rb".freeze, "lib/omniauth/strategies/fidor.rb".freeze, "omniauth-fidor.gemspec".freeze, "test/helper.rb".freeze, "test/omniauth/fidor/version_test.rb".freeze, "test/omniauth/strategies/fidor_test.rb".freeze]
+  s.homepage = "https://github.com/sgerrand/omniauth-fidor".freeze
+  s.licenses = ["MIT".freeze]
+  s.rdoc_options = ["--line-numbers".freeze, "--title".freeze, "Omniauth-fidor".freeze, "--main".freeze, "README.md".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
+  s.rubyforge_project = "omniauth-fidor".freeze
+  s.rubygems_version = "2.6.3".freeze
+  s.summary = "OmniAuth strategy for the Fidor Banking API.".freeze
+  s.test_files = ["test/omniauth/fidor/version_test.rb".freeze, "test/omniauth/strategies/fidor_test.rb".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<omniauth>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<omniauth-oauth2>, ["~> 1.3.1"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.11"])
-      s.add_development_dependency(%q<codeclimate-test-reporter>, [">= 0"])
-      s.add_development_dependency(%q<rake>, ["~> 10.0"])
-      s.add_development_dependency(%q<minitest>, ["~> 5.0"])
+      s.add_runtime_dependency(%q<omniauth>.freeze, ["~> 1.0"])
+      s.add_runtime_dependency(%q<omniauth-oauth2>.freeze, ["~> 1.3.1"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.11"])
+      s.add_development_dependency(%q<codeclimate-test-reporter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
+      s.add_development_dependency(%q<minitest>.freeze, ["~> 5.0"])
     else
-      s.add_dependency(%q<omniauth>, ["~> 1.0"])
-      s.add_dependency(%q<omniauth-oauth2>, ["~> 1.3.1"])
-      s.add_dependency(%q<bundler>, ["~> 1.11"])
-      s.add_dependency(%q<codeclimate-test-reporter>, [">= 0"])
-      s.add_dependency(%q<rake>, ["~> 10.0"])
-      s.add_dependency(%q<minitest>, ["~> 5.0"])
+      s.add_dependency(%q<omniauth>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<omniauth-oauth2>.freeze, ["~> 1.3.1"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.11"])
+      s.add_dependency(%q<codeclimate-test-reporter>.freeze, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, ["~> 10.0"])
+      s.add_dependency(%q<minitest>.freeze, ["~> 5.0"])
     end
   else
-    s.add_dependency(%q<omniauth>, ["~> 1.0"])
-    s.add_dependency(%q<omniauth-oauth2>, ["~> 1.3.1"])
-    s.add_dependency(%q<bundler>, ["~> 1.11"])
-    s.add_dependency(%q<codeclimate-test-reporter>, [">= 0"])
-    s.add_dependency(%q<rake>, ["~> 10.0"])
-    s.add_dependency(%q<minitest>, ["~> 5.0"])
+    s.add_dependency(%q<omniauth>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<omniauth-oauth2>.freeze, ["~> 1.3.1"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.11"])
+    s.add_dependency(%q<codeclimate-test-reporter>.freeze, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, ["~> 10.0"])
+    s.add_dependency(%q<minitest>.freeze, ["~> 5.0"])
   end
 end

data/test/omniauth/strategies/fidor_test.rb

@@ -4,7 +4,7 @@ class OmniAuth::Strategies::FidorTest < Minitest::Test
   def setup
     app = lambda { |_env| [404, {}, ['Awesome']] }
     @subject = OmniAuth::Strategies::Fidor.new(app)
-    OmniAuth.config.test_mode = true
+    @sandbox = OmniAuth::Strategies::Fidor.new(app, '', '', false)
   end
 
   def teardown
@@ -19,15 +19,53 @@ class OmniAuth::Strategies::FidorTest < Minitest::Test
     refute @subject.options.provider_ignores_state
   end
 
-  def test_client_options_has_correct_site
-    assert_equal 'https://api.fidor.de/', @subject.options.client_options.site
+  def test_client_options_has_correct_production_authorize_url
+    assert_equal 'https://apm.fidor.de/oauth/authorize', @subject.client.authorize_url
   end
 
-  def test_client_options_has_correct_authorize_url
-    assert_equal 'https://apm.fidor.de/oauth/authorize', @subject.options.client_options.authorize_url
+  def test_client_options_has_correct_staging_authorize_url
+    assert_equal 'https://aps.fidor.de/oauth/authorize', @sandbox.client.authorize_url
   end
 
-  def test_client_options_has_correct_token_url
-    assert_equal 'https://apm.fidor.de/oauth/token', @subject.options.client_options.token_url
+  def test_client_options_environment_variable_overrides_authorize_url
+    around_env_url('FIDOR_OAUTH_URL', 'proto://another.url') do
+      assert_equal 'proto://another.url/oauth/authorize', @sandbox.client.authorize_url
+    end
+  end
+
+  def test_client_options_has_correct_production_site_url
+    assert_equal 'https://api.fidor.de/', @subject.client.site
+  end
+
+  def test_client_options_has_correct_staging_site_url
+    assert_equal 'https://aps.fidor.de/', @sandbox.client.site
+  end
+
+  def test_client_options_environment_variable_overrides_site_url
+    around_env_url('FIDOR_API_URL', 'proto://another.url') do
+      assert_equal 'proto://another.url/', @sandbox.client.site
+    end
+  end
+
+  def test_client_options_has_correct_production_token_url
+    assert_equal 'https://apm.fidor.de/oauth/token', @subject.client.token_url
+  end
+
+  def test_client_options_has_correct_staging_token_url
+    assert_equal 'https://aps.fidor.de/oauth/token', @sandbox.client.token_url
+  end
+
+  def test_client_options_environment_variable_overrides_token_url
+    around_env_url('FIDOR_OAUTH_URL', 'proto://another.url') do
+      assert_equal 'proto://another.url/oauth/token', @sandbox.client.token_url
+    end
+  end
+
+  private
+
+  def around_env_url(env_key, url, &block)
+    ENV[env_key] = url
+    yield block.call
+    ENV[env_key] = nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-fidor
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Sasha Gerrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -103,7 +103,6 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 - lib/omniauth-fidor.rb
-- lib/omniauth/fidor/config.rb
 - lib/omniauth/fidor/version.rb
 - lib/omniauth/strategies/fidor.rb
 files:
@@ -113,12 +112,10 @@ files:
 - README.md
 - Rakefile
 - lib/omniauth-fidor.rb
-- lib/omniauth/fidor/config.rb
 - lib/omniauth/fidor/version.rb
 - lib/omniauth/strategies/fidor.rb
 - omniauth-fidor.gemspec
 - test/helper.rb
-- test/omniauth/fidor/config_test.rb
 - test/omniauth/fidor/version_test.rb
 - test/omniauth/strategies/fidor_test.rb
 homepage: https://github.com/sgerrand/omniauth-fidor
@@ -151,6 +148,5 @@ signing_key:
 specification_version: 4
 summary: OmniAuth strategy for the Fidor Banking API.
 test_files:
-- test/omniauth/fidor/config_test.rb
 - test/omniauth/fidor/version_test.rb
 - test/omniauth/strategies/fidor_test.rb

data/lib/omniauth/fidor/config.rb

@@ -1,31 +0,0 @@
-require 'uri'
-
-module OmniAuth
-  module Fidor
-    class Config
-      class << self
-        def authorize_url
-          oauth_url + '/oauth/authorize'
-        end
-
-        def site
-          api_url + '/'
-        end
-
-        def token_url
-          oauth_url + '/oauth/token'
-        end
-
-        private
-
-        def api_url
-          ENV['FIDOR_API_URL'] || 'https://api.fidor.de'
-        end
-
-        def oauth_url
-          ENV['FIDOR_OAUTH_URL'] || 'https://apm.fidor.de'
-        end
-      end
-    end
-  end
-end

data/test/omniauth/fidor/config_test.rb

@@ -1,59 +0,0 @@
-require 'helper'
-
-class OmniAuth::Fidor::ConfigTest < Minitest::Test
-  def test_that_it_has_a_authorize_url
-    refute_nil ::OmniAuth::Fidor::Config.authorize_url
-  end
-
-  def test_default_value_for_authorize_url
-    assert_equal 'https://apm.fidor.de/oauth/authorize',
-      ::OmniAuth::Fidor::Config.authorize_url
-  end
-
-  def test_override_value_for_authorize_url
-    around_env_url('FIDOR_OAUTH_URL', 'https://another.url') do
-      assert_equal 'https://another.url/oauth/authorize',
-        ::OmniAuth::Fidor::Config.authorize_url
-    end
-  end
-
-  def test_that_it_has_a_site
-    refute_nil ::OmniAuth::Fidor::Config.site
-  end
-
-  def test_default_value_for_site
-    assert_equal 'https://api.fidor.de/',
-      ::OmniAuth::Fidor::Config.site
-  end
-
-  def test_override_value_for_site
-    around_env_url('FIDOR_API_URL', 'https://another.url') do
-      assert_equal 'https://another.url/',
-        ::OmniAuth::Fidor::Config.site
-    end
-  end
-
-  def test_that_it_has_a_token_url
-    refute_nil ::OmniAuth::Fidor::Config.token_url
-  end
-
-  def test_default_value_for_token_url
-    assert_equal 'https://apm.fidor.de/oauth/token',
-      ::OmniAuth::Fidor::Config.token_url
-  end
-
-  def test_override_value_for_token_url
-    around_env_url('FIDOR_OAUTH_URL', 'https://another.url') do
-      assert_equal 'https://another.url/oauth/token',
-        ::OmniAuth::Fidor::Config.token_url
-    end
-  end
-
-  private
-
-  def around_env_url(env_key, url, &block)
-    ENV[env_key] = url
-    yield block.call
-    ENV[env_key] = nil
-  end
-end