wso2_toolbox 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8a8eff153546833fe2467480aad2bf4e3be98b
-  data.tar.gz: f4850b59de521a4245bc11674a95967bda0d5a9f
+  metadata.gz: 0b4a79a88655140563f69967e68f44cc3ce12a69
+  data.tar.gz: fc3b960eee69401540260ebfb6294e85b558b14f
 SHA512:
-  metadata.gz: ad943f3a94528589c06902bf4db315bfe17f69efff60e2a8c21ebe22b2531c9b954590b680c8021c9ca77bba4b2126130872694916eb3541c8f29f24fcaa5726
-  data.tar.gz: 15ac3d2a80c82ba018d04bb9aaa586b47836d5b4774c8c3aae19d584bef07124206a42e61dd8a790c1ce658c2bd05775c5aa114b65e597d040b8f3c94bb8e5dc
+  metadata.gz: 94853c92496bf7e132e53d9c5bbb7d301d608b90bfea6f7287c70d69ef96e4a24ac47a23dec16e32ef9157322227239754024afc78fb67428159b44a758cdcad
+  data.tar.gz: c51dd568b9488d0b3f2a0d19e7223ec02b1b9f8f3885b2d5c866d5535cc2c3ea611f20b71fef50f8529240cdc9783d1ab99ad9f08881cf774eb178d34b0011ef

data/.env.development

@@ -1,6 +1,6 @@
 # Generate token credentials
-TOKEN_USERNAME='svc-cedrobco_h'
+TOKEN_USERNAME='admin_guide'
 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'
+TOKEN_URL='http://pt-api-qa.guideinvestimentos.com.br:8010/auth/users/login'
+TOKEN_REFRESH_URL='http://pt-api-qa.guideinvestimentos.com.br:8010/auth/refresh_token'
+TOKEN_REVOKE_URL='http://pt-api-qa.guideinvestimentos.com.br:8010/auth/revoke_token'

data/.env.pipelines

@@ -1,6 +1,6 @@
-# generate token URL
-TOKEN_USERNAME='svc-cedrobco_h'
+# Generate token credentials
+TOKEN_USERNAME='admin_guide'
 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'
+TOKEN_URL='http://pt-api-qa.guideinvestimentos.com.br:8010/auth/users/login'
+TOKEN_REFRESH_URL='http://pt-api-qa.guideinvestimentos.com.br:8010/auth/refresh_token'
+TOKEN_REVOKE_URL='http://pt-api-qa.guideinvestimentos.com.br:8010/auth/revoke_token'

data/CHANGELOG.md

@@ -6,14 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [0.2.1] - 2018-01-15
+## [0.3.1] - 2018-11-07
 ### Changed
-- Fix time parser
+- Fix bug in local file adpter, when 2 or more process try to update same file
+
+## [0.3.0] - 2018-05-11
+### Changed
+- Refresh auth token when invalid
 
 ## [0.2.2] - 2018-01-15
 ### Changed
 - Fix time parser
 
-## [0.3.0] - 2018-05-11
+## [0.2.1] - 2018-01-15
 ### Changed
-- Refresh auth token when invalid
+- Fix time parser

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wso2_toolbox (0.2.3)
+    wso2_toolbox (0.3.1)
       actionpack (>= 5.0)
       activesupport (>= 5.0)
       request_store (~> 1.3.2)
@@ -38,7 +38,7 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.3)
     diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
     erubi (1.7.0)
@@ -51,9 +51,9 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
     netrc (0.11.0)
@@ -128,4 +128,4 @@ DEPENDENCIES
   wso2_toolbox!
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

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

@@ -3,12 +3,16 @@
 require 'json'
 require 'request_store'
 require 'active_support/core_ext/numeric/time'
+require 'wso2_toolbox/token_manager/adapters/lock_file'
 
 module Wso2Toolbox
   module TokenManager
     module Adapters
       module LocalFileAdapter
         class << self
+          include LockFile
+
+          FILE_PATH = 'tmp/localstorage.json'
           TOKEN_DELAY = 5.minutes
 
           def generate_token
@@ -16,7 +20,19 @@ module Wso2Toolbox
             store_token(read(:token_for_job))
           end
 
-          private_class_method
+          def read(key)
+            local_storage { |store| return store.try(:[], key.to_s) }
+          end
+
+          def write(key, value)
+            try_unlock
+
+            lock_file do
+              local_storage { |store| store.merge!(key => value) }
+            end
+          end
+
+          private
 
           def new_token
             token_params =
@@ -34,33 +50,21 @@ module Wso2Toolbox
 
           def active_token?
             return false unless read(:token_time_for_job)
-            Time.parse(read(:token_time_for_job)) - TOKEN_DELAY > Time.now
-          end
-
-          def read(key)
-            local_storage { |store| return store.try(:[], key.to_s) }
-          end
 
-          def write(key, value)
-            local_storage { |store| store[key] = value }
+            Time.parse(read(:token_time_for_job)) - TOKEN_DELAY > Time.now
           end
 
           def local_storage
-            file = File.open(file_path, 'a+').read
-            file_read = file == '' ? '{}' : file
+            file = File.open(FILE_PATH, 'a+').read
+            parsed_stored = file == '' ? {} : JSON.parse(file)
 
-            local_store = JSON.parse(file_read)
-            yield(local_store)
+            yield(parsed_stored)
 
-            File.open(file_path, 'w+') do |f|
-              f.write(local_store.to_json)
+            File.open(FILE_PATH, 'w+') do |f|
+              f.write(parsed_stored.to_json)
               f.rewind
             end
           end
-
-          def file_path
-            @file_path ||= 'tmp/localstorage.json'
-          end
         end
       end
     end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module Wso2Toolbox
+  module TokenManager
+    module Adapters
+      module LockFile
+        LockFileExistError = Class.new(StandardError)
+        ATTEMPTS = 30
+        TIME_INTERVAL = 1
+        LOCK_PATH = 'tmp/localstorage.lock'
+
+        def try_unlock
+          ATTEMPTS.times do |i|
+            raise LockFileExistError if lock_valid? && i == (ATTEMPTS - 1)
+
+            if lock_valid?
+              sleep(TIME_INTERVAL)
+            else
+              FileUtils.rm_r(LOCK_PATH, force: true)
+              break
+            end
+          end
+        end
+
+        def lock_file
+          File.open(LOCK_PATH, 'a+') do |f|
+            f.write File.basename(LOCK_PATH, '.*')
+          end
+
+          yield
+
+          FileUtils.rm_r(LOCK_PATH, force: true)
+        end
+
+        def lock_valid?
+          return false unless File.exist?(LOCK_PATH)
+
+          file_modified = File.ctime(LOCK_PATH)
+          file_modified + 1.minutes < Time.current
+        end
+      end
+    end
+  end
+end

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

@@ -15,7 +15,7 @@ module Wso2Toolbox
             store_token(Setting.token_for_job)
           end
 
-          private_class_method
+          private
 
           def new_token
             token_params =
@@ -56,6 +56,7 @@ module Wso2Toolbox
 
           def expired_token?
             return true unless Setting.token_time_for_job
+
             Time.now > Time.parse(Setting.token_time_for_job)
           end
 

data/lib/wso2_toolbox/token_manager/api_manager_service.rb

@@ -19,7 +19,7 @@ module Wso2Toolbox
           post(config.revoke_token_url, token: token)
         end
 
-        private_class_method
+        private
 
         def config
           @config ||= Wso2Toolbox.configuration

data/lib/wso2_toolbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wso2_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Abner Carleto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -221,6 +221,7 @@ files:
 - lib/wso2_toolbox/rspec_utils/shared_examples/identity_headers.rb
 - lib/wso2_toolbox/token_manager.rb
 - lib/wso2_toolbox/token_manager/adapters/local_file_adapter.rb
+- lib/wso2_toolbox/token_manager/adapters/lock_file.rb
 - lib/wso2_toolbox/token_manager/adapters/rails_cached_adapter.rb
 - lib/wso2_toolbox/token_manager/api_manager_service.rb
 - lib/wso2_toolbox/version.rb