omniauth-sageone 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da92bc2f9d2afee3f98d52341b7cf51d044cd1da
-  data.tar.gz: 6485af5bd93e8e05f7a35681a6344b5fb6d7ca8b
+  metadata.gz: 4218c9f8c29f2fa4c9a2c19a7f7c8fc79777a413
+  data.tar.gz: 84749b1dc89cbc8ce2cb8b834a0acf18ffe83611
 SHA512:
-  metadata.gz: 485bfa8fbe9a70f414edf9de5479373f0a94b2030062961e68cd44123049b2335448260439753df0a54cc55d8e94f31d075cdc6be37409b05c5076ba480c1265
-  data.tar.gz: 6fb854d669c7962f2a4a34b9a75aab7eca1c78761ff354befb267c14a4d68ddc1560dcc96fa990bfbc50391ae3daed6d271d36f2164f3f4ee479add423a30f1b
+  metadata.gz: 1289b2439738be83ea519add83b3c57c1c7e128488f75d1210e605b539038a637e80b54478e4fa50290005e4706b6e170c4db7d11056e0b2dbc91682c48fad10
+  data.tar.gz: 62c69de437433208dd022978a96b0c3f8d3a5c0b449729d61f63be31e6ed848a9f504f9302d251df77bc2e604ac382fce9d7c7c5296f088036ab8f39f0cda613

data/lib/omniauth-sageone/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module SageOne
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/omniauth/strategies/sage_one.rb

@@ -36,7 +36,8 @@ module OmniAuth
       end
 
       # SageOne has different token endpoints for each available country. The country is returned in
-      # the authorization callback. Configure the OAuth client to use that information.
+      # the authorization callback. Configure the OAuth client to use that information by
+      # customizing the client options
       def client
         ::OAuth2::Client.new(options.client_id, options.client_secret, client_options)
       end
@@ -56,16 +57,14 @@ module OmniAuth
       end
 
       def country
-        request[:country].try(:downcase)
+        request.env ? request[:country].try(:downcase) : options.client_options[:country]
       end
 
+      # Override client_options[:token_url] using the country from ether the request or the
+      # provided country option
       def client_options
-        hash = if country
-                 { token_url: TOKEN_URLS[country] }.merge(options.client_options)
-               else
-                 options.client_options
-               end
-
+        hash = options.client_options
+        hash.merge!(token_url: TOKEN_URLS[country]) if country
         deep_symbolize(hash)
       end
     end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-sageone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jared Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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'
 - !ruby/object:Gem::Dependency
   name: webmock
   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: OmniAuth strategy for SageOne.
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
 - Gemfile
 - Guardfile
 - LICENSE
@@ -125,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for SageOne.