lib/lockdown/session.rb in lockdown-0.8.1 vs lib/lockdown/session.rb in lockdown-0.9.0

@@ -1,31 +1,35 @@
 module Lockdown
   module Session
+
     protected
 
-    def nil_lockdown_values
-      [:expiry_time, :user_id, :user_name, :user_profile_id, :access_rights].each do |val|
-        session[val] = nil if session[val]
+    def add_lockdown_session_values(user = nil)
+      user ||= current_user
+
+      if user
+        session[:access_rights] = Lockdown::System.access_rights_for_user(user)
+        session[:current_user_id] = user.id
       end
-    end 
-    
+    end
+
+    def current_user_id
+      session[:current_user_id]
+    end
+
+    def current_user_is_admin?
+      session[:access_rights] == :all
+    end
+
     def current_user_access_in_group?(grp)
       return true if current_user_is_admin?
         Lockdown::System.user_groups[grp].each do |perm|
           return true if access_in_perm?(perm)
         end
       false
     end
 
-    def current_user_is_admin?
-      session[:access_rights] == :all
-    end
-
-    def add_lockdown_session_values(user)
-      session[:access_rights] = Lockdown::System.access_rights_for_user(user)
-    end
-
     def access_in_perm?(perm)
       if Lockdown::System.permissions[perm]
         Lockdown::System.permissions[perm].each do |ar|
           return true if session_access_rights_include?(ar)
         end 
@@ -35,7 +39,15 @@
 
     def session_access_rights_include?(str)
       return false unless session[:access_rights]
       session[:access_rights].include?(str)
     end
+
+    def reset_lockdown_session
+      [:expiry_time, :current_user_id, :access_rights].each do |val|
+        session[val] = nil if session[val]
+      end
+    end 
+
+    alias_method :nil_lockdown_values, :reset_lockdown_session
   end # Session
 end # Lockdown