wso2_toolbox 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0df74c3b934dca8ce0a6115f19953de2be5ba2c
-  data.tar.gz: e7ef632221da9343dedcbf8883e8d69afcc0205d
+  metadata.gz: 7f8a8eff153546833fe2467480aad2bf4e3be98b
+  data.tar.gz: f4850b59de521a4245bc11674a95967bda0d5a9f
 SHA512:
-  metadata.gz: b30d842325c67739c594a13dfa2c8dee5af29716c84bf72374b6360658271cc0974b77dca4b6b51b1c2cb2b72515601f42ebcaf16e4daacf57b5632a4788dd87
-  data.tar.gz: 78720b4a1c8c2a5d07a1bf02e21d3d15f9f6f522f0a3d51618dca01f1dafe3a35c12e5563deecfef516eed29a390d2cffdfe7203e78357eb1a667d8b045f6ea8
+  metadata.gz: ad943f3a94528589c06902bf4db315bfe17f69efff60e2a8c21ebe22b2531c9b954590b680c8021c9ca77bba4b2126130872694916eb3541c8f29f24fcaa5726
+  data.tar.gz: 15ac3d2a80c82ba018d04bb9aaa586b47836d5b4774c8c3aae19d584bef07124206a42e61dd8a790c1ce658c2bd05775c5aa114b65e597d040b8f3c94bb8e5dc

data/.env.development

@@ -2,3 +2,5 @@
 TOKEN_USERNAME='svc-cedrobco_h'
 TOKEN_PASSWORD='Toor@2017'
 TOKEN_URL='http://172.16.13.67:8010/auth/users/login'
+TOKEN_REFRESH_URL='http://172.16.13.67:8010/auth/refresh_token'
+TOKEN_REVOKE_URL='http://172.16.13.67:8010/auth/revoke_token'

data/.env.pipelines

@@ -1,2 +1,6 @@
 # generate token URL
+TOKEN_USERNAME='svc-cedrobco_h'
+TOKEN_PASSWORD='Toor@2017'
 TOKEN_URL='http://172.16.13.67:8010/auth/users/login'
+TOKEN_REFRESH_URL='http://172.16.13.67:8010/auth/refresh_token'
+TOKEN_REVOKE_URL='http://172.16.13.67:8010/auth/revoke_token'

data/CHANGELOG.md

@@ -13,3 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.2.2] - 2018-01-15
 ### Changed
 - Fix time parser
+
+## [0.3.0] - 2018-05-11
+### Changed
+- Refresh auth token when invalid

data/README.md

@@ -27,6 +27,8 @@ fill in the attributes:
 ```
 Wso2Toolbox.configure do |config|
   config.token_url = ENV['GENERATE_TOKEN_DEV_URL']
+  config.refresh_token_url = ENV['REFRESH_TOKEN_DEV_URL']
+  config.revoke_token_url = ENV['REVOKE_TOKEN_DEV_URL']
   config.token_username = ENV['GENERATE_TOKEN_DEV_USERNAME']
   config.token_password = ENV['GENERATE_TOKEN_DEV_PASSWORD']
 end

data/lib/wso2_toolbox/configuration.rb

@@ -2,6 +2,7 @@
 
 module Wso2Toolbox
   class Configuration
-    attr_accessor :token_username, :token_password, :token_url
+    attr_accessor :token_username, :token_password, :token_url,
+                  :refresh_token_url, :revoke_token_url
   end
 end

data/lib/wso2_toolbox/token_manager/adapters/rails_cached_adapter.rb

@@ -10,7 +10,8 @@ module Wso2Toolbox
           TOKEN_DELAY = 5.minutes
 
           def generate_token
-            new_token unless active_token?
+            new_token if expired_token?
+            refresh_token unless active_token?
             store_token(Setting.token_for_job)
           end
 
@@ -19,18 +20,46 @@ module Wso2Toolbox
           def new_token
             token_params =
               Wso2Toolbox::TokenManager::ApiManagerService.create_token
-            Setting.token_for_job =
-              "#{token_params[:token_type]} #{token_params[:access_token]}"
-            Setting.token_time_for_job =
-              Time.now + token_params[:expires_in].to_i.seconds
+            build_settings(token_params)
+          end
+
+          def refresh_token
+            token_params =
+              Wso2Toolbox::TokenManager::ApiManagerService.refresh_token(
+                Setting.refresh_token
+              )
+            Wso2Toolbox::TokenManager::ApiManagerService.revoke_token(
+              Setting.access_token
+            )
+            build_settings(token_params)
           end
 
           def store_token(token)
             RequestStore.store[:token] = token
           end
 
+          def build_settings(token_params)
+            Setting.access_token = token_params[:access_token]
+            Setting.refresh_token = token_params[:refresh_token]
+            build_token_for_job(token_params[:token_type],
+                                token_params[:access_token])
+            build_token_time_for_job(token_params[:expires_in])
+          end
+
+          def build_token_for_job(token_type, access_token)
+            Setting.token_for_job = "#{token_type} #{access_token}"
+          end
+
+          def build_token_time_for_job(expires_in)
+            Setting.token_time_for_job = expires_in.to_i.seconds.from_now
+          end
+
+          def expired_token?
+            return true unless Setting.token_time_for_job
+            Time.now > Time.parse(Setting.token_time_for_job)
+          end
+
           def active_token?
-            return false unless Setting.token_time_for_job
             Time.parse(Setting.token_time_for_job.to_s) - TOKEN_DELAY > Time.now
           end
         end

data/lib/wso2_toolbox/token_manager/api_manager_service.rb

@@ -8,7 +8,15 @@ module Wso2Toolbox
     module ApiManagerService
       class << self
         def create_token
-          post(build_params)
+          post(config.token_url, build_params)
+        end
+
+        def refresh_token(token)
+          post(config.refresh_token_url, token: token)
+        end
+
+        def revoke_token(token)
+          post(config.revoke_token_url, token: token)
         end
 
         private_class_method
@@ -24,8 +32,8 @@ module Wso2Toolbox
           }
         end
 
-        def post(params)
-          response = RestClient.post(config.token_url, params.to_json,
+        def post(url, params)
+          response = RestClient.post(url, params.to_json,
                                      content_type: :json)
           JSON.parse(response).with_indifferent_access
         end

data/lib/wso2_toolbox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wso2Toolbox
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/wso2_toolbox.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'wso2_toolbox/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wso2_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Abner Carleto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack