omniauth-fortnox-oauth2 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4022f4d3f910ee1f59a350edebc056f1dd60b93c91895b93ce703757b163f57
-  data.tar.gz: 186a3c2d187f38b97509e8b4594640104d8c70435b5e48aff812b433ae69b49f
+  metadata.gz: e867e1c0804b077222e57ec5d0bb96da3fcc642047b435949b65783dcec3e177
+  data.tar.gz: 465953deef868451d8670e3056d99a8ce38c8bb1ba5904dd2d5ec05cf3ab57ab
 SHA512:
-  metadata.gz: 329f0f93ccb9daedc67ff40083b336dd3b9ca973256391805dec85693aee894b9c44338f52e98f4e5264a265597b8332939f9b135cea77630b592eb800bd9130
-  data.tar.gz: 8e77814e839af30c89b41823255372ea40d0a5a97dc5bafca6b955b270d50dac5fed587f687458b4869424fa1946fb0846695628d35574e5ca30dd48619cf79b
+  metadata.gz: c38c7b304242bcf94d265e29a5c42e59e223ccaa790105eddc0b09b63190768fa61eb99a9798ea26d5e83180f91a1a1cc4c31b425f1191ed1923ee9bd59f6260
+  data.tar.gz: 43a72b8c8ce885db697f5a8bf0702a4549fe28b956f3f55e3bea76965168acbbfaf3ad53ec011235b5f347c097d9d73aa74233758eac5d1567234130d4bc85e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-fortnox-oauth2 (0.0.1)
+    omniauth-fortnox-oauth2 (0.0.3)
       omniauth-oauth2
 
 GEM
@@ -14,45 +14,29 @@ GEM
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.2)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
-    hashie (4.1.0)
-    jwt (2.2.3)
+    hashie (5.0.0)
+    jwt (2.6.0)
     method_source (1.0.0)
-    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (2.0.4)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    omniauth (2.1.0)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
-    omniauth-oauth2 (1.7.1)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -60,8 +44,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    rack (3.0.3)
+    rack-protection (3.0.5)
       rack
     rake (13.0.6)
     rexml (3.2.5)
@@ -79,12 +63,17 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
     ruby2_keywords (0.0.5)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    version_gem (1.1.1)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-19
 
 DEPENDENCIES

data/README.md

@@ -46,6 +46,10 @@ Can also be set up with dynamic configuration:
                    end)
 ```
 
+Service account in Fortnox can be configured with the optional parameter `account_type`.
+```ruby
+  account_type: 'service'
+```
 
 You can now access the OmniAuth Fortnox OAuth2 URL: /auth/fortnox_oauth2
 Later a controller can be set up to handle the response after authentication, for example:
@@ -75,6 +79,17 @@ You can also configure the `client_options` by passing in any of the following s
 
 * `token_method`: Override the token_method used by the gem, default `:post`.
 
+## Note
+Currently the only way to support multiple redirect uri's in Fortnox is to add them sperated using ` ` (space). This will work for the initial request to get the authorization code.
+When trading the code for a token the `redirect_uri` will be matched using the string used in Fortnox developer portal. This is beeing changed but for now the workaround is to pass that string.
+This can here be passed as an option `fortnox_redirect_uri`, it can contain one or multiple uri's.
+This will need to exactly match the string in Fortnox.
+
+For example:
+```ruby
+env['omniauth.strategy'].options[:fortnox_redirect_uri] = 'https://test.test/callback https://second-test.test/callback'
+```
+
 ## Auth Hash
 
 Here's an example of an authentication hash available in the callback by accessing `request.env['omniauth.auth']`:

data/lib/omniauth/fortnox_oauth2/version.rb

@@ -2,6 +2,6 @@
 
 module Omniauth
   module FortnoxOAuth2
-    VERSION = '0.0.1'
+    VERSION = '0.0.3'
   end
 end

data/lib/omniauth/strategies/fortnox_oauth2.rb

@@ -18,8 +18,9 @@ module OmniAuth
         token_method: :post
       }
 
-      option :authorize_options, %i[scope state]
+      option :authorize_options, %i[scope state account_type]
       option :provider_ignores_state, false
+      option :fortnox_redirect_uri, nil
 
       uid { raw_info['CompanyInformation']['OrganizationNumber'] }
 
@@ -57,7 +58,7 @@ module OmniAuth
           client_id: options['client_id'],
           response_type: 'code',
           scope: (options['scope'] || DEFAULT_SCOPE)
-        }
+        }.merge( options['account_type'] ? { account_type: options['account_type'] } : {} )
 
         super
       end
@@ -66,11 +67,21 @@ module OmniAuth
         options[:callback_url] || (full_host + script_name + callback_path)
       end
 
+      # Currently the only way to support multiple redirect uri's in Fortnox
+      # is to add them sperated using ` ` (space). This will work for the
+      # initial request to get the authorization code.
+      # When trading the code for a token the `redirect_uri` will be matched
+      # using the string entered in Fortnox developer portal. This is beeing
+      # changed but for now the workaround is to pass that string.
+      # It can contain one or multiple uri's.
+      #
       def build_access_token
+        redirect_uri = options.fortnox_redirect_uri || callback_url
         verifier = request.params['code']
+
         client.auth_code.get_token(
           verifier,
-          { redirect_uri: callback_url }.merge(token_params.to_hash(symbolize_keys: true)),
+          { redirect_uri: redirect_uri }.merge(token_params.to_hash(symbolize_keys: true)),
           deep_symbolize(options.auth_token_params)
         )
       end

data/spec/strategies/fortnox_spec.rb

@@ -116,6 +116,7 @@ describe OmniAuth::Strategies::FortnoxOauth2 do
       end
 
       before do
+        fortnox_oauth2.options.provider_ignores_state = true
         allow(fortnox_oauth2).to receive(:request) { error_request }
       end
 
@@ -288,5 +289,14 @@ describe OmniAuth::Strategies::FortnoxOauth2 do
           .to eq('companyinformation,invoice')
       end
     end
+
+    context 'when setting account_type in options' do
+      let(:options) { { 'account_type' => 'service' } }
+
+      it 'uses the new account_type' do
+        expect(fortnox_oauth2.authorize_params[:account_type])
+          .to eq('service')
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-fortnox-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - svenne87
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: OmniAuth OAuth2 strategy for Fortnox