cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to using oauth-plugin as a gem

Browse source 
Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.
This commit is contained in:
Tom Hughes 2010-05-24 12:56:23 +01:00
parent 6e7acd171f
commit 41a123334b
50 changed files with 28 additions and 2521 deletions
Download patch file Download diff file Expand all files Collapse all files

114
vendor/plugins/oauth-plugin/lib/oauth/rails/controller_methods.rb vendored
View file

@ -1,114 +0,0 @@
require 'oauth/signature'
module OAuth
module Rails
module ControllerMethods
protected
def current_token
@current_token
end
def current_client_application
@current_client_application
end
def oauthenticate
logger.info "entering oauthenticate"
verified=verify_oauth_signature
logger.info "verified=#{verified.to_s}"
return verified && current_token.is_a?(::AccessToken)
end
def oauth?
current_token!=nil
end
# use in a before_filter
def oauth_required
logger.info "Current_token=#{@current_token.inspect}"
if oauthenticate
logger.info "passed oauthenticate"
if authorized?
logger.info "passed authorized"
return true
else
logger.info "failed authorized"
invalid_oauth_response
end
else
logger.info "failed oauthenticate"
invalid_oauth_response
end
end
# This requies that you have an acts_as_authenticated compatible authentication plugin installed
def login_or_oauth_required
if oauthenticate
if authorized?
return true
else
invalid_oauth_response
end
else
login_required
end
end
# verifies a request token request
def verify_oauth_consumer_signature
begin
valid = ClientApplication.verify_request(request) do |token, consumer_key|
@current_client_application = ClientApplication.find_by_key(consumer_key)
# return the token secret and the consumer secret
[nil, @current_client_application.secret]
end
rescue
valid=false
end
invalid_oauth_response unless valid
end
def verify_oauth_request_token
verify_oauth_signature && current_token.is_a?(RequestToken)
end
def invalid_oauth_response(code=401,message="Invalid OAuth Request")
render :text => message, :status => code
end
private
def current_token=(token)
@current_token=token
if @current_token
@current_user=@current_token.user
@current_client_application=@current_token.client_application
end
@current_token
end
# Implement this for your own application using app-specific models
def verify_oauth_signature
begin
valid = ClientApplication.verify_request(request) do |request|
self.current_token = OauthToken.find_token(request.token)
logger.info "self=#{self.class.to_s}"
logger.info "token=#{self.current_token}"
# return the token secret and the consumer secret
[(current_token.nil? ? nil : current_token.secret), (current_client_application.nil? ? nil : current_client_application.secret)]
end
# reset @current_user to clear state for restful_...._authentication
@current_user = nil if (!valid)
valid
rescue
false
end
end
end
end
end