Use CanCanCan to control access to oauth controller actions

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d18cf188cf669ef002fbc975f6f08d091f697d6f..01eee61df47fb9ee7e1806b1395fbd8110fcdbdd 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -6,15 +6,15 @@ class UsersController < ApplicationController
   before_action :authorize, :only => [:api_details, :api_gpx_files]
   before_action :authorize_web, :except => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :set_locale, :except => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :authorize, :only => [:api_details, :api_gpx_files]
   before_action :authorize_web, :except => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :set_locale, :except => [:api_read, :api_users, :api_details, :api_gpx_files]

-  before_action :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
+  before_action :api_deny_access_handler, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
+
+  authorize_resource
+

   before_action :require_self, :only => [:account]
   before_action :check_database_readable, :except => [:login, :api_read, :api_users, :api_details, :api_gpx_files]
   before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
   before_action :check_api_readable, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :require_self, :only => [:account]
   before_action :check_database_readable, :except => [:login, :api_read, :api_users, :api_details, :api_gpx_files]
   before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
   before_action :check_api_readable, :only => [:api_read, :api_users, :api_details, :api_gpx_files]

-  before_action :require_allow_read_prefs, :only => [:api_details]
-  before_action :require_allow_read_gpx, :only => [:api_gpx_files]

   before_action :require_cookies, :only => [:new, :login, :confirm]
   before_action :require_cookies, :only => [:new, :login, :confirm]

-  before_action :require_administrator, :only => [:set_status, :delete, :index]

   around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]
   around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]


@@ -107,7 +107,7 @@ class UsersController < ApplicationController
             successful_login(current_user)
           else
             session[:token] = current_user.tokens.create.token
             successful_login(current_user)
           else
             session[:token] = current_user.tokens.create.token

-            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_now
+            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_later

             redirect_to :action => "confirm", :display_name => current_user.display_name
           end
         else
             redirect_to :action => "confirm", :display_name => current_user.display_name
           end
         else


@@ -158,7 +158,7 @@ class UsersController < ApplicationController
 
       if user
         token = user.tokens.create
 
       if user
         token = user.tokens.create

-        Notifier.lost_password(user, token).deliver_now
+        Notifier.lost_password(user, token).deliver_later

         flash[:notice] = t "users.lost_password.notice email on way"
         redirect_to :action => "login"
       else
         flash[:notice] = t "users.lost_password.notice email on way"
         redirect_to :action => "login"
       else


@@ -339,7 +339,7 @@ class UsersController < ApplicationController
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else
     if user.nil? || token.nil? || token.user != user
       flash[:error] = t "users.confirm_resend.failure", :name => params[:display_name]
     else

-      Notifier.signup_confirm(user, user.tokens.create).deliver_now
+      Notifier.signup_confirm(user, user.tokens.create).deliver_later

       flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe
     end
 
       flash[:notice] = t("users.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe
     end
 


@@ -432,7 +432,7 @@ class UsersController < ApplicationController
           flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif friend.save
           flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name
           flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif friend.save
           flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name

-          Notifier.friend_notification(friend).deliver_now
+          Notifier.friend_notification(friend).deliver_later

         else
           friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))
         end
         else
           friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))
         end


@@ -735,7 +735,7 @@ class UsersController < ApplicationController
           flash.now[:notice] = t "users.account.flash update success confirm needed"
 
           begin
           flash.now[:notice] = t "users.account.flash update success confirm needed"
 
           begin

-            Notifier.email_confirm(user, user.tokens.create).deliver_now
+            Notifier.email_confirm(user, user.tokens.create).deliver_later

           rescue StandardError
             # Ignore errors sending email
           end
           rescue StandardError
             # Ignore errors sending email
           end


@@ -749,23 +749,6 @@ class UsersController < ApplicationController
     end
   end
 
     end
   end
 

-  ##
-  # require that the user is a administrator, or fill out a helpful error message
-  # and return them to the user page.
-  def require_administrator
-    if current_user && !current_user.administrator?
-      flash[:error] = t("users.filter.not_an_administrator")
-
-      if params[:display_name]
-        redirect_to user_path(:display_name => params[:display_name])
-      else
-        redirect_to :action => "login", :referer => request.fullpath
-      end
-    elsif !current_user
-      redirect_to :action => "login", :referer => request.fullpath
-    end
-  end
-

   ##
   # require that the user in the URL is the logged in user
   def require_self
   ##
   # require that the user in the URL is the logged in user
   def require_self