omniauth-expressov3 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmRhMzEyMGY3OWRjMjNiMDRkMTIwODc0ZWVjZmU5NDBmMjIyNjcxYg==
+    NmQ0OGM2MmVlMTEzZmQ0ZDlkMjdiY2FhYjFlZDQ1ZGE3ZTQ1NDI2Nw==
   data.tar.gz: !binary |-
-    YmYxOTcxY2I1YWVkZGQ3YjBmMjI1ODAzYjdiYzllMDViZDljMzYzYg==
+    OTg3MDI1MmMwODQ0ZmViMTk2Y2JjNTg1OWI1MmIyYmZmMTQ3Nzg5Mw==
 SHA512:
   metadata.gz: !binary |-
-    N2UyZWNmOWJlNTIyZmI4ZmFhNTUyYzRjMTFjNmQ4OWMxNmRhNmVkMGY4Mjk1
-    MGI5MTRjMDE3YTU0OGEzYzYzNzBiNjkxZjM2ZWIxN2RhZjg3MTg1YjFlNzAz
-    ODFkMGFmYWQ3MjhhNDNlNjAwNmE3NWU1OWU3Yzk0NTNiYTlhZWQ=
+    NjBiZDA3NmVjM2Y1ODllNTM0ZGFmNWZkYTUwYWE4N2U4YmJhOGI3MmU5MDI5
+    Y2NlYzc1ODNlNGI3NTY1MWRiZGI1MDZmY2YyMWY2MmJkMmM1YjYxOWRiNDA1
+    NWZkYjU0MzNjMTc5YTNlMzYyNDMwM2M4ZWY2Zjk1NTFjZDI4MTU=
   data.tar.gz: !binary |-
-    NDhiYWRiNDAwOWM5NzYxMWZmMWY0MDQ3MWY4MTMxM2QxNzUyZTVjYjg1OWFm
-    ZTBlMTQ0MGJjODhlNDU2NDYxMDZjMTg1MDAyNGRmZDBhNjg5YWE5OWQwNGQz
-    NzRkMjMyYTY1Y2RmYzExYjYzZDM5NDZhZmQ2MzE4NGRhNmE4Yzc=
+    YmUwZTA1NDNmNjYyOTlmM2JiYTk1YmM4YjhkYTVlZDk5YWI2YjIxMmYwYmYw
+    MjZmZjRlNzAzNjQ5ZTg4MTA5MTA1ZGUyYTFjM2E5YTE3NmEwNjc3MGJjZmEw
+    YTQ1ZDMzNjAyYWEzNThiMThmN2I3ZjUwMjRkNDVkMzQxNzc5OTU=

data/Gemfile.lock

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

data/lib/omniauth-expressov3/expressov3_auth_client.rb

@@ -12,8 +12,8 @@ module OmniAuth
 
       def initialize(options={})
         service_url = options['service_url'] || SERVICE_URL
-        @json_tine = JSONRPCTineConnection.new service_url, options['debug']
-        @debug = options['debug']
+        @debug = options['debug'] || options[:debug]
+        @json_tine = JSONRPCTineConnection.new service_url, @debug
       end
 
       def send(method_name, args={})
@@ -35,6 +35,7 @@ module OmniAuth
 
       def send method, args=nil
           @json_tine.send method, args
+          @json_tine.result
       end
 
       def get_user_data
@@ -43,7 +44,8 @@ module OmniAuth
         #hash with user data
         { 'keys' => @json_tine.result['keys'],
           'currentAccount' => @json_tine.result['Tinebase']['currentAccount'],
-          'userContact'    => @json_tine.result['Tinebase']['userContact']
+          'userContact'    => @json_tine.result['Tinebase']['userContact'],
+          'expressoAccount'    => @json_tine.result['Expressomail']['accounts']['results'][0]
         }
       end
 

data/lib/omniauth-expressov3/jsonrpc_tine_connection.rb

@@ -37,7 +37,7 @@ module OmniAuth
       end
 
       def send(tine_method, args=nil)
-
+        puts "STARTING METHOD: #{tine_method} - WITH PARAMS: #{args.inspect}" if @debug
         response = execute_http_call(tine_method, args)
         hash_response = parse_response(response)
         @json_return = hash_response[:json_object]
@@ -87,6 +87,9 @@ private
     @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?
+
+    #puts "REQUEST BODY: #{json_body.to_json}" if @debug
+
     @req.body = uri_escape_sanely( json_body.to_json )
     add_request_fields #headers e cookies
     unless @http
@@ -98,11 +101,16 @@ private
   end
 
   def parse_response response
-    json = JSON.parse(response.body)
+    # puts "BODY: #{response.body}" if @debug
+    json_obj = JSON.parse(response.body)
+    # puts json_obj.inspect if @debug
 
-    json_key = json['result']['jsonKey'] if json['result']
 
-    cookies = nil, tine_key = nil
+    if json_obj['result'] and json_obj['result'].is_a? Hash
+      json_key = json_obj['result']['jsonKey']  if  json_obj['result']['jsonKey']
+    end
+
+    cookies =  tine_key = nil
 
     if response.get_fields('Set-Cookie')
       tine_key = response.get_fields('Set-Cookie').to_s.split(';')[0].split('=')[1]
@@ -113,16 +121,16 @@ private
     end
 
     return {
-        :json_object => json,
+        :json_object => json_obj,
         :tine_key => (tine_key || @tine_key) ,
-        :json_key => json_key,
-        :cookies => (cookies || @cookies)
+        :json_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 "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

data/lib/omniauth-expressov3/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
     module ExpressoV3
-      VERSION = '1.0.3'
+      VERSION = '1.0.4'
     end
 end

data/spec/omniauth-expressov3/expressov3_auth_client_2_spec.rb

@@ -14,4 +14,78 @@ describe "OmniAuth::ExpressoV3::AuthClient" do
       auth.close
     end
   end
+
+  context 'explore tine api' do
+
+    before :all do
+      @auth = OmniAuth::ExpressoV3::AuthClient.new :debug => false
+      #@auth.authenticate(ENV['EXPRESSO_USERNAME'], ENV['EXPRESSO_PASSWORD'])
+      @auth_data = @auth.authenticate(ENV['EXPRESSO_USERNAME'], ENV['EXPRESSO_PASSWORD'])
+      @user_data = @auth.get_user_data
+    end
+
+    after :all do
+      @auth.close
+    end
+
+    context 'queries' do
+      it 'search folders' do
+        args = {
+          filter:
+            [
+              {field: "account_id", operator: "equals", value: @user_data["expressoAccount"]["id"]},
+              {field: "globalname", operator: "equals", value: ""}
+
+            ]
+        }
+        result = @auth.send("Expressomail.searchFolders", args)
+        puts "----------------------------------------------------------"
+        puts "PRINTING FOLDERS"
+        puts "----------------------------------------------------------"
+        result['results'].each do |folder|
+          puts "FOLDER: #{folder['id']} - #{folder['globalname']} (#{folder['cache_totalcount']}) emails (#{folder['cache_unreadcount']}) unread"
+          puts "FOLDER DATA: #{folder.inspect}"
+          puts "----------------------------------------------------------"
+        end
+      end
+      it 'search Messages' do
+        args = {
+          filter:
+          [
+            {
+              condition: "OR",
+              filters: [
+                  {condition: "AND", filters: [{field: "query", operator: "contains", value: "", id: "ext-record-351"},
+                    { field: "path", operator: "in",
+                              value: ["/4e3f366969900893e80664b9c745a254f451aacb/NGUzZjM2Njk2OTkwMDg5M2U4MDY2NGI5Yzc0NWEyNTRmNDUxYWFjYjtJTkJPWA2"],
+                              id: "ext-record-368"}],
+              id: "ext-comp-1101", label: "Messages"}]}],
+          paging:
+                  {
+                      sort: "received", dir: "DESC", start: 0, limit: 5
+                  }
+        }
+        result = @auth.send("Expressomail.searchMessages", args)
+        puts "----------------------------------------------------------"
+        puts "LSITING LAST 5 MESSAGES"
+        puts "----------------------------------------------------------"
+        (0..4).each do |i|
+          puts "SUBJECT: #{result['results'][i]['subject']}"
+          puts "EMAIL DATA: #{result['results'][i].inspect}"
+          puts "----------------------------------------------------------"
+        end
+              end
+      it 'query for Expressomail.updateMessageCache' do
+        args = {
+           folderId: 'NGUzZjM2Njk2OTkwMDg5M2U4MDY2NGI5Yzc0NWEyNTRmNDUxYWFjYjtJTkJPWA2',
+           time: 10
+         }
+        result = @auth.send("Expressomail.updateMessageCache", args)
+        puts "----------------------------------------------------------"
+        puts "UPDATING MESSAGES CACHE"
+        puts "----------------------------------------------------------"
+        puts result
+      end
+    end
+  end
 end

metadata

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