omniauth-gov 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4525bfa961b172289a862e7dee70a2eeb78f5ef93e0d8dbd9dcf007b3c79cc
-  data.tar.gz: b1d70bc16edeb44c561539f73005472271a1f571f671b65e6eaec0a600d64c1e
+  metadata.gz: 7e8838d0aa21b42f3fd34e55119cd4e09b0b0a06f8f270b763eb89c02dcbc965
+  data.tar.gz: feefa806757d036278f21b0631f43c49212ee2faa286297686ee04ab3155c308
 SHA512:
-  metadata.gz: e6215025868df7e05e8e1efd8b58f6476319d670f96bd6c4f797becf21bc69916b13cd18a0ecc657d29e7395898a66a4b8cef7d755994c879c1b0b0c2faab1c4
-  data.tar.gz: 3e1d460cfb370a8bee1d083226ea4e86fa8943d24188cae71b23bf0d9e262653103b7e6feabffb4f15787e85c3b50f8639347928b4a1b2b239c0c1a33fad4b30
+  metadata.gz: 287b802208398e3bfbc99d560fb2402878a1029035d053ef0dd0dc75f1ed5c48c09f9ed12dabe8a2f25c89258d840e59dc15d88d6a2f22c58ffbaad0280cb009
+  data.tar.gz: fe04c521d519f874bc91596dba667bfbd7dc12de4eab13a104067dfc24073767a6d1523e9785fab53e45e1354e3b94ee28e5e579e42c581cf84512d3920952dc

data/README.md

@@ -10,7 +10,7 @@ Estratégia omniauth para integração do Login Único do governo brasileiro ao
 gem 'omniauth', '1.9.1'
 gem "omniauth-rails_csrf_protection", '0.1.2'
 gem 'omniauth-oauth2'
-gem 'omniauth-gov', '~> 0.1.3'
+gem 'omniauth-gov', '~> 0.1.5'
 ```
 
 ## Configuração devise
@@ -24,8 +24,7 @@ Em `config/initializers/devise.rb.rb`
       ENV['client_id'], 
       ENV['client_secret'], 
     scope: 'openid+email+profile+govbr_confiabilidades+', 
-    callback_path: '/callback-da-aplicacao',
-    app_url: "https://endereco-do-app.gov.br"
+    callback_path: '/callback-da-aplicacao'
 
     config.omniauth_path_prefix = '/prefixo-devise/prefixo-omniauth'
   end
@@ -127,4 +126,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/omniauth/strategies/gov.rb

@@ -3,11 +3,6 @@ require 'omniauth-oauth2'
 module Omniauth
   module Strategies
     class Gov < OmniAuth::Strategies::OAuth2
-      option :client_options, {
-        site: 'https://sso.acesso.gov.br',
-        authorize_url: 'https://sso.acesso.gov.br/authorize',
-        token_url: 'https://sso.acesso.gov.br/token'
-      }
       option :pkce, true
 
       credentials do
@@ -40,7 +35,16 @@ module Omniauth
           'raw_info': raw_info
         }
       end
+
+      def client
+        options.client_options.merge!({connection_opts: {request: {params_encoder: GovBr::ParamsEncoder}}})
+        ::OAuth2::Client.new(options.client_id, options.client_secret, deep_symbolize(options.client_options))
+      end
       
+      def request_phase
+        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(authorize_params))
+      end
+
       def raw_info
         @raw_info ||= JWT.decode(credentials["id_token"], nil, false)[0]
       end
@@ -52,11 +56,6 @@ module Omniauth
         end
       end
 
-      def client
-        options.client_options.merge!({connection_opts: {request: {params_encoder: GovBr::ParamsEncoder}}})
-        ::OAuth2::Client.new(options.client_id, options.client_secret, deep_symbolize(options.client_options))
-      end
-
       def authorize_params # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         options.authorize_params[:state] = SecureRandom.hex(24)
         options.authorize_params[:client_id] = options[:client_id]
@@ -75,7 +74,7 @@ module Omniauth
 
       def build_access_token
         verifier = request.params["code"]
-        redirect_uri = "#{options.app_url}/#{options.callback_path}".gsub!(%r{/+}, '/')
+        redirect_uri = "#{OmniAuth.config.full_host}/#{options.callback_path}".gsub!(%r{/+}, '/')
         
         atoken = client.auth_code.get_token(
           verifier, 
@@ -87,4 +86,7 @@ module Omniauth
   end
 end
 
+  end
+end
+
 OmniAuth.config.add_camelization 'gov', 'Gov'

data/lib/omniauth-gov/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Gov
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gov
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Jonas Ricardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth