leaseweb-rest-api 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ecc51f07cf45f19053de3fd9cf08410e955cf50
-  data.tar.gz: 44c1862d16410624b02560c2f1278d85a79ae916
+  metadata.gz: 6b83be5bd2fd6f52f68ffdbc06bf81eb2ceaa6cc
+  data.tar.gz: ca30de4fae4eb69c21be20332ef038717d9acbe7
 SHA512:
-  metadata.gz: b0294824019a175a512b657fdc38d5b8f656a1cd9dec950d37244f858cead8082924ce1d9b8dbd74982cce5f598454535b6513447ac21b1097693bc0fafd05f9
-  data.tar.gz: 5d9f49e10b03721c891b8de40ae8f263e919923e3e05fa936d04576abf59f8b92dd907525c103d2b4b7051280f877c83cc884b559f085fd315ce56c9b29986e0
+  metadata.gz: f9800eb6c4b1b66ad08873f8b0173f12005e18c93a8f3d888c61a10433826da27356d2cf327195278c64293729149397ec5196f20d2d466a8b5de0a28677eeba
+  data.tar.gz: 74965ed037312892f4759771496c51a7906968c56f9f7bb7eb9f7bfd0db2cede3524ee2fbb3bf07f934d522e896787e18062f30e8db3166662a748d0b6513b52

data/leaseweb-rest-api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'leaseweb-rest-api'
-  s.version       = '1.1.4'
+  s.version       = '1.1.5'
   s.authors       = 'Arnoud Vermeer'
   s.email         = 'a.vermeer@tech.leaseweb.com'
   s.license       = 'Apache'

data/lib/leaseweb-rest-api.rb

@@ -13,24 +13,59 @@ class LeasewebAPI
 
   base_uri 'https://api.leaseweb.com'
 
+  def initialize
+    @tmpdir = "/tmp/lsw-rest-api"
+    Dir.mkdir(@tmpdir) unless Dir.exist?(@tmpdir)
+  end
+
   def apiKeyAuth(apikey)
     @options = { headers: { 'X-Lsw-Auth' => apikey, 'Content-Type' => 'application/json' } }
   end
 
-  def getOauthToken(clientId, clientSecret)
-    response = self.class.post('https://auth.leaseweb.com/token', basic_auth: { username: clientId, password: clientSecret }, body: { grant_type: 'client_credentials' })
-    access_token = response.parsed_response['access_token']
+  def getOauthToken(client_id, client_secret)
+    access_token = validate_token(client_id)
+
+    if (access_token == false)
+      response = self.class.post('https://auth.leaseweb.com/token', basic_auth: { username: client_id, password: client_secret }, body: { grant_type: 'client_credentials' })
+      access_token = response.parsed_response['access_token']
+      cache_token(client_id, access_token, response.parsed_response['expires_in'])
+    end
 
     @options = { headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' } }
   end
 
   def getPasswordToken(username, password, client_id, client_secret)
-    response = self.class.post('https://auth.leaseweb.com/token', basic_auth: { username: client_id, password: client_secret }, body: { grant_type: 'password', username: username, password: password })
-    access_token = response.parsed_response['access_token']
+    access_token = validate_token(client_id)
+
+    if (access_token == false)
+      response = self.class.post('https://auth.leaseweb.com/token', basic_auth: { username: client_id, password: client_secret }, body: { grant_type: 'password', username: username, password: password })
+      access_token = response.parsed_response['access_token']
+      cache_token(client_id, access_token, response.parsed_response['expires_in'])
+    end
 
     @options = { headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' } }
   end
 
+  def validate_token(client_id)
+    file = "#{@tmpdir}/#{client_id}.json"
+    content = JSON.parse(File.read(file))
+    expires_at = DateTime.parse(content['expires_at'])
+
+    if expires_at > DateTime.now
+      return content['access_token']
+    else
+      File.delete(file)
+    end
+
+    return false
+  end
+
+  def cache_token(client_id, access_token, expires_in)
+    file = "#{@tmpdir}/#{client_id}.json"
+    content = { access_token: access_token, expires_at: Time.now.getutc + expires_in }.to_json
+    File.write(file, content)
+  end
+
   def readPrivateKey(privateKey, password)
     @private_key = OpenSSL::PKey::RSA.new(File.read(privateKey), password)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leaseweb-rest-api
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Arnoud Vermeer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty