amorail 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc85a53892ba746e91fb6b52a9d86dedfa4c2885bc550760797cea6b6c1077a
-  data.tar.gz: ef947d63cdb4556d3d37934bf7ff6a4298c529b3692ee2617b207737f460b9ad
+  metadata.gz: ae6f74bb08bbf43aa99b6275ba276971bf8e9933bfdc89c363cd6e03d964c0f5
+  data.tar.gz: 33aa412d6f02256a6e98f0e7e138eca8ac88603633a3940858c0a2f865c6d689
 SHA512:
-  metadata.gz: 92801120cb72d28e30df5d41ee23cf2f89681eec639f6837d75302204ab0b49d0b1bfffdd2ea544fad88a6e57939b2bfc8ddd1305c439ab4ff4c31b8206f998c
-  data.tar.gz: 532f646b965c0f92f7a4e6174932a97e1c0fb023fbfa4d4b2fea1d3d348361e3885ef671fbd0e165c00c274c136fe6d39dc628904e6487cd447375e576782db7
+  metadata.gz: e0dc543509ca614983d4bb92eae450d7202e18a146a89ac5a52f0be77436d5c878b41b3d922760490e74a690ae1b1603a015b76821b7cecd7e0c3f3111e690d2
+  data.tar.gz: 7a7efb60d5746c933d0b043fe0465427854b4a1ece3947c1f55062e11fd50ac8c2ef7d4faa34759807ba6e0adecb852d2af9b52cd00cf0d7faa3a5561c924cf8

data/.github/workflows/rspec.yml

@@ -5,19 +5,21 @@ on:
     branches:
       - master
   pull_request:
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # TODO: Adds 3.0 and 3.1 after updating
+        # ruby: [2.5, 2.7, 3.0, 3.1]
+        ruby: [2.5, 2.7]
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby 2.5
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.5
-          bundler-cache: true
-          bundler: 1.13.6
-      - name: Build and test
-        run: bundle exec rspec
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec

data/.rubocop.yml

@@ -23,10 +23,6 @@ Style/BlockDelimiters:
   Exclude:
     - 'spec/**/*.rb'
 
-Metrics/MethodLength:
-  Exclude:
-    - 'spec/**/*.rb'
-
 Rails/Date:
   Enabled: false
 

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master (unreleased)
 
+## 0.7.2 (2024-01-08)
+
+### Fixes
+
+- Fixed refreshing tokin with redis storage ([@VladimirMikhailov][]) [#56](https://github.com/teachbase/amorail/pull/56)
+
 ## 0.7.1 (2021-09-25)
 
 ### Features
@@ -25,3 +31,4 @@ See spec/support/my_contact.rb and spec/my_contact_spec.rb
 [@palkan]: https://github.com/palkan
 [@AlexanderShvaykin]: https://github.com/AlexanderShvaykin
 [@lHydra]: https://github.com/lHydra
+[@VladimirMikhailov]: https://github.com/VladimirMikhailov

data/amorail.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "shoulda-matchers", "~> 2.0"
+  spec.add_development_dependency "shoulda-matchers"
   spec.add_development_dependency "rubocop", "~> 0.49"
   spec.add_dependency "anyway_config", ">= 1.0"
   spec.add_dependency "faraday"

data/dip.yml

@@ -0,0 +1,16 @@
+version: "7.6"
+
+compose:
+  files:
+    - docker-compose.yml
+
+interaction:
+  sh:
+    description: Open a Bash shell within a Rails container (with dependencies up)
+    service: ruby
+    command: /bin/bash
+
+  rspec:
+    description: Run specs
+    service: ruby
+    command: rspec

data/docker-compose.yaml

@@ -0,0 +1,14 @@
+version: "3.8"
+
+services:
+  ruby:
+    image: ruby:2.5
+    stdin_open: true
+    tty: true
+    volumes:
+      - /teachbase/.git
+      - .:/app:cached
+      - bundle:/usr/local/bundle
+    working_dir: /app
+volumes:
+  bundle:

data/lib/amorail/client.rb

@@ -83,8 +83,8 @@ module Amorail
     end
 
     def safe_request(method, url, params = {})
-      authorize if access_token.blank?
       refresh_token! if access.expired?
+      authorize if access_token.blank?
       public_send(method, url, params)
     end
 

data/lib/amorail/entity.rb

@@ -99,7 +99,7 @@ module Amorail
         next if fname.nil?
 
         fname = "#{fname.downcase}="
-        fval = f.fetch('values').pluck('value')
+        fval = f.fetch('values').map { |v| v['value'] }
         send(fname, fval) if respond_to?(fname)
       end
     end

data/lib/amorail/store_adapters/memory_store_adapter.rb

@@ -38,7 +38,7 @@ module Amorail
         if !access_expired?(key)
           storage[key]
         else
-          {}
+          { refresh_token: storage[key][:refresh_token] }
         end
       end
 

data/lib/amorail/store_adapters/redis_store_adapter.rb

@@ -19,7 +19,7 @@ module Amorail
       def fetch_access(secret)
         token = storage.get(access_key(secret))
         refresh_token = storage.get(refresh_key(secret))
-        token.nil? ? {} : { token: token, refresh_token: refresh_token }
+        { token: token, refresh_token: refresh_token }.compact
       end
 
       def persist_access(secret, token, refresh_token, expiration)
@@ -61,7 +61,7 @@ module Amorail
       end
 
       def build_redis_url(redis_host: nil, redis_port: nil, redis_db_name: nil)
-        redis_db_name ||= Amorail.config.redis_db_name
+        redis_db_name ||= Amorail.config.redis_db_name.to_s
         return URI.join(Amorail.config.redis_url, redis_db_name).to_s if Amorail.config.redis_url
 
         redis_host ||= Amorail.config.redis_host

data/lib/amorail/version.rb

@@ -2,5 +2,5 @@
 
 # Amorail version
 module Amorail
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/amorail.rb

@@ -38,7 +38,7 @@ module Amorail
   end
 
   def with_client(client)
-    client = Client.new(client) unless client.is_a?(Client)
+    client = Client.new(**client) unless client.is_a?(Client)
     ClientRegistry.client = client
     yield
   ensure
@@ -61,9 +61,15 @@ module Amorail
   end
 
   class ClientRegistry # :nodoc:
-    extend ActiveSupport::PerThreadRegistry
+    class << self
+      def client=(value)
+        Thread.current["attr_#{name}_client"] = value
+      end
 
-    attr_accessor :client
+      def client
+        Thread.current["attr_#{name}_client"]
+      end
+    end
   end
 
   require 'amorail/railtie' if defined?(Rails)

data/spec/client_spec.rb

@@ -132,4 +132,39 @@ describe Amorail::Client do
       expect(results[2]).to eq 'some_id_3'
     end
   end
+
+  describe '#safe_request' do
+    subject(:safe_request) { client.safe_request(:get, '/private/api/v2/json/accounts/current') }
+
+    let(:response) { instance_double('Faraday::Response', body: {}, status: 200) }
+    let(:client) { described_class.new }
+    let(:access_token) { 'eyJ0eXAiOiJKf2QihCJhbGciOiJSUzI1NiIsImp0aSI6IjMxMT' }
+
+    # We need to refresh the token store before the initial safe_request
+    # to test that it performs authorization
+    before { Amorail.token_store = :memory }
+
+    it 'authorizes the client if there is no access token' do
+      expect { safe_request }.to change { client.access_token }.from(nil).to(start_with(access_token))
+    end
+
+    context 'when access token is expired' do
+      let(:renewed_access_token) { '50d084c7efbd911f0a9d03bb387f3ad4dc092be253' }
+
+      before do
+        Amorail.token_store.persist_access(
+          Amorail.config.client_secret,
+          'old_access_token',
+          'refresh_token',
+          Time.now.to_i - 10
+        )
+      end
+
+      it 'refreshes authorization token' do
+        expect { safe_request }.to change { client.access_token }.from(nil).to(
+          start_with(renewed_access_token)
+        )
+      end
+    end
+  end
 end

data/spec/fixtures/authorize_refresh_token.json

@@ -0,0 +1,6 @@
+{
+  "token_type": "Bearer",
+  "expires_in": 86400,
+  "access_token": "50d084c7efbd911f0a9d03bb387f3ad4dc092be253fc5af0564c38454f473c075ecb8b3dc9e65a257196cc0c44a07acea7720140739a86015a701403",
+  "refresh_token": "c17d6c45e63efda9e20edb9ab08eb04cd89cf83acd203a8a4796160886e334561c54e8193f25a27004c732fe784b2bf9f1b4357d3c4a284e30164764"
+}

data/spec/helpers/webmock_helpers.rb

@@ -54,7 +54,7 @@ module AmoWebMock
       .to_return(
         status: 200,
         body: File.read('./spec/fixtures/authorize.json'),
-        headers: {}
+        headers: { 'Content-Type' => 'application/json' }
       )
   end
 
@@ -65,8 +65,8 @@ module AmoWebMock
         )
         .to_return(
             status: 200,
-            body: File.read('./spec/fixtures/authorize.json'),
-            headers: {}
+            body: File.read('./spec/fixtures/authorize_refresh_token.json'),
+            headers: { 'Content-Type' => 'application/json' }
         )
   end
 

data/spec/spec_helper.rb

@@ -19,4 +19,5 @@ Dir[File.expand_path("support/**/*.rb", __dir__)].each { |f| require f }
 RSpec.configure do |config|
   config.mock_with :rspec
   include AmoWebMock
+  config.include(Shoulda::Matchers::ActiveModel)
 end

data/spec/store_adapters/memory_store_adapter_spec.rb

@@ -35,7 +35,7 @@ describe Amorail::StoreAdapters::MemoryStoreAdapter do
     context 'when token is expired' do
       it 'returns blank hash' do
         store.persist_access('secret', 'token', 'refresh_token', Time.now.to_i - 10_000)
-        expect(store.fetch_access('secret')).to eq({})
+        expect(store.fetch_access('secret')).to eq(refresh_token: 'refresh_token')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amorail
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - alekseenkoss
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +85,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,8 @@ files:
 - RELEASING.md
 - Rakefile
 - amorail.gemspec
+- dip.yml
+- docker-compose.yaml
 - lib/amorail.rb
 - lib/amorail/access_token.rb
 - lib/amorail/client.rb
@@ -247,6 +249,7 @@ files:
 - spec/fixtures/accounts/response_2.json
 - spec/fixtures/amorail_test.yml
 - spec/fixtures/authorize.json
+- spec/fixtures/authorize_refresh_token.json
 - spec/fixtures/contacts/create.json
 - spec/fixtures/contacts/find_many.json
 - spec/fixtures/contacts/find_one.json
@@ -295,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby API client for AmoCRM
@@ -310,6 +313,7 @@ test_files:
 - spec/fixtures/accounts/response_2.json
 - spec/fixtures/amorail_test.yml
 - spec/fixtures/authorize.json
+- spec/fixtures/authorize_refresh_token.json
 - spec/fixtures/contacts/create.json
 - spec/fixtures/contacts/find_many.json
 - spec/fixtures/contacts/find_one.json