Merge branch 'master' into stable
This commit is contained in:
commit
c40bb0ebf5
@ -66,7 +66,8 @@ class LiquorCabinet < Sinatra::Base
|
|||||||
|
|
||||||
token = env["HTTP_AUTHORIZATION"] ? env["HTTP_AUTHORIZATION"].split(" ")[1] : ""
|
token = env["HTTP_AUTHORIZATION"] ? env["HTTP_AUTHORIZATION"].split(" ")[1] : ""
|
||||||
|
|
||||||
storage.authorize_request(@user, @directory, token, @key.blank?) unless request.options?
|
no_key = @key.nil? || @key.empty?
|
||||||
|
storage.authorize_request(@user, @directory, token, no_key) unless request.options?
|
||||||
end
|
end
|
||||||
|
|
||||||
options path do
|
options path do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user