Skip to content

Refactor middleware options #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlackty merged 1 commit into from
Jul 11, 2022
Merged

Refactor middleware options #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/faraday/uid2/middleware.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
module Faraday
module Uid2
class Middleware < Faraday::Middleware
def initialize(app, secret_key, is_refresh, options = {})
super(app, options)
def initialize(app, options = {})
super(app)

@key = Base64.decode64(secret_key)
@is_refresh = is_refresh
@key = Base64.decode64(options.fetch(:secret_key))
@is_refresh = options.fetch(:is_refresh, false)
end

def call(request_env)
Expand Down
6 changes: 3 additions & 3 deletions lib/uid2/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def validate_token(token:, email: nil, email_hash: nil, phone: nil, phone_hash:
end

def refresh_token(refresh_token:, refresh_response_key:)
http(is_refresh: true, refresh_response_key: refresh_response_key).post("token/refresh", refresh_token).body
http(refresh_response_key: refresh_response_key).post("token/refresh", refresh_token).body
end

def get_salt_buckets(since: Time.now)
Expand All @@ -54,13 +54,13 @@ def credentials
}
end

def http(is_refresh: false, refresh_response_key: nil)
def http(refresh_response_key: nil)
Faraday.new(
url: base_url,
headers: credentials
) do |f|
f.request :json unless refresh_response_key
f.request :uid2_encryption, refresh_response_key || secret_key, is_refresh
f.request :uid2_encryption, {secret_key: (refresh_response_key || secret_key), is_refresh: !refresh_response_key.nil?}
f.adapter :net_http_persistent
end
end
Expand Down