pampa_workers 1.1.12 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dad18d5f5f7633d9ad7bc4e9e5a772742f6e95a
-  data.tar.gz: 8baca930b019317adca58ca19749e31e2845a35c
+  metadata.gz: 7c4aa601fbee13613b79ce12aead5b1b2595057a
+  data.tar.gz: ef70920af4002fa4d01fdf5ac8f9415704002026
 SHA512:
-  metadata.gz: 9c28677eb7d139b247177b3834c7cd67d0b92a079720c6658791fa9c832ba49aae0b9f088c23238a2b609fd0d3ded8b6b5f3d650f290a32698a5e923740fdb43
-  data.tar.gz: a2f4fe384f8d9d5d1a1ad67f40902f8a266d47feab9421a00959e3436982f439c1b64de845b0287687bb1627e920f58f3704c210657627493481cb3e3bbac62a
+  metadata.gz: 3b066535662908abe26d916747d1dc822d2ca204bfd8ed941f6bf1a5297e9114892ef38e49df90b35cbc9bf248eec36d91182dfe036fcc52ca6a959b4ea49ea8
+  data.tar.gz: 58c31dedf4d304ba7271919418cc63eb99dcc0195864e139041527ee26e464e5022f32890264242765263f8b8498c4f471950715ca6e150c1b3b4dd6e9eabeb9

data/lib/client.rb

@@ -85,50 +85,59 @@ module BlackStack
   
     # llama a la api de postmark preguntando el reseller email configurado para este clietne fue ferificado
     def checkDomainForSSMVerified()
-      return_message = {}
+			return_message = {}  
       domain = self.domain_for_ssm
       email = self.from_email_for_ssm
       id = ''
       client = ''
-  
       if domain != nil && email != nil
         begin
-          client_postmark = Postmark::AccountApiClient.new(POSTMARK_API_TOKEN, secure: true)      
-          client_list = client_postmark.get_signatures()
-  
-          client_list.each do |sign|
-            if sign[:domain] == domain
-              if sign[:email_address] == email
-                id = sign[:id]
-                break
-              end
-            end
-          end
-  
-          if id.to_s.size > 0
-            client = client_postmark.get_sender(id)
+          # create postmark client
+					client_postmark = Postmark::AccountApiClient.new(POSTMARK_API_TOKEN, secure: true)      
+					
+          # get signature
+					# more info: https://github.com/wildbit/postmark-gem/wiki/Senders
+					#
+					# this first strategy is not scalable if we handle a large list of signatures.
+					#sign = client_postmark.signatures.select { |sign| sign[:domain]==domain }.first
+					# 
+					# this other approach is a bit more scalable, but anyway we need to call the API 
+					# with filering by the domain.
+					# 
+					pagesize = 30 # TODO: increase this value to 300 for optimization
+					i = 0
+					j = 1
+					sign = nil
+					while j>0 && sign.nil?
+						buff = client_postmark.get_signatures(offset: i, count: pagesize)
+						j = buff.size
+						i += pagesize
+						sign = buff.select { |s| s[:domain]==domain }.first
+					end # while
+					
+					# if signature has been found?
+          if sign.nil?
+						# sincronizo con la central
+						return_message[:status] = "Client Signature Not Found"
+						return_message[:value] = client[:id]
+						return return_message.to_json 
+					else
+            id = sign[:id]
+						client = client_postmark.get_sender(id)
             if !client[:confirmed]
               self.domain_for_ssm_verified = false
-              self.save
-  
+              self.save  
               return_message[:status] = "No Verified"
               return_message[:value] = client[:id]
-  
               return return_message.to_json 
             else
               self.domain_for_ssm_verified = true
-              self.save
-  
-              # sincronizo con la central
-              return_message = {}
-  
+              self.save  
               return_message[:status] = "success"
               return_message[:value] = client[:id]
-  
               return return_message.to_json 
             end
           end
-    
         rescue Postmark::ApiInputError => e
           return_message[:status] = e.to_s
           return return_message.to_json
@@ -172,7 +181,7 @@ module BlackStack
       if self.resellerSignatureEnabled?
         return self.from_email_for_ssm.to_s
       else
-        return BlackStack::Params.getValue("notifications.user.email_from")
+        return NOTIFICATIONS[:from_email]
       end
     end
   
@@ -182,7 +191,7 @@ module BlackStack
       if self.resellerSignatureEnabled?
         return self.from_email_for_ssm.to_s
       else
-        return BlackStack::Params.getValue("notifications.user.name_from")
+        return NOTIFICATIONS[:from_name]
       end
     end
   end # class Client

data/lib/mybotprocess.rb

@@ -113,14 +113,14 @@ module BlackStack
         url = 
           "#{BlackStack::Pampa::api_protocol}://#{self.ws_url}:#{self.ws_port}/api1.3/pampa/scrape.inbox/notify_lnchat.json?" +
           "api_key=#{BlackStack::Pampa::api_key}&" +
-          "profile_code=#{URI.escape(conv[:profile_code])}&" +
-          "profile_name=#{URI.escape(conv[:profile_name])}&" +
-          "profile_headline=#{URI.escape(conv[:profile_headline])}&" +
-          "first=#{URI.escape(conv[:first])}&" +
+          "profile_code=#{CGI.escape(conv[:profile_code])}&" +
+          "profile_name=#{CGI.escape(conv[:profile_name])}&" +
+          "profile_headline=#{CGI.escape(conv[:profile_headline])}&" +
+          "first=#{CGI.escape(conv[:first])}&" +
           "position=#{chat[:position].to_s}&" +
           "uid=#{lnuser['id']}&" +
-          "sender_name=#{URI.escape(chat[:sender_name])}&" +
-          "body=#{URI.escape(chat[:body])}&" 
+          "sender_name=#{CGI.escape(chat[:sender_name])}&" +
+          "body=#{CGI.escape(chat[:body])}&" 
 puts ""
 puts "url:#{url}:."
 puts ""

data/lib/pampa_workers.rb

@@ -32,6 +32,7 @@ module BlackStack
 
     # 
     @@division_name = nil
+    @@timeout = 5
 
     def self.division_name() 
       @@division_name
@@ -42,6 +43,15 @@ module BlackStack
       @@division_name = s
     end
 
+    def self.timeout() 
+      @@timeout
+    end
+
+    #
+    def self.set_timeout(t) 
+      @@timeout = n
+    end
+
     # Api-key of the client who will be the owner of a process.
     @@api_key = nil
     
@@ -212,7 +222,8 @@ module BlackStack
           :port => BlackStack::Pampa::db_port, # Required when using other that 1433 (default)
           :database => BlackStack::Pampa::db_name,
           :user => BlackStack::Pampa::db_user,
-          :password => BlackStack::Pampa::db_password
+          :password => BlackStack::Pampa::db_password,
+          :timeout => BlackStack::Pampa::timeout
           }      
       else
         url = "#{BlackStack::Pampa::api_url}/api1.2/division/get.json"
@@ -233,7 +244,8 @@ module BlackStack
             :port => parsed["db_port"], # only required if port is different than 1433
             :database => parsed["db_name"],
             :user => parsed["db_user"],
-            :password => parsed["db_password"]
+            :password => parsed["db_password"],
+            :timeout => BlackStack::Pampa::timeout
           }
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa_workers
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.18
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket