Skip to content

Commit

Permalink
Fix access token requirement and fix logger (ePages-de#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
Unai Abrisketa authored Feb 20, 2020
1 parent c5a442d commit 9f811fb
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### v0.7.1.pre

* bug-fixes
* Allow to create a `BeyondApi::Session` without `access_token` and `refresh_token`
* Fix no-Rails logger

### v0.7.0.pre

* features
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
beyond_api (0.7.0.pre)
beyond_api (0.7.1.pre)
faraday (~> 0.15)

GEM
Expand Down
2 changes: 2 additions & 0 deletions lib/beyond_api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
require "beyond_api/ext"
require "beyond_api/utils"

require "logger"

module BeyondApi
class Error < StandardError; end

Expand Down
6 changes: 3 additions & 3 deletions lib/beyond_api/request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class << self
define_method(method) do |session, path, params = {}|
response = BeyondApi::Connection.default.send(method) do |request|
request.url(session.api_url + path)
request.headers['Authorization'] = "Bearer #{ session.access_token }"
request.headers['Authorization'] = "Bearer #{ session.access_token }" unless session.access_token.nil?
request.params = params.to_h.camelize_keys
end

Expand All @@ -21,7 +21,7 @@ class << self
define_method(method) do |session, path, body = {}, params = {}|
response = BeyondApi::Connection.default.send(method) do |request|
request.url(session.api_url + path)
request.headers['Authorization'] = "Bearer #{ session.access_token }"
request.headers['Authorization'] = "Bearer #{ session.access_token }" unless session.access_token.nil?
request.params = params.to_h.camelize_keys
request.body = body.camelize_keys.to_json
end
Expand All @@ -34,7 +34,7 @@ class << self
def self.upload(session, path, file_binary, content_type, params)
response = BeyondApi::Connection.default.post do |request|
request.url(session.api_url + path)
request.headers['Authorization'] = "Bearer #{ session.access_token }"
request.headers['Authorization'] = "Bearer #{ session.access_token }" unless session.access_token.nil?
request.headers['Content-Type'] = content_type
request.params = params.to_h.camelize_keys
request.body = file_binary
Expand Down
7 changes: 3 additions & 4 deletions lib/beyond_api/resources/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ class InvalidSessionError < StandardError; end

def initialize(session)
@session = session
raise InvalidSessionError.new("Invalid session") unless session.is_a? BeyondApi::Session
if session.api_url.nil? || session.access_token.nil? || session.refresh_token.nil?
raise InvalidSessionError.new("Session api_url, access_token and refresh_token cannot be nil")
end

raise InvalidSessionError, "Invalid session" unless session.is_a? BeyondApi::Session
raise InvalidSessionError, "Session api_url cannot be nil" if session.api_url.nil?
end
end
end
2 changes: 1 addition & 1 deletion lib/beyond_api/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module BeyondApi
VERSION = "0.7.0.pre".freeze
VERSION = "0.7.1.pre".freeze
end

0 comments on commit 9f811fb

Please sign in to comment.