domoscio_viz 0.1.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b56d8068cc89b1fd70f1d0d085e960307ce7038261c9a2640fc2033286f7b49
-  data.tar.gz: d64091ea450a17c5500f13caa3b48618c12f8cdf7e135eac6912fff31254367e
+  metadata.gz: '03468c791eacd5b3f47a390530f79cf17e5958f62b4c10e4dbd6ae4f7142210e'
+  data.tar.gz: 97dd49337711f35d774db1b9958524dc6ac9a20f77cda5173723cce4e79061f3
 SHA512:
-  metadata.gz: 5fd0f66253608031e7ccb578492430d9b4d0febc8b8c9fff50f8cae52a910f3ae77d81acc53b3b6c21e6deedbb07a81a677b1855bc255989e046084370fe817c
-  data.tar.gz: ecf4b4b43f307db1d29950ecadbbccc25ebd3cec5ad2e0a310afe6d1aa5200d7c1ce7bfc57b15f3f604f0cb89882192dc2339a2b65bfeeda1ef48ee35e30983f
+  metadata.gz: 6f96faeb12b74a5efe1d32e9e28a6d50763c05c969239114127c4cff14b45da9a6be097bd3596a2aa1976f3ab5601b916891fd423b68d5c2185a3ca4bb997b9f
+  data.tar.gz: 60fce846d350aa913453f5c35de699a26e7bae9cf7379d56b968bee6b1ae433ccf7bc065eb612a450af028738a8d81cca75f7c5e002906e953b5a681bc882931

data/lib/domoscio_viz.rb

@@ -66,10 +66,12 @@ module DomoscioViz
 
     res = DomoscioViz.send_request(uri, method, params, headers, before_request_proc)
 
-    # decode json data
-    begin
+     # decode json data
+     begin
       data = DomoscioViz::JSON.load(res.body.nil? ? '' : res.body)
-      DomoscioViz::AuthorizationToken::Manager.storage.store({client_id: res['ClientID'], client_passphrase: res['ClientPassphrase']})
+      unless (res.kind_of? Net::HTTPClientError) || (res.kind_of? Net::HTTPServerError)
+        DomoscioViz::AuthorizationToken::Manager.storage.store({access_token: res['Accesstoken'], refresh_token: res['Refreshtoken']})
+      end
     rescue MultiJson::LoadError
       data = {}
     end
@@ -77,7 +79,6 @@ module DomoscioViz
     data
   end
 
-
   def self.send_request(uri, method, params, headers, before_request_proc)
     res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http| # , use_ssl: uri.scheme == 'https') do |http|
       req = Net::HTTP::const_get(method.capitalize).new(uri.request_uri, headers)
@@ -108,12 +109,24 @@ module DomoscioViz
   end
 
   def self.request_headers
-    headers = {
-      'user_agent' => "DomoscioViz RubyBindings/#{DomoscioViz::VERSION}",
-      'ClientID' => "#{DomoscioViz.configuration.client_id}",
-      'ClientPassphrase' => "#{DomoscioViz.configuration.client_passphrase}",
-      'Content-Type' => 'application/json'
-    }
+    auth_token = DomoscioViz::AuthorizationToken::Manager.get_token
+
+    if !auth_token.is_a? String
+      headers = {
+        'user_agent' => "#{DomoscioViz.user_agent}",
+        'ClientId' => "#{DomoscioViz.configuration.client_id}",
+        'AccessToken' => "#{auth_token[:access_token]}",
+        'RefreshToken' => "#{auth_token[:refresh_token]}",
+        'Content-Type' => 'application/json'
+      }
+    else
+      headers = {
+        'user_agent' => "#{DomoscioViz.user_agent}",
+        'ClientId' => "#{DomoscioViz.configuration.client_id}",
+        'Authorization' => "Token token=#{DomoscioViz.configuration.client_passphrase}",
+        'Content-Type' => 'application/json'
+      }
+    end
     headers
   end
 

data/lib/domoscio_viz/version.rb

@@ -1,3 +1,3 @@
 module DomoscioViz
-  VERSION = "0.1.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_viz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Summary of DomoscioViz.