X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7..f65593651f17f1bb2caa6a757ca377c094ea7a02:/app/controllers/oauth_controller.rb diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 59ebfd631..62a68b533 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -1,21 +1,37 @@ -require "oauth/controllers/provider_controller" - class OauthController < ApplicationController include OAuth::Controllers::ProviderController + # The ProviderController will call login_required for any action that needs + # a login, but we want to check authorization on every action. + authorize_resource :class => false + + before_action :require_oauth_10a_support + layout "site" + allow_all_form_action :only => :oauth1_authorize + + def revoke + @token = current_user.oauth_tokens.find_by :token => params[:token] + if @token + @token.invalidate! + flash[:notice] = t(".flash", :application => @token.client_application.name) + end + redirect_to oauth_clients_url(:display_name => @token.user.display_name) + end + + protected + def login_required authorize_web set_locale - require_user end def user_authorizes_token? any_auth = false @token.client_application.permissions.each do |pref| - if params[pref] + if params[pref].to_i.nonzero? @token.write_attribute(pref, true) any_auth ||= true else @@ -26,20 +42,9 @@ class OauthController < ApplicationController any_auth end - def revoke - @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) - end - redirect_to oauth_clients_url(:display_name => @token.user.display_name) - end - - protected - def oauth1_authorize if @token.invalidated? - @message = t "oauth.oauthorize_failure.invalid" + @message = t "oauth.authorize_failure.invalid" render :action => "authorize_failure" elsif request.post? if user_authorizes_token? @@ -49,7 +54,7 @@ class OauthController < ApplicationController else @token.oob? ? @token.client_application.callback_url : @token.callback_url end - @redirect_url = URI.parse(callback_url) unless callback_url.blank? + @redirect_url = URI.parse(callback_url) if callback_url.present? if @redirect_url.to_s.blank? render :action => "authorize_success" @@ -61,15 +66,13 @@ class OauthController < ApplicationController "&oauth_token=#{@token.token}" end - unless @token.oauth10? - @redirect_url.query += "&oauth_verifier=#{@token.verifier}" - end + @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10? - redirect_to @redirect_url.to_s + redirect_to @redirect_url.to_s, :allow_other_host => true end else @token.invalidate! - @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name) + @message = t("oauth.authorize_failure.denied", :app_name => @token.client_application.name) render :action => "authorize_failure" end end