Skip to content

Commit

Permalink
Rename force_read parameter to force_fetch
Browse files Browse the repository at this point in the history
  • Loading branch information
sashaCher committed Dec 27, 2021
1 parent 20dc5c9 commit 73672e2
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ def initialize(
@fetch_signing_key = fetch_signing_key
end

def call(force_read:)
def call(force_fetch:)
@fetch_signing_key.call(
refresh: force_read,
refresh: force_fetch,
cache_key: jwks_uri,
signing_key_provider: self
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ def initialize(
@fetch_signing_key = fetch_signing_key
end

def call(force_read:)
def call(force_fetch:)
@fetch_signing_key.call(
refresh: force_read,
refresh: force_fetch,
cache_key: provider_uri,
signing_key_provider: self
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ def validate_token_exists
raise Errors::Authentication::AuthnJwt::MissingToken if @jwt_token.blank?
end

def fetch_signing_key(force_read: false)
def fetch_signing_key(force_fetch: false)
@jwks = signing_key_provider.call(
force_read: force_read
force_fetch: force_fetch
)
@logger.debug(LogMessages::Authentication::AuthnJwt::SigningKeysFetchedFromCache.new)
end
Expand All @@ -62,7 +62,7 @@ def ensure_keys_are_fresh
LogMessages::Authentication::AuthnJwt::ValidateSigningKeysAreUpdated.new
)
# maybe failed due to keys rotation. Force cache to read it again
fetch_signing_key(force_read: true)
fetch_signing_key(force_fetch: true)
end

def fetch_decoded_token_for_signature_only
Expand Down
2 changes: 1 addition & 1 deletion app/domain/authentication/authn_jwt/validate_status.rb
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def webservice

def validate_signing_key
signing_key_provider.call(
force_read: false
force_fetch: false
)
@logger.debug(LogMessages::Authentication::AuthnJwt::ValidatedSigningKeyConfiguration.new)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
http_lib: mocked_bad_http_response,
create_jwks_from_http_response: mocked_create_jwks_from_http_response
).call(force_read: false)
).call(force_fetch: false)
end

it "returns false" do
Expand All @@ -109,7 +109,7 @@
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
http_lib: mocked_bad_http_response,
create_jwks_from_http_response: mocked_create_jwks_from_http_response
).call(force_read: true)
).call(force_fetch: true)
end

it "returns true" do
Expand All @@ -125,7 +125,7 @@
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
http_lib: mocked_bad_http_response,
create_jwks_from_http_response: mocked_create_jwks_from_http_response
).call(force_read: false)
).call(force_fetch: false)
end

it "raises an error" do
Expand All @@ -142,7 +142,7 @@
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
http_lib: mocked_good_http_response,
create_jwks_from_http_response: mocked_create_jwks_from_http_response
).call(force_read: false)
).call(force_fetch: false)
end

it "returns jwks value" do
Expand All @@ -158,7 +158,7 @@
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
http_lib: mocked_bad_http_response,
create_jwks_from_http_response: mocked_create_jwks_from_http_response
).call(force_read: false)
).call(force_fetch: false)
end

it "raises an error" do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
logger: mocked_logger,
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
discover_identity_provider: mocked_discover_identity_provider
).call(force_read: false)
).call(force_fetch: false)
end

it "returns false" do
Expand All @@ -101,7 +101,7 @@
logger: mocked_logger,
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
discover_identity_provider: mocked_discover_identity_provider
).call(force_read: true)
).call(force_fetch: true)
end

it "returns true" do
Expand All @@ -118,7 +118,7 @@
logger: mocked_logger,
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
discover_identity_provider: mocked_invalid_uri_discover_identity_provider
).call(force_read: false)
).call(force_fetch: false)
end

it "raises an error" do
Expand All @@ -133,7 +133,7 @@
logger: mocked_logger,
fetch_authenticator_secrets: mocked_fetch_authenticator_secrets_exist_values,
discover_identity_provider: mocked_discover_identity_provider
).call(force_read: false)
).call(force_fetch: false)
end

it "does not raise error" do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,31 +122,31 @@ def valid_decoded_token(claims)

allow(mocked_fetch_signing_key_provider_always_succeed).to(
receive(:call).with(
force_read: false
force_fetch: false
).and_return(jwks_from_1st_call)
)

allow(mocked_fetch_signing_key_provider_always_succeed).to(
receive(:call).with(
force_read: true
force_fetch: true
).and_return(jwks_from_2nd_call)
)

allow(mocked_fetch_signing_key_provider_failed_on_1st_time).to(
receive(:call).with(
force_read: false
force_fetch: false
).and_raise(fetch_signing_key_1st_time_error)
)

allow(mocked_fetch_signing_key_provider_failed_on_2nd_time).to(
receive(:call).with(
force_read: false
force_fetch: false
).and_return(jwks_from_2nd_call)
)

allow(mocked_fetch_signing_key_provider_failed_on_2nd_time).to(
receive(:call).with(
force_read: true
force_fetch: true
).and_raise(fetch_signing_key_2nd_time_error)
)

Expand Down

0 comments on commit 73672e2

Please sign in to comment.