oauth2_api_client 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf92b6840d7440d512d8d0b7586acfe9751c38e6c99e4ab9f83cd9893cf9f13e
-  data.tar.gz: 2e79b922b01af914adef3bacc2f415af62d26e3c8ad95b699daa63147842410a
+  metadata.gz: 9361c724e72de0bbebb82eb1d3a70d62bf9c12488d665eea40ad25c090ab2ed0
+  data.tar.gz: a025968d9268a17b2fce69056575e48b3133f2621042f0e682d711d9dc4319ad
 SHA512:
-  metadata.gz: 0b782f564cde4d121868f274946df14af27ab13d7e1d501367451b571ada534696027c8ae51e8705315ad35a5a43b04d800d3209a6c70a6eaedf0a1a5f077ca1
-  data.tar.gz: f2c3a469a6a189c6a0c986182ab2a53eb268a851882406d1d7de00cc32556f5a7ebb9e9dcc6732fd370ff9ce905a90a714ddea0649e33ada8eeea2dcb7a74be7
+  metadata.gz: df519ea81f617078eb44f734de18e3543f1d44fcc0db2be030436401c3e504f11b8ed54b5eb5bf0a57af744bec36678bf52f9daa055b51b9ee48e27bc7d340db
+  data.tar.gz: a2eec2a4d5ad53fcda9386e890d5cf7067410a6e5452a5263206ae6bfe62c8b122c829bee140090e742ba5d151e8a2ce11bae5df0515ca6449605033b248f6d8

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # CHANGELOG
 
+# v3.4.1
+
+* fix duplicate auth calls if NullStore is used
+
 # v3.4.0
 
 * Add PATCH method

data/lib/oauth2_api_client/version.rb

@@ -1,3 +1,3 @@
 class Oauth2ApiClient
-  VERSION = "3.4.0"
+  VERSION = "3.4.1"
 end

data/lib/oauth2_api_client.rb

@@ -84,7 +84,9 @@ class Oauth2ApiClient
     with_retry do
       request = @request
       request = request.headers({}) # Prevent thread-safety issue of http-rb: https://github.com/httprb/http/issues/558
-      request = request.auth("Bearer #{token}") if token
+
+      current_token = token
+      request = request.auth("Bearer #{current_token}") if current_token
 
       opts = options.dup
       opts[:params] = @params.merge(opts.fetch(:params, {})) if @params

data/spec/oauth2_api_client_spec.rb

@@ -17,7 +17,7 @@ class HttpTestRequest
 end
 
 RSpec.describe Oauth2ApiClient do
-  before do
+  let!(:auth_request_stub) do
     token_response = {
       access_token: "access_token",
       token_type: "bearer",
@@ -173,6 +173,24 @@ RSpec.describe Oauth2ApiClient do
       expect(client.get("/path").to_s).to eq("ok")
     end
 
+    it "calls token provider once if NullStore is set as cache" do
+      stub_request(:get, "http://localhost/api/path")
+        .to_return(status: 200, body: "ok")
+
+      client = described_class.new(
+        base_url: "http://localhost/api",
+        token: described_class::TokenProvider.new(
+          client_id: "client_id",
+          client_secret: "client_secret",
+          token_url: "http://localhost/oauth2/token",
+          cache: ActiveSupport::Cache::NullStore.new
+        )
+      )
+
+      expect(client.get("/path").to_s).to eq("ok")
+      expect(auth_request_stub).to have_been_requested.once
+    end
+
     it "retries the request when an http unauthorized status is returned" do
       stub_request(:get, "http://localhost/api/path")
         .to_return({ status: 401, body: "unauthorized" }, { status: 200, body: "ok" })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth2_api_client
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport