imperituroard 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9caa5ad1572dee6c98500f3f462d24b1e33c380
-  data.tar.gz: ad4f914e0ecaa6d3d2ad289af39d72d8d17d6b2a
+  metadata.gz: 5dd10455562230533ca66925146fc6277ad59e8d
+  data.tar.gz: da05bfe279194071153aa51c7fe9071051e4a8ef
 SHA512:
-  metadata.gz: d25801d9cebc2a5ac5f1e4c80939f98187b9021424a3818a7ebd89f5b27e30cb74c4b0f01dff9a268c5489a5dbe9e628abdda7aac21edcde7f74419fe3c5f96d
-  data.tar.gz: 1761bc8bd8a6fea80075c0de0616e3c3777a9f9b333cce4e38176e7ebb3307b392abf03d7693134412f84efb84ec89fdac5b3b8681223250abf509b3ff5aacf2
+  metadata.gz: b5ba1bb0d2403d224fc8e96ab1a7ceb36815c4340b35174a3b7211161ae8090e7a64c38f09c34d577bb2ea66de20e4f25d098a1769b3de65a3a5a6e1c06ad34e
+  data.tar.gz: 5ac36913151dd8637caf0aec3723e0f327e54d336e1c0387ff263f9d8ad2e74c74df41a222c06e83b57e161eff6a19fac2f7a3be79984cf9de7e67ae1e9f88b1

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -48,23 +48,60 @@ class HuaIot
   end
 
   def get_token(app_id, secret)
-    path = "/iocm/app/sec/v1.1.0/login"
-    url_string = "https://" + platformip + ":" + platformport + path
-    uri = URI.parse url_string
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
-    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
-    https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Post.new(uri.path)
-    data = {
-        :appId => app_id,
-        :secret => secret
-    }
-    request.content_type = 'application/x-www-form-urlencoded'
-    request.body = URI.encode_www_form(data)
-    res = https.request(request)
-    {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    out_resp = {}
+    begin
+      path = "/iocm/app/sec/v1.1.0/login"
+      url_string = "https://" + platformip + ":" + platformport + path
+      uri = URI.parse url_string
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+      https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+      https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Post.new(uri.path)
+      data = {
+          :appId => app_id,
+          :secret => secret
+      }
+      request.content_type = 'application/x-www-form-urlencoded'
+      request.body = URI.encode_www_form(data)
+      res = https.request(request)
+      out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    rescue
+      out_resp = {:code => 500, :message => "failed get token"}
+    end
+    p jjj = {:procedure => "get_token", :answ => out_resp}
+    out_resp
+  end
+
+
+  def token_logout(token)
+
+    p "token_logout token: #{token}"
+
+    out_resp = {}
+    begin
+      path = "/iocm/app/sec/v1.1.0/logout"
+      url_string = "https://" + platformip + ":" + platformport + path
+      uri = URI.parse url_string
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+      https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+      https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Post.new(uri.path)
+      data = {
+          :accessToken => token
+      }
+      request.content_type = 'application/json'
+      request.body = URI.encode_www_form(data)
+      res = https.request(request)
+      out_resp = {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
+    rescue
+      out_resp = {:code => 500, :message => "failed logout token"}
+    end
+    p jjj = {:procedure => "token_logout", :answ => out_resp}
+    out_resp
   end
 
   #Registering a Directly Connected Device (Verification Code Mode) (V2)
@@ -88,7 +125,7 @@ class HuaIot
     {:code => res.code, :message => res.message, :body => JSON.parse(res.body.to_s)}
   end
 
-#2.2.4 Registering a Directly Connected Device (Password Mode) (V2)
+  #2.2.4 Registering a Directly Connected Device (Password Mode) (V2)
   def dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile)
     out_resp = {}
     token = get_token(app_id, secret)[:body]["accessToken"]
@@ -113,32 +150,34 @@ class HuaIot
   end
 
 
-
   #2.2.12 Deleting a Directly Connected Device
-  def dev_delete(app_id, secret, dev_id)
+  def dev_delete(app_id, dev_id, token)
     out_resp = {}
-    token = get_token(app_id, secret)[:body]["accessToken"]
-    path = "/iocm/app/dm/v1.1.0/devices/" + dev_id + "?app_Id=" + app_id + "&cascade=true"
-    url_string = "https://" + platformip + ":" + platformport + path
-    uri = URI.parse url_string
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
-    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
-    https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Delete.new(uri.path)
-    request.content_type = 'application/json'
-    request['Authorization'] = 'Bearer ' + token
-    request['app_key'] = app_id
-    res = https.request(request)
-    p res.code
-    p res.body
-    if res.body != nil
-      out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
-    else
-      out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
-    end
 
+    begin
+      path = "/iocm/app/dm/v1.1.0/devices/" + dev_id + "?app_Id=" + app_id + "&cascade=true"
+      url_string = "https://" + platformip + ":" + platformport + path
+      uri = URI.parse url_string
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+      https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+      https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Delete.new(uri.path)
+      request.content_type = 'application/json'
+      request['Authorization'] = 'Bearer ' + token
+      request['app_key'] = app_id
+      res = https.request(request)
+      p res.code
+      p res.body
+      if res.body != nil
+        out_resp = {:code => res.code, :message => res.message, :body => {:answ => JSON.parse(res.body.to_s)}}
+      else
+        out_resp = {:code => res.code, :message => res.message, :body => {:answ => "no data"}}
+      end
+    rescue
+      out_resp = {:code => 500, :message => "dev_delete: Unknown IOT error"}
+    end
     p out_resp
     out_resp
 
@@ -273,21 +312,41 @@ class HuaIot
   end
 
 
-
   ##2.10.7 Adding Members to a Device Group
 
 
-##############################################################3
+  ##############################################################3
 
 
   ########final procedures###############
   def add_new_device_on_huawei(app_id, secret, node_id, name_p, description_p, device_type, profile)
-    dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile)
+    self.dev_register_passw_code_mode2(app_id, secret, node_id, name_p, description_p, device_type, profile)
   end
 
 
   def remove_one_device_from_iot(app_id, secret, dev_id)
-    dev_delete(app_id, secret, dev_id)
+    out_resp = {}
+    begin
+      token = self.get_token(app_id, secret)
+      if token[:code] != 500 && token[:body]["accessToken"]!=nil
+        out_resp = self.dev_delete(app_id, dev_id, token[:body]["accessToken"])
+        if out_resp[:code].to_i == 200 || out_resp[:code].to_i == 204
+          ###logout#
+          begin
+            self.token_logout(token[:body]["accessToken"])
+          rescue
+            nil
+          end
+          ##########
+        end
+      else
+        out_resp = {:code => 500, :message => "remove_one_device_from_iot: Invalid IOT platform token"}
+      end
+    rescue
+      out_resp = {:code => 500, :message => "remove_one_device_from_iot: Unknown error"}
+    end
+    p jjj = {:procedure => "remove_one_device_from_iot", :answ => out_resp}
+    out_resp
   end
 
 

data/lib/imperituroard/projects/iot/mongoconnector.rb

@@ -271,35 +271,45 @@ class MongoIot
       id = ""
       begin
         info = get_imei_info_from_db([imei])
+        p info
+        p "info"
         if info[:body]==[]
           out_resp = {:code => 505, :result => "get_profile_name_from_imei: get_imei_info_from_db returned empty list from database. IMEIS not found"}
         else
           p "fshhsdf"
           p info
           id = info[:body][0]["profile"]
-        end
-      rescue
-        out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_imei_info_from_db not processed correctly and returned: #{info.to_s}"}
-      end
-      begin
-        res = get_profile_name_by_id(id)
-        if res.key?("profile")
-          res=res
-        else
-          out_resp = {:code => 505, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not returned profile. Invalid data in database and returned: #{res.to_s}"}
-        end
+          p id
+          p "id"
+
+          begin
+            p id
+            res = get_profile_name_by_id(id)
+            p res
+            if res.key?("profile")
+              res=res
+            else
+              out_resp = {:code => 505, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not returned profile. Invalid data in database and returned: #{res.to_s}"}
+            end
+
+          rescue
+            out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
+
+          end
+          begin
+            if res["profile"]!=nil
+              out_resp = {:code => 200, :result => "get_profile_name_from_imei: Request completed successfully", :body => res}
+            end
+          rescue
+            out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
+          end
 
-      rescue
-        out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
 
-      end
-      begin
-        if res["profile"]!=nil
-          out_resp = {:code => 200, :result => "get_profile_name_from_imei: Request completed successfully", :body => res}
         end
       rescue
-        out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_profile_name_by_id not processed correctly and returned: #{res.to_s}"}
+        out_resp = {:code => 506, :result => "get_profile_name_from_imei: Function get_imei_info_from_db not processed correctly and returned: #{info.to_s}"}
       end
+
     rescue
       out_resp = {:code => 507, :result => "get_profile_name_from_imei: Unknown SDK error"}
     end

data/lib/imperituroard/version.rb

@@ -1,3 +1,3 @@
 module Imperituroard
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Dzmitry Buynovskiy