提交 ec0973c2 编写于 作者: J José Valim

Remove uneeded methods.

上级 bbc4de75
......@@ -124,7 +124,7 @@ def request_http_basic_authentication(realm = "Application")
end
def authenticate(request, &login_procedure)
unless authorization(request).blank?
unless request.authorization.blank?
login_procedure.call(*user_name_and_password(request))
end
end
......@@ -133,15 +133,8 @@ def user_name_and_password(request)
decode_credentials(request).split(/:/, 2)
end
def authorization(request)
request.env['HTTP_AUTHORIZATION'] ||
request.env['X-HTTP_AUTHORIZATION'] ||
request.env['X_HTTP_AUTHORIZATION'] ||
request.env['REDIRECT_X_HTTP_AUTHORIZATION']
end
def decode_credentials(request)
ActiveSupport::Base64.decode64(authorization(request).split(' ', 2).last || '')
ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last || '')
end
def encode_credentials(user_name, password)
......@@ -176,14 +169,7 @@ def request_http_digest_authentication(realm = "Application", message = nil)
# Returns false on a valid response, true otherwise
def authenticate(secret_key, request, realm, &password_procedure)
authorization(request) && validate_digest_response(secret_key, request, realm, &password_procedure)
end
def authorization(request)
request.env['HTTP_AUTHORIZATION'] ||
request.env['X-HTTP_AUTHORIZATION'] ||
request.env['X_HTTP_AUTHORIZATION'] ||
request.env['REDIRECT_X_HTTP_AUTHORIZATION']
request.authorization && validate_digest_response(secret_key, request, realm, &password_procedure)
end
# Returns false unless the request credentials response value matches the expected value.
......@@ -226,7 +212,7 @@ def encode_credentials(http_method, credentials, password, password_is_ha1)
end
def decode_credentials_header(request)
decode_credentials(authorization(request))
decode_credentials(request.authorization)
end
def decode_credentials(header)
......
......@@ -67,21 +67,6 @@ def format=(extension)
@env["action_dispatch.request.formats"] = [Mime::Type.lookup_by_extension(parameters[:format])]
end
# Returns a symbolized version of the <tt>:format</tt> parameter of the request.
# If no \format is given it returns <tt>:js</tt>for Ajax requests and <tt>:html</tt>
# otherwise.
def template_format
parameter_format = parameters[:format]
if parameter_format
parameter_format
elsif xhr?
:js
else
:html
end
end
# Receives an array of mimes and return the first user sent mime that
# matches the order array.
#
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册