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

Make OAuth work again

Browse source
This commit is contained in:
Tom Hughes 2011-11-16 21:06:47 +00:00
parent 87d38efbb0
commit 7b89dc6349
13 changed files with 109 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/application_controller.rb
View file

@ -366,6 +366,11 @@ private
return [user, pass]
end
# used by oauth plugin to get the current user
def current_user
@user
end
# used by oauth plugin to set the current user
def current_user=(user)
@user=user

86
app/controllers/oauth_controller.rb
View file

@ -1,83 +1,33 @@
require 'oauth/controllers/provider_controller'
class OauthController < ApplicationController
include OAuth::Controllers::ProviderController
layout 'slim'
before_filter :authorize_web, :only => [:oauthorize, :revoke]
before_filter :set_locale, :only => [:oauthorize, :revoke]
before_filter :require_user, :only => [:oauthorize]
before_filter :verify_oauth_consumer_signature, :only => [:request_token]
before_filter :verify_oauth_request_token, :only => [:access_token]
# Uncomment the following if you are using restful_open_id_authentication
# skip_before_filter :verify_authenticity_token
def login_required
authorize_web
set_locale
require_user
end
def request_token
@token = current_client_application.create_request_token
def user_authorizes_token?
any_auth = false
if @token
logger.info "request token params: #{params.inspect}"
# request tokens indicate what permissions the client *wants*, not
# necessarily the same as those which the user allows.
current_client_application.permissions.each do |pref|
@token.client_application.permissions.each do |pref|
if params[pref]
@token.write_attribute(pref, true)
any_auth ||= true
else
@token.write_attribute(pref, false)
end
@token.save!
render :text => @token.to_query
else
render :nothing => true, :status => 401
end
end
def access_token
@token = current_token && current_token.exchange!
if @token
render :text => @token.to_query
else
render :nothing => true, :status => 401
end
end
def oauthorize
@token = RequestToken.find_by_token params[:oauth_token]
unless @token.nil? or @token.invalidated?
if request.post?
any_auth = false
@token.client_application.permissions.each do |pref|
if params[pref]
@token.write_attribute(pref, true)
any_auth ||= true
else
@token.write_attribute(pref, false)
end
end
if any_auth
@token.authorize!(@user)
if @token.oauth10?
redirect_url = params[:oauth_callback] || @token.client_application.callback_url
else
redirect_url = @token.oob? ? @token.client_application.callback_url : @token.callback_url
end
if redirect_url and not redirect_url.empty?
if @token.oauth10?
redirect_to "#{redirect_url}?oauth_token=#{@token.token}"
else
redirect_to "#{redirect_url}?oauth_token=#{@token.token}&oauth_verifier=#{@token.verifier}"
end
else
render :action => "authorize_success"
end
else
@token.invalidate!
render :action => "authorize_failure"
end
end
else
render :action => "authorize_failure"
end
any_auth
end
def revoke
@token = @user.oauth_tokens.find_by_token params[:token]
@token = current_user.oauth_tokens.find_by_token params[:token]
if @token
@token.invalidate!
flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name)