enviso 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868fa4f07cd6d42b1a22917a7e45982f0e569c31ef96f497e6239a9982270429
-  data.tar.gz: 14ce3150ee9ce8b0d0c5b6fa7d500bb2e5e1e5b33d81a9920de7270c0ae1fe59
+  metadata.gz: 1d618e4e3a0373f44ce7ecbcd8a87fbb8509d35c995ae700f4fff130385807ff
+  data.tar.gz: 32fe913b71cbd584100f07148899f2c5c61b5d72c528ff21a76efd6b843784ce
 SHA512:
-  metadata.gz: ba681cca43b4abab40b191118e9b105d0517c83bd843255f525cd18b9b37c5be05ebc41f0762c5ede5680ed2c3eeb9002edde46bdc13ac46130d770b687296bb
-  data.tar.gz: 491c5d20966bbcf2fda9b90905dbb98e1073bc609f345e6dc8b7636255c81b12925f61fcfa4553166872dda258c48da2ea010be6027f0d09dbc9e2c5cac60720
+  metadata.gz: d09dd98ef9da9931bfc19efc4ada6475a2582e6cfac1c9effffec77e67837f3516cf094f801425ae7bf5ef92f64df86e8780f16c4b67ca9896b1f2c0349203bb
+  data.tar.gz: 0f67c3bf869a9ec5ad29a535801c643ba1c2a6282a5476981d3cfb16e257ed2e8fc51deaa87e5c3a8ba2273111b57444e3e9401ba3df7fb0ac6a3455cabf8c66

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    enviso (0.1.2)
+    enviso (0.1.5)
+      jwt
       openssl
       rest-client
 
@@ -14,6 +15,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    jwt (2.2.1)
     mime-types (3.3)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)

data/enviso.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client"
+  spec.add_dependency "jwt"
   # spec.add_dependency "digest"
   spec.add_dependency "openssl"
     

data/lib/enviso/api.rb

@@ -13,10 +13,9 @@ module Enviso::API
       url = "#{Enviso::Config.api_link}v#{Enviso::Config.api_version}/#{endpoint}"
       begin
         
-        if token.nil?
-          unless endpoint.include?("apis")
-            Enviso::Authentication.get_new_token
-          end
+        # Get a new API token is the current one has expired.
+        unless Enviso::Authentication.has_valid_api_key || endpoint.include?("apis")
+          Enviso::Authentication.get_new_token
         end
 
         if Enviso::Config.verbose

data/lib/enviso/authentication.rb

@@ -2,6 +2,7 @@ module Enviso::Authentication
 	require 'digest'
   require 'base64'
   require 'openssl'
+  require 'jwt'
 
   # The communication layer implements all the methods available in the Enviso API
   class << self
@@ -88,6 +89,18 @@ module Enviso::Authentication
       end
     end
 
+    # Parses the current API key and checks if the 'exp' attribute
+    # represents a date in the future.
+    def has_valid_api_key
+      return self.auth_token != nil && api_key_valid_until > Time.now
+    end
+
+    def api_key_valid_until
+      decoded_token = JWT.decode self.auth_token, nil, false
+      Time.at(decoded_token.first["exp"])
+    end
+
   end
+  
   init!
 end

data/lib/enviso/version.rb

@@ -1,3 +1,3 @@
 module Enviso
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enviso
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Henk Meijer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement