omniauth-idcat_mobil 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77244f98eff1b7533ec93e6dd46935aa70b22cee688b2104c261b5a57b179e4d
-  data.tar.gz: da770c4b57a94bf8ad13724d4f5c472b5a1332dae37d01c926791342efc88a7e
+  metadata.gz: 27e409d3e5d4088b730e67eae75b98113218440b00b3446da5f53821258937d7
+  data.tar.gz: 5efde7d2248f8299c758749d5e6031e6c9d4f68e2635c615e6c9bfd944b60935
 SHA512:
-  metadata.gz: f809df619221c3092a758a8d328ebfded02d284af2fac08994b7cdb0503d8846ff5e6183284e56004b64dd401864d926ee9180f0aede8a38a662ebbda5d39246
-  data.tar.gz: 61b880b43183df731fadfb0ab545e22cb4c0bf4fee4fc57af333da3475d56a2c257d6711bc71a2042f5db20bbe6913ffbfbef6b8f5b9ae1d5d9afb95567bdd0c
+  metadata.gz: ce72d9c3f61068d67fb8d48ada9ba40398e6912e42bc7a2cc26040e29d27f184570309438c48b54130fcdda071b09e5a494657ed30d2fc4a7a9f072f4c796c20
+  data.tar.gz: bf2a541a13da6e760ce13873e92fed42ae1d3400e1d3fb3907032932d8878495775468b6abb8a9953f773abbef133db58d495f2b79e6c1b035e13aaf10096f04

data/.gitignore

@@ -6,4 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
-Gemfile.lock
+.byebug_history

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+2.7.7

data/CHANGELOG.md

@@ -2,8 +2,14 @@
 
 ## next version:
 
+## Version 0.5.0 (MINOR)
+- Send the client_id and the client_secret during the AuthToken retrieval.
+
+## Version 0.4.0 (MINOR)
+- Upgrade omniauth to 2.0.4
+
 ## Version 0.3.0 (MINOR)
-- CI: Intoduce continous integration via GitHub Actions.
+- CI: Introduce continuous integration via GitHub Actions.
 - CI: Apply `rubocop` recommendations.
 
 ## Version 0.2.4 (PATCH)

data/Gemfile

@@ -8,6 +8,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 group :development, :test do
+  gem "byebug"
   gem "rubocop"
   gem "rubocop-rspec"
 end

data/Gemfile.lock

@@ -0,0 +1,92 @@
+PATH
+  remote: .
+  specs:
+    omniauth-idcat_mobil (0.5.0)
+      omniauth (~> 2.0.4)
+      omniauth-oauth2 (>= 1.7.2, < 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    byebug (11.1.3)
+    diff-lcs (1.4.4)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
+    hashie (5.0.0)
+    jwt (2.3.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    oauth2 (1.4.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)
+      hashie (>= 3.4.6)
+      rack (>= 1.6.2, < 3)
+      rack-protection
+    omniauth-oauth2 (1.7.2)
+      oauth2 (~> 1.4)
+      omniauth (>= 1.9, < 3)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rack-protection (2.2.0)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rainbow (3.1.1)
+    rake (12.3.3)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.25.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-rspec (2.8.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.2, >= 2.2.10)
+  byebug
+  omniauth-idcat_mobil!
+  rack (>= 2.1.4)
+  rack-test
+  rake (~> 12.3, >= 12.3.3)
+  rspec (~> 3.0)
+  rubocop
+  rubocop-rspec
+
+BUNDLED WITH
+   2.4.9

data/README.md

@@ -46,7 +46,7 @@ For IdCat mòbil we still need to perform an extra step during the +callback_pha
 
 ### request_phase
 
-`omniauth-idcat_mobil` does not implement this method, instead we rely in the default implementation in `OmniAuth::Strategies::OAuth2`.
+`omniauth-idcat_mobil` does not implement this method, instead we rely on the default implementation in `OmniAuth::Strategies::OAuth2`.
 It simply redirects the user to the authentiction provider to authenticate.
 When users finish with the authentication workflow in IdCat mòbil, this authentication provider redirects them to our `callback_phase`.
 

data/lib/omniauth/idcat_mobil/version.rb

@@ -2,6 +2,6 @@
 
 module Omniauth
   module IdCatMobil
-    VERSION = "0.3.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/omniauth/strategies/idcat_mobil.rb

@@ -20,6 +20,8 @@ module OmniAuth
         mode: :query, # put the param in the query of the requested url
         param_name: "AccessToken"
       }
+      # will be merged with token_params
+      option :token_options, [:client_id, :client_secret]
 
       option :user_info_path, "/serveis-rest/getUserInfo"
 
@@ -112,7 +114,7 @@ module OmniAuth
       # The url where the provider should redirect the users to after authenticating.
       # https://github.com/intridea/omniauth-oauth2/issues/81
       def callback_url
-        full_host + script_name + callback_path
+        File.join([full_host, script_name, callback_path].compact)
       end
 
       # --------------------------------------------------

data/omniauth-idcat_mobil.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "omniauth", "~> 1.5"
-  spec.add_dependency "omniauth-oauth2", ">= 1.4.0", "< 2.0"
+  spec.add_dependency "omniauth", "~> 2.0.4"
+  spec.add_dependency "omniauth-oauth2", ">= 1.7.2", "< 2.0"
   spec.add_development_dependency "bundler", "~> 2.2", ">= 2.2.10"
   spec.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
   spec.metadata["rubygems_mfa_required"] = "true"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-idcat_mobil
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Oliver Valls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,21 +16,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -101,6 +101,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - LICENSE.txt
 - README.md