cfoundry_helper 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 537df23f74bd2092dbf4e29f0c81002251763424
-  data.tar.gz: 0fc6be2168d5bd780a557dcfaae57d3534285e62
-SHA512:
-  metadata.gz: f8ca889bf78357bfc20032681b658f15c92f76ae961bbe86e041ffa46d0d61e9f8999f908258c3451b0d40ff07cb8fc53da5e24eccb6b2a831f146d49433acd9
-  data.tar.gz: eb658526e019a09b72161ea95b993170ff5061fc2e31c2e78a76076d473d520a8498136e36076f08229c5c4f81dc4792dc402389ce810674ee78e1f85163970d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDQ0NGVkYWQzNWEyMzc4ZWI1MWZhOTRmZTMyOTBiYmI0MWQ5ZWE0Ng==
+  data.tar.gz: !binary |-
+    NWY3NjhhNzA3Njg5YmJmZjY3M2E0M2Y4OTdmZmNiY2Q0MWQzM2ViOQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTgzZTViY2FhMmM0ZjY5YjFhYTMwMjUyNTQ5MTE4YWNlYzRkMzZhOTJkYWNh
+    NzI4MTgwNTYzMDNkZDFiNGJmYmQ4NzI3ODY2NjU4ZjA0YTI2MzEyOGM0NTY4
+    NzhlOWQyYzU1ZTZhZTc1ZDY3OGFlOTk1NzBjYWRkMmVjOTUzYTI=
+  data.tar.gz: !binary |-
+    ZjNlNmYyMjk2M2FkZDUzOGM3ODUxYjIyNGNhZGM1ZjI3ZjgzZTZmOGE4ZTFi
+    ZDdmNDdhMWYyZjg2MDgwODZhOWE1OGEwZDZlMzgyOGMxMzAxNmM0NmI4ZDBi
+    ODM5OTAzZDk5OGIwNmIxOTI5MGE1MjVmMWYxMWE2MGQ0Mjk5MWY=

data/CHANGELOG.textile

@@ -1,3 +1,6 @@
+h2. v0.3.2
+* requests a new token from the uaa if the token is expired
+
 h2. v0.3.1
 * removes env
 * removes necessary configuration file

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    cfoundry_helper (0.3.1)
+    cfoundry_helper (0.3.2)
       activesupport
       cfoundry
+      jwt
 
 GEM
   remote: https://rubygems.org/
@@ -21,7 +22,7 @@ GEM
     builder (3.1.4)
     cf-uaa-lib (2.0.0)
       multi_json
-    cfoundry (4.5.3)
+    cfoundry (4.6.1)
       activemodel (>= 3.2.13, < 5.0.0)
       cf-uaa-lib (~> 2.0.0)
       multi_json (~> 1.7)
@@ -41,6 +42,8 @@ GEM
     httpclient (2.3.4.1)
     i18n (0.6.5)
     json_pure (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     method_source (0.8.2)
     minitest (4.7.5)
     multi_json (1.8.2)

data/README.textile

@@ -15,6 +15,7 @@ b) You can also configure the targets by passing in a configuration hash:
      
 
 h2. Target Selection
+
 Since cfoundry_helper now supports multiple CF targets you have to set your desired target by using the 
 CFoundryHelper::Helpers::ClientHelper.current_target_url= method for selecting a target from your service configuration file. 
 You can list all configured targets using the CFoundryHelper.available_targets method.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.2

data/cfoundry_helper.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "cfoundry"
   spec.add_dependency "activesupport"
+  spec.add_dependency "jwt"
 end

data/lib/cfoundry_helper/helpers/client_helper.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'jwt'
 
 module CFoundryHelper::Helpers
   module ClientHelper
@@ -20,7 +21,7 @@ module CFoundryHelper::Helpers
     end
 
     def self.get_auth_token
-      self.cloud_controller_client if @@auth_token.nil?
+      self.cloud_controller_client
       return @@auth_token
     end
 
@@ -54,19 +55,16 @@ module CFoundryHelper::Helpers
       # just return the already initialized client if present
       raise CFoundryHelper::Errors::ConfigurationError, "The ClientHelper's current target url is not defined in the configuration!" if CFoundryHelper.config[@@current_target_url].nil?
       
-      
-      # just return the already initialized client if it was explicit setted.
-      # Don't cache the client in this method because long running apps will
-      # have some trouble with expired auth tokens.
-      # TODO: Refresh the token with the uaa refresh method.
-      return @@cloud_controller_client if @@cloud_controller_client
+      # just return the already initialized client if the auth token is not expired.
+      return @@cloud_controller_client unless is_auth_token_expired?
 
       token_issuer = CF::UAA::TokenIssuer.new(CFoundryHelper.config[@@current_target_url]['uaa']['site'], "cf")
       token_info = token_issuer.implicit_grant_with_creds(CFoundryHelper.config[@@current_target_url]['cloud_controller'])
       access_token = token_info.info["access_token"]
       token = CFoundry::AuthToken.from_hash({:token => "bearer #{access_token}"})
       @@auth_token = token
-      CFoundry::V2::Client.new(CFoundryHelper.config[@@current_target_url]['cloud_controller']['site'], token)
+      cc_client = CFoundry::V2::Client.new(CFoundryHelper.config[@@current_target_url]['cloud_controller']['site'], token)
+      set_cc_client(cc_client)
     end
 
     def self.set_scim_client(client)
@@ -76,5 +74,18 @@ module CFoundryHelper::Helpers
     def self.set_cc_client(client)
       @@cloud_controller_client = client
     end
+    
+    private
+    
+    # Check that the Cloud Foundry auth token isn't expierd.
+    # Returns true if the auth_token is expired or uninitialized.
+    def self.is_auth_token_expired?
+      return true if @@auth_token.nil?
+      
+      decoded_token = ::JWT.decode(@@auth_token.auth_header.split(' ')[1], nil, false)
+
+      return true if Time.at(decoded_token['exp']) < Time.now
+      return false
+    end
   end
 end

data/lib/cfoundry_helper/version.rb

@@ -1,3 +1,3 @@
 module CFoundryHelper
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Julian Weber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,154 +28,168 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cfoundry
   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: activesupport
   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: 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'
 description: This gem provides additional helper classes and scripts for the cfoundry
@@ -225,17 +239,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: This gem provides additional helper classes and scripts for the cfoundry