omniauth-expressov3 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzIyMmY4MGM5NzM1MmViMzNhOGRhMmI1MWRjOTUzMjFjMDY2MTFkZQ==
+    NzU5ODEyM2M2MWRmNmZjODVjNzg2YTcyMDFmNjE5ZDM0ODM0YjQ2OA==
   data.tar.gz: !binary |-
-    Y2Y5ZjVmZDc2ZDIzMzc4MDY3M2U2ZGE4NjQzM2YzNGI0NGNkNjAyMA==
+    ZWEwNTI0Y2RhYjg0YjkwYjdkNDhlMjQwZTIxMjBlNjkxMDc5NjY0Yg==
 SHA512:
   metadata.gz: !binary |-
-    NjA2NTExMDA3MjNjNGRlOWNlNmJlZmE5NzY4NDg2MGQwOTQ3NjQwMWZkMGQ2
-    ODRmMGE1OTc3Y2MzNjUwNWE4M2M4MDA5NGJkZTI4NGNlZTViMjg4ZGZkOTNi
-    NmUzZTU1YjU5MjE2MTlhNmVjMGYyNTU1ZWJiYjk5NGUwOTg1YzE=
+    MjUzNDE4Yzg2ZGIxZmQ0MWY4YTNjM2FlYWFhNmZiNjllYjQ3OTYyZjBjNThi
+    OTYxZmQzZjMzODY5OWEzYjczYTU2MTM2NDRiZjczZTliNjkzYjA2NGFhNjVi
+    NDNkNjQ1ZDg1NzhjYTAxMDljMjU0ODUxZDdjYTJiODdiYTNiZmQ=
   data.tar.gz: !binary |-
-    M2UwZDlkOGI5MzNiODI0OTA4MDdiYTI1YTdhYTY4NTk4YmM1Njg0NTMxNmI5
-    OTQzODJmYTc2MGMyZGQxNzgxMGI4MGRjYWRkZjVhYmY0OGE2NTkwYWY5OTNk
-    MTZmNjI0ZDE4ZjgzYWM0ODUxNWNjZjBiMzMzYzdjNTFmNWYzZjg=
+    OGUxMThiODcwMDUyZDNhOGI1ZTVkOTBiOTg2OTczMjcyMjE3YzU5YTRmZTBk
+    ZGIxNWEyYzkxZDM4MDc3MTgxMzJkZWIzOTA2YjhhZjIyZWU4MjRkYjZmZTQ4
+    ODhmNjM0ZWJmMDdmNzI5MWUyNjg3ZGQ5YzUxZjY2NDAxODk0YTM=

data/.gitignore

@@ -1,3 +1,5 @@
 coverage
 **/*.log
 *.log
+
+omniauth-expressov3-*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-expressov3 (1.0)
+    omniauth-expressov3 (1.0.2)
       omniauth (~> 1.0)
 
 GEM

data/README.md

@@ -1,9 +1,9 @@
 # OmniAuth ExpressoV3
 
-[![Gem Version](https://badge.fury.io/rb/omniauth-expressov3.svg)](http://badge.fury.io/rb/omniauth-expressov3)
 [![Circle CI](https://circleci.com/gh/abner/omniauth-expressov3/tree/master.svg?style=svg)](https://circleci.com/gh/abner/omniauth-expressov3/tree/master)
 [![Code Climate](https://codeclimate.com/github/abner/omniauth-expressov3.png)](https://codeclimate.com/github/abner/omniauth-expressov3)
 [![Code Climate Coverage](https://codeclimate.com/github/abner/omniauth-expressov3/coverage.png)](https://codeclimate.com/github/abner/omniauth-expressov3)
+[![Gem Version](https://badge.fury.io/rb/omniauth-expressov3.svg)](http://badge.fury.io/rb/omniauth-expressov3)
 
 This gem contains the Expresso strategy for OmniAuth.
 
@@ -191,7 +191,7 @@ OmniAuth ExpressoV3 is tested under 1.9.3, 2.0.0, 2.1.0, JRuby, and Rubinius.
 
 Please read the [contribution guidelines](CONTRIBUTING.md) for some information on how to get started. No contribution is too small.
 
-## License
+## License 
 
 Copyright (c) 2015 by Ábner Oliveira
 

data/lib/omniauth-expressov3/expressov3_auth_client.rb

@@ -8,11 +8,12 @@ module OmniAuth
 
       SERVICE_URL =  "https://expressov3.serpro.gov.br/index.php"
 
-    #  VALID_ADAPTER_CONFIGURATION_KEYS = [:service_url]
+       VALID_ADAPTER_CONFIGURATION_KEYS = [:service_url]
 
       def initialize(options={})
         service_url = options['service_url'] || SERVICE_URL
         @json_tine = JSONRPCTineConnection.new service_url, options['debug']
+        @debug = options['debug']
       end
 
       def send(method_name, args={})

data/lib/omniauth-expressov3/jsonrpc_tine_connection.rb

@@ -36,35 +36,18 @@ module OmniAuth
         (@random.rand * 1000000).to_i
       end
 
-      def send(method, args=nil)
-        @req = Net::HTTP::Post.new(@uri.request_uri, initheader = {'Content-Type'=>'application/json'})
-        json_body = {:jsonrpc => '2.0', :method => method, :id => next_cont}
-        json_body.merge!({:params => args}) unless args.nil?
-        @req.body = uri_escape_sanely( json_body.to_json )
-        add_request_fields #headers e cookies
-        unless @http
-          @http = Net::HTTP.new(@uri.host, @uri.port)
-          @http.use_ssl = true
-          @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-        response = @http.start {|http| @http.request(@req) }
-        puts "Response #{response.code} #{response.message}: #{response.body}" if @debug
-        @json_return = JSON.parse(response.body)
-        unless @tine_key && @json_key
-          @json_key = @json_return['result']['jsonKey'] if @json_return['result']
-
-          puts "COOKIES: #{response.get_fields('Set-Cookie')}" if @debug
-          @tine_key = response.get_fields('Set-Cookie').to_s.split(';')[0].split('=')[1]
+      def send(tine_method, args=nil)
+
+        response = execute_http_call(tine_method, args)
+        hash_response = parse_response(response)
+        @json_return = hash_response[:json_object]
+        @cookies = hash_response[:cookies]
+        @tine_key = hash_response[:tine_key]
+        @json_key = hash_response[:json_key]
+        @last_body = response.body
 
-          all_cookies = response.get_fields('set-cookie')
-          cookies_array = Array.new
-          all_cookies.each { | cookie | cookies_array.push(cookie.split('; ')[0]) }
-          @cookies = cookies_array.join('; ')
+        output_debug_response_and_vars(response)
 
-        end
-        puts "TINE_KEY: "+@tine_key if @tine_key and @debug
-        puts "JSON_KEY: "+@json_key if @json_key and @debug
-        @last_body = response.body
         return response, response.body
       end
 
@@ -99,7 +82,55 @@ module OmniAuth
         @tine_key = nil
       end
 
-    protected
+private
+  def execute_http_call(tine_method, args=nil)
+    @req = Net::HTTP::Post.new(@uri.request_uri, initheader = {'Content-Type'=>'application/json'})
+    json_body = {:jsonrpc => '2.0', :method => tine_method, :id => next_cont}
+    json_body.merge!({:params => args}) unless args.nil?
+    @req.body = uri_escape_sanely( json_body.to_json )
+    add_request_fields #headers e cookies
+    unless @http
+      @http = Net::HTTP.new(@uri.host, @uri.port)
+      @http.use_ssl = true
+      @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    return @http.start {|http| @http.request(@req) }
+  end
+
+  def parse_response response
+    json = JSON.parse(response.body)
+
+    json_key = json['result']['jsonKey'] if json['result']
+
+    cookies = nil, tine_key = nil
+
+    if response.get_fields('Set-Cookie')
+      tine_key = response.get_fields('Set-Cookie').to_s.split(';')[0].split('=')[1]
+      all_cookies = response.get_fields('set-cookie')
+      cookies_array = Array.new
+      all_cookies.each { | cookie | cookies_array.push(cookie.split('; ')[0]) }
+      cookies = cookies_array.join('; ')
+    end
+
+    return {
+        :json_object => json,
+        :tine_key => (tine_key || @tine_key) ,
+        :json_key => json_key,
+        :cookies => (cookies || @cookies)
+        }
+  end
+
+  def output_debug_response_and_vars(response)
+    if @debug
+      puts "Response #{response.code} #{response.message}: #{response.body}"
+      puts "TINE_KEY: "+@tine_key if @tine_key
+      puts "JSON_KEY: "+@json_key if @json_key
+      puts "COOKIES: #{@cookies}" if @cookies
+    end
+  end
+
+
+protected
       def add_request_fields
         #headers sempre enviados
         @req.add_field 'User-Agent', 'Ruby JSON-RPC Client 2.0'

data/lib/omniauth-expressov3/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
     module ExpressoV3
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
     end
 end

data/lib/omniauth/strategies/expressov3.rb

@@ -47,6 +47,7 @@ module OmniAuth
         return fail!(:missing_credentials) if missing_credentials?
         begin
           @auth_info = @auth_client.authenticate(request['username'], request['password'])
+
           return fail!(:invalid_credentials) if !@auth_info
 
           @expresso_user_info = @auth_client.get_user_data
@@ -76,32 +77,14 @@ module OmniAuth
       def self.map_user(mapper, object)
         user = {}
         mapper.each do |key, value|
-          case value
-          when String
-            values_keys = value.split('::')
-            value_key = values_keys[0]
-            sub_value_key = values_keys[1]
-            #puts "KEY: #{value_key}"
-            #puts "SUBKEY: #{sub_value_key}"
-            if object && object.has_key?(value_key) && object[value_key] && object[value_key].has_key?(sub_value_key)
-              user[key] = object[value_key][sub_value_key]
-            #  puts "HERE: #{key} => #{object[value_key][sub_value_key]}"
-            else
-              user[key] = nil
-            end
-          #  puts '--------------------------------------------------'
-
-          when Array
-            value.each {|v| (user[key] = object[v.downcase.to_sym].first; break;) if object.respond_to? v.downcase.to_sym}
-          when Hash
-            value.map do |key1, value1|
-              pattern = key1.dup
-              value1.each_with_index do |v,i|
-                part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1].first; break;) if object.respond_to? v1}
-                pattern.gsub!("%#{i}",part||'')
-              end
-              user[key] = pattern
-            end
+          values_keys = value.split('::')
+          value_key = values_keys[0]
+          sub_value_key = values_keys[1]
+
+          if object && object.has_key?(value_key) && object[value_key] && object[value_key].has_key?(sub_value_key)
+            user[key] = object[value_key][sub_value_key]
+          else
+            user[key] = nil
           end
         end
         user

data/spec/omniauth/strategies/expressov3_spec.rb

@@ -116,6 +116,22 @@ describe "OmniAuth::Strategies::ExpressoV3" do
     end
   end
 
+  context 'success touching service' do
+
+    before(:each) do
+      OmniAuth::ExpressoV3::AuthClient.unstub(:new)
+    end
+    let(:auth_hash){ last_request.env['omniauth.auth'] }
+
+    it 'should authenticate on expresso v3' do
+      post('/auth/expressov3/callback', {:username => ENV['EXPRESSO_USERNAME'], :password => ENV['EXPRESSO_PASSWORD']})
+      expect(auth_hash.provider).to eq('expressov3')
+      expect(auth_hash.info.account_id).to eq('801294985')
+      expect(auth_hash.info.username).to eq('80129498572')
+      expect(auth_hash.info.email).to eq('abner.oliveira@serpro.gov.br')
+    end
+  end
+
     #
     context 'success' do
       let(:auth_hash){ last_request.env['omniauth.auth'] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-expressov3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Abner Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth