Changed User model to not allow nil display_name (w/ tests)

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2be8c16371546e9fe39e7491b8e11a66536e54a4..1df6dd7d14cf41e1fad3ac04eb4512fe231eec13 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,5 @@
 class ApplicationController < ActionController::Base
   include SessionPersistence
 class ApplicationController < ActionController::Base
   include SessionPersistence

-  # check_authorization

 
   protect_from_forgery :with => :exception
 
 
   protect_from_forgery :with => :exception
 


@@ -20,16 +19,16 @@ class ApplicationController < ActionController::Base
         session.delete(:user)
         session_expires_automatically
 
         session.delete(:user)
         session_expires_automatically
 

-        redirect_to :controller => "user", :action => "suspended"
+        redirect_to :controller => "users", :action => "suspended"

 
       # don't allow access to any auth-requiring part of the site unless
       # the new CTs have been seen (and accept/decline chosen).
       elsif !current_user.terms_seen && flash[:skip_terms].nil?
 
       # don't allow access to any auth-requiring part of the site unless
       # the new CTs have been seen (and accept/decline chosen).
       elsif !current_user.terms_seen && flash[:skip_terms].nil?

-        flash[:notice] = t "user.terms.you need to accept or decline"
+        flash[:notice] = t "users.terms.you need to accept or decline"

         if params[:referer]
         if params[:referer]

-          redirect_to :controller => "user", :action => "terms", :referer => params[:referer]
+          redirect_to :controller => "users", :action => "terms", :referer => params[:referer]

         else
         else

-          redirect_to :controller => "user", :action => "terms", :referer => request.fullpath
+          redirect_to :controller => "users", :action => "terms", :referer => request.fullpath

         end
       end
     elsif session[:token]
         end
       end
     elsif session[:token]


@@ -44,7 +43,7 @@ class ApplicationController < ActionController::Base
   def require_user
     unless current_user
       if request.get?
   def require_user
     unless current_user
       if request.get?

-        redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+        redirect_to :controller => "users", :action => "login", :referer => request.fullpath

       else
         head :forbidden
       end
       else
         head :forbidden
       end


@@ -286,8 +285,7 @@ class ApplicationController < ActionController::Base
     # TODO: some sort of escaping of problem characters in the message
     response.headers["Error"] = message
 
     # TODO: some sort of escaping of problem characters in the message
     response.headers["Error"] = message
 

-    if request.headers["X-Error-Format"] &&
-       request.headers["X-Error-Format"].casecmp("xml").zero?
+    if request.headers["X-Error-Format"]&.casecmp("xml")&.zero?

       result = OSM::API.new.get_xml_doc
       result.root.name = "osmError"
       result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")
       result = OSM::API.new.get_xml_doc
       result.root.name = "osmError"
       result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")


@@ -313,7 +311,7 @@ class ApplicationController < ActionController::Base
   helper_method :preferred_languages
 
   def set_locale(reset = false)
   helper_method :preferred_languages
 
   def set_locale(reset = false)

-    if current_user && current_user.languages.empty? && !http_accept_language.user_preferred_languages.empty?
+    if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty?

       current_user.languages = http_accept_language.user_preferred_languages
       current_user.save
     end
       current_user.languages = http_accept_language.user_preferred_languages
       current_user.save
     end


@@ -390,11 +388,11 @@ class ApplicationController < ActionController::Base
   ##
   # render a "no such user" page
   def render_unknown_user(name)
   ##
   # render a "no such user" page
   def render_unknown_user(name)

-    @title = t "user.no_such_user.title"
+    @title = t "users.no_such_user.title"

     @not_found_user = name
 
     respond_to do |format|
     @not_found_user = name
 
     respond_to do |format|

-      format.html { render :template => "user/no_such_user", :status => :not_found }
+      format.html { render :template => "users/no_such_user", :status => :not_found }

       format.all { head :not_found }
     end
   end
       format.all { head :not_found }
     end
   end


@@ -438,7 +436,7 @@ class ApplicationController < ActionController::Base
   def preferred_editor
     editor = if params[:editor]
                params[:editor]
   def preferred_editor
     editor = if params[:editor]
                params[:editor]

-             elsif current_user && current_user.preferred_editor
+             elsif current_user&.preferred_editor

                current_user.preferred_editor
              else
                DEFAULT_EDITOR
                current_user.preferred_editor
              else
                DEFAULT_EDITOR


@@ -471,19 +469,25 @@ class ApplicationController < ActionController::Base
   end
 
   def current_ability
   end
 
   def current_ability

-    Ability.new(current_user).merge(granted_capabily)
-  end
-
-  def granted_capabily
-    Capability.new(current_user, current_token)
+    # Add in capabilities from the oauth token if it exists and is a valid access token
+    if Authenticator.new(self, [:token]).allow?
+      Ability.new(current_user).merge(Capability.new(current_token))
+    else
+      Ability.new(current_user)
+    end

   end
 
   end
 

-  def deny_access(exception)
-    if current_user
+  def deny_access(_exception)
+    if current_token

       set_locale
       report_error t("oauth.permissions.missing"), :forbidden
       set_locale
       report_error t("oauth.permissions.missing"), :forbidden

+    elsif current_user
+      set_locale
+      report_error t("application.permission_denied"), :forbidden
+    elsif request.get?
+      redirect_to :controller => "users", :action => "login", :referer => request.fullpath

     else
     else

-      require_user
+      head :forbidden

     end
   end
 
     end
   end