omniauth-expressov3 1.0.6 → 1.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTVhZTJlYWJiNTQ3M2M1NDhlNDQ4NmExMWQ1Zjg5NjZjNzNkZTEwNw==
+    NjA2ODkyOTJjYTZkZjIyZTlkYTc3NzA3NzhhYjM5MjhmZDE5NTQ4Mw==
   data.tar.gz: !binary |-
-    YjNlZmYyOTkyYWYyMjI1YTM3YjZkMDViOGJjMjI1NjkxOWRmNTM5Mw==
+    Mzg2ZTA1MDI1NWNjODdiNmY1YjdlZDU3ZDhlYWM0OGQ0YWMwNTljYQ==
 SHA512:
   metadata.gz: !binary |-
-    YjZhZGZmYzM2ZjcxNTQ4ZTExYTMyMWNmNDdmNDIzOTc3OWFlNWY4YWUxZmIw
-    ZjVkMmZjZDhmOWZmZjRlNThkNjY3NTk3OGRmMGZjMThlMTJkZGVmY2I4MjAx
-    Zjk1Zjc0MGY4NzdiMTBhYmVmNTdjMWI5YjBkNjc0NDdjOTVjNGE=
+    ZDZjNzIwODEzYzdlOGVhYWUwYTdjZDYxM2NiZWI2ZDM0ZjhlZTJkYjQxMzRh
+    YzgwOTBmM2M2ZTI3NTA2Y2NlNDY3ZGM0Zjk4OTQ2MmFiNDI1ZjA2NmY0NDA5
+    ZWY1YjZiMzNkMWNkNTg3ZmZmMmRhOWU4ODAzYzdhMmZmNjgxNWY=
   data.tar.gz: !binary |-
-    MjYxYTQxZjQ2ZDczMDhmODA3MjkxMGE2ZGUyNGU0NThjMzk4MjAyYWUxNzI0
-    MWZlYTQwMGExMmVmMTkzNGU3M2M5NmIxZWE1NjNlNTRlYmNkYWQ4ODFjYjA2
-    ZDU4NmRhYTJmMjQ1OTZkOGE0MDIyOGUyMWU5ODQyYzc4YjZmZjQ=
+    NjdmMWQxYzc4NDdiYTQ4YTM0ZjdhZjNhYWE0NzA4NDY0MWE1MTA5YjZiNzA1
+    YWJhNmNlYmQzZDk2Yjk0NTYyZjA2NTAzODIwZmE4ZWNhMTNiOTg4NzQ4ZDg1
+    ZTY1YzQ4ZTM0MzBjN2Y5OGI3ZmNjN2I5Mjc3MWZlNTE4ZDE3NTE=

data/Gemfile

@@ -1,5 +1,6 @@
 source "http://rubygems.org"
 
+ruby '1.9.3'
 gemspec
 
 group :development, :test do

data/Gemfile.lock

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

data/lib/omniauth/strategies/expressov3.rb

@@ -18,7 +18,8 @@ module OmniAuth
        :telephone => 'userContact::tel_work',
        :organization_unit => 'userContact::org_unit',
        :tine_key => 'keys::tine_key',
-       :json_key => 'keys::json_key'
+       :json_key => 'keys::json_key',
+       :cookies => 'keys::cookies'
       }
 
       option :title, "Autenticação Expresso V3" #default title for authentication form
@@ -43,7 +44,6 @@ module OmniAuth
       end
 
       def callback_phase
-
         @auth_client = OmniAuth::ExpressoV3::AuthClient.new @options
 
         return fail!(:missing_credentials) if missing_credentials?
@@ -58,7 +58,6 @@ module OmniAuth
 
           super
         rescue Exception => e
-          puts "#{e.message} -\n\t#{e.backtrace}"
           return fail!(:expressov3_error, e)
         end
       end

data/lib/omniauth-expressov3/expressov3_auth_client.rb

@@ -34,14 +34,15 @@ module OmniAuth
         build_struct @json_tine.result
       end
 
-      def send method, args=nil
+      def send method, args={}
           @json_tine.send method, args
           build_struct @json_tine.result
       end
 
-      def get_user_data
+      def get_user_data args={}
         #request to get user data
-        @json_tine.send 'Tinebase.getAllRegistryData'
+        @json_tine.send 'Tinebase.getAllRegistryData', args
+
         # hash with user data
         build_struct :keys => @json_tine.result['keys'],
             :currentAccount => @json_tine.result['Tinebase']['currentAccount'],

data/lib/omniauth-expressov3/jsonrpc_tine_connection.rb

@@ -39,7 +39,12 @@ module OmniAuth
       end
 
       def send(tine_method, args=nil)
+        @json_key = args.delete(:json_key) if args.has_key? :json_key
+        @tine_key = args.delete(:tine_key) if args.has_key? :tine_key
+        @cookies = args.delete(:cookies) if args.has_key? :cookies
+
         response = execute_http_call(tine_method, args)
+
         hash_response = parse_response(response)
         @json_return = hash_response[:json_object]
         @cookies = hash_response[:cookies]
@@ -71,7 +76,11 @@ module OmniAuth
 
       def keys
         {
-          'keys' => {'tine_key' => @tine_key, 'json_key' => @json_key}
+          'keys' => {
+                    'tine_key' => @tine_key,
+                    'json_key' => @json_key,
+                    'cookies' => @cookies
+                    }
         }
       end
 
@@ -87,9 +96,14 @@ module OmniAuth
 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?
+
+    unless args.nil? or args.empty?
+      #raise tine_method unless 'Tinebase.login'.eql? tine_method
+      json_body.merge!({:params => args})
+    end
 
     #puts "REQUEST BODY: #{json_body.to_json}" if @debug
 
@@ -154,6 +168,7 @@ protected
         #header e cookie enviados pelo usuario logado
         @req.add_field 'X-Tine20-JsonKey', @json_key if @json_key
         #@req.add_field 'Cookie', 'TINE20SESSID='+@tine_key if @tine_key
+        #puts @cookies.inspect
         @req.add_field 'Cookie', @cookies if @cookies
       end
 

data/lib/omniauth-expressov3/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
     module ExpressoV3
-      VERSION = '1.0.6'
+      VERSION = '1.0.7'
     end
 end

data/spec/omniauth-expressov3/expressov3_auth_client_2_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+
 describe "OmniAuth::ExpressoV3::AuthClient" do
 
   before :all do
@@ -23,6 +24,25 @@ describe "OmniAuth::ExpressoV3::AuthClient" do
     end
   end
 
+  context 'reuse tine key, json key and cookies' do
+    let(:client) do
+      auth = OmniAuth::ExpressoV3::AuthClient.new :debug => false
+      auth
+    end
+
+    let(:auth_data) do
+      auth_data = client.authenticate(ENV['EXPRESSO_USERNAME'], ENV['EXPRESSO_PASSWORD'])
+    end
+
+    let(:new_client) { OmniAuth::ExpressoV3::AuthClient.new :debug => false }
+
+    describe 'new client' do
+      it 'should connect using auth data of a previous authentication' do
+        user_data = new_client.get_user_data(auth_data.keys.to_h)
+      end
+    end
+  end
+
   context 'explore tine api' do
 
     before :all do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "codeclimate-test-reporter"
 require  'highline/import'
 require  'awesome_print'
+
 CodeClimate::TestReporter.start
 
 $:.unshift File.expand_path('..', __FILE__)

metadata

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