lib/typus/authentication/session.rb in typus-3.0.8 vs lib/typus/authentication/session.rb in typus-3.0.9

@@ -13,20 +13,25 @@
           back_to = request.env['PATH_INFO'] unless [admin_dashboard_path, admin_path].include?(request.env['PATH_INFO'])
           redirect_to new_admin_session_path(:back_to => back_to)
         end
       end
 
+      def deauthenticate
+        session[:typus_user_id] = nil
+        ::I18n.locale = ::I18n.default_locale
+        redirect_to new_admin_session_path
+      end
+
       #--
-      # Return the current user. If role does not longer exist on the
-      # system admin_user will be signed out from Typus.
+      # Return the current user. If role does not longer exist on the system
+      # admin_user will be signed out from the system.
       #++
       def admin_user
         @admin_user ||= Typus.user_class.find_by_id(session[:typus_user_id])
 
         if !@admin_user || !Typus::Configuration.roles.has_key?(@admin_user.role) || !@admin_user.status
-          session[:typus_user_id] = nil
-          redirect_to new_admin_session_path
+          deauthenticate
         end
 
         @admin_user
       end
 
@@ -64,32 +69,26 @@
       # This method checks if the user can perform the requested action.
       # It works on a resource: git, memcached, syslog ...
       #++
       def check_if_user_can_perform_action_on_resource
         resource = params[:controller].remove_prefix.camelize
-        unless admin_user.can?(params[:action], resource, { :special => true })
-          not_allowed
-        end
+        not_allowed if admin_user.cannot?(params[:action], resource, { :special => true })
       end
 
       def not_allowed
         render :text => "Not allowed!", :status => :unprocessable_entity
       end
 
       #--
-      # If item is owned by another user, we only can perform a
-      # show action on the item. Updated item is also blocked.
-      #
-      #   before_filter :check_resource_ownership, :only => [ :edit, :update, :destroy,
-      #                                                       :toggle, :position,
-      #                                                       :relate, :unrelate ]
+      # If item is owned by another user, we only can perform a show action on
+      # the item. Updated item is also blocked.
       #++
       def check_resource_ownership
         if admin_user.is_not_root?
 
           condition_typus_users = @item.respond_to?(Typus.relationship) && !@item.send(Typus.relationship).include?(admin_user)
-          condition_typus_user_id = @item.respond_to?(Typus.user_fk) && !@item.owned_by?(admin_user)
+          condition_typus_user_id = @item.respond_to?(Typus.user_fk) && !admin_user.owns?(@item)
 
           not_allowed if (condition_typus_users || condition_typus_user_id)
         end
       end
 
@@ -97,33 +96,27 @@
       # Show only related items it @resource has a foreign_key (Typus.user_fk)
       # related to the logged user.
       #++
       def check_resources_ownership
         if admin_user.is_not_root? && @resource.typus_user_id?
-          condition = { Typus.user_fk => admin_user }
-          @resource = @resource.where(condition)
+          @resource = @resource.where(Typus.user_fk => admin_user)
         end
       end
 
+      ##
+      # OPTIMIZE: This method should accept args.
+      #
       def set_attributes_on_create
-        if @resource.typus_user_id?
-          @item.attributes = { Typus.user_fk => admin_user.id }
-        end
+        @item.send("#{Typus.user_fk}=", admin_user.id) if @resource.typus_user_id?
       end
 
+      ##
+      # OPTIMIZE: This method should accept args and not perform an update
+      #           because we are updating the attributes twice!
+      #
       def set_attributes_on_update
         if @resource.typus_user_id? && admin_user.is_not_root?
           @item.update_attributes(Typus.user_fk => admin_user.id)
-        end
-      end
-
-      #--
-      # Reload admin_user when updating to see flash message in the
-      # correct locale.
-      #++
-      def reload_locales
-        if @resource.eql?(Typus.user_class)
-          ::I18n.locale = admin_user.reload.locale
         end
       end
 
     end
   end