@@ -1,3 +1,8 @@ +h2. 0.8.1 (08/31/2009) + +* Removed unnecessary remember_token_expires_at column and the +remember? and forget_me! user instance methods. (Dan Croak) + h2. 0.8.0 (08/31/2009) * Always remember me. Replaced session-and-remember-me authentication with CHANGELOG.textile @@ -28,7 +28,7 @@ class Clearance::SessionsController < ApplicationController end def destroy - sign_out(current_user) + sign_out flash_success_after_destroy redirect_to(url_after_destroy) end app/controllers/clearance/sessions_controller.rb @@ -6,7 +6,6 @@ class ClearanceCreateUsers < ActiveRecord::Migration t.string :salt, :limit => 128 t.string :confirmation_token, :limit => 128 t.string :remember_token, :limit => 128 - t.datetime :remember_token_expires_at t.boolean :email_confirmed, :default => false, :null => false t.timestamps end generators/clearance/templates/migrations/create_users.rb @@ -8,7 +8,6 @@ class ClearanceUpdateUsers < ActiveRecord::Migration [:salt, 't.string :salt, :limit => 128'], [:confirmation_token, 't.string :confirmation_token, :limit => 128'], [:remember_token, 't.string :remember_token, :limit => 128'], - [:remember_token_expires_at, 't.datetime :remember_token_expires_at'], [:email_confirmed, 't.boolean :email_confirmed, :default => false, :null => false'] ].delete_if {|c| existing_columns.include?(c.first.to_s)} -%> generators/clearance/templates/migrations/update_users.rb @@ -51,21 +51,17 @@ module Clearance user.remember_me! cookies[:remember_token] = { :value => user.remember_token, - :expires => user.remember_token_expires_at + :expires => 1.year.from_now.utc } end end # Sign user out of cookie. # - # @param [User] - # # @example - # sign_out(@user) - def sign_out(user) - user.forget_me! if user + # sign_out + def sign_out cookies.delete(:remember_token) - reset_session end # Store the current location. @@ -83,8 +79,7 @@ module Clearance def user_from_cookie if token = cookies[:remember_token] - return nil unless user = ::User.find_by_remember_token(token) - return user if user.remember? + ::User.find_by_remember_token(token) end end @@ -94,7 +89,9 @@ module Clearance end def store_location - session[:return_to] = request.request_uri if request.get? + if request.get? + session[:return_to] = request.request_uri + end end def redirect_back_or(default) lib/clearance/authentication.rb @@ -101,17 +101,6 @@ module Clearance encrypted_password == encrypt(password) end - # Am I remembered? - # - # @return [true, false] - # @example - # user.remember? - def remember? - remember_token && - remember_token_expires_at && - Time.now.utc < remember_token_expires_at - end - # Remember me for a year. # # @example @@ -121,16 +110,7 @@ module Clearance # :expires => user.remember_token_expires_at # } def remember_me! - remember_me_until! 1.year.from_now.utc - end - - # Forget me. - # - # @example - # user.forget_me! - def forget_me! - self.remember_token = nil - self.remember_token_expires_at = nil + self.remember_token = encrypt("--#{Time.now.utc}--#{password}--") save(false) end @@ -200,12 +180,6 @@ module Clearance def password_required? encrypted_password.blank? || !password.blank? end - - def remember_me_until!(time) - self.remember_token_expires_at = time - self.remember_token = encrypt("--#{time}--#{password}--") - save(false) - end end module ClassMethods lib/clearance/user.rb @@ -49,7 +49,6 @@ class SessionsControllerTest < ActionController::TestCase should 'set the token in users table' do assert_not_nil @user.reload.remember_token - assert_not_nil @user.reload.remember_token_expires_at end end @@ -136,7 +135,6 @@ class SessionsControllerTest < ActionController::TestCase should "delete the database token" do assert_nil @user.reload.remember_token - assert_nil @user.reload.remember_token_expires_at end end test/controllers/sessions_controller_test.rb @@ -3,8 +3,7 @@ require 'test_helper' class UserTest < ActiveSupport::TestCase should_not_allow_mass_assignment_of :email_confirmed, - :salt, :encrypted_password, - :remember_token, :remember_token_expires_at + :salt, :encrypted_password, :remember_token # signing up @@ -113,50 +112,11 @@ class UserTest < ActiveSupport::TestCase setup do @user = Factory(:email_confirmed_user) assert_nil @user.remember_token - assert_nil @user.remember_token_expires_at @user.remember_me! end - should "set the remember token and expiration date" do + should "set the remember token" do assert_not_nil @user.remember_token - assert_not_nil @user.remember_token_expires_at - end - - should "remember user when remember token expires in the future" do - @user.update_attribute :remember_token_expires_at, - 2.weeks.from_now.utc - assert @user.remember? - end - - should "not remember user when remember token has already expired" do - @user.update_attribute :remember_token_expires_at, - 2.weeks.ago.utc - assert ! @user.remember? - end - - should "not remember user when remember token is not set" do - @user.update_attribute :remember_token, nil - assert ! @user.remember? - end - - should "not remember user when remember token expiry date is not set" do - @user.update_attribute :remember_token_expires_at, nil - assert ! @user.remember? - end - - # logging out - - context "forget_me!" do - setup { @user.forget_me! } - - should "unset the remember token and expiration date" do - assert_nil @user.remember_token - assert_nil @user.remember_token_expires_at - end - - should "not remember user" do - assert ! @user.remember? - end end end test/models/user_test.rb cbcc2278942c5d23a9012b277ada17d49da24e8a Daniel Croak dancroak@dan-lawlesss-macbook.local http://github.com/thoughtbot/clearance/commit/9a088ba624e55a3426d9ca58e8c5161c19467cc0 9a088ba624e55a3426d9ca58e8c5161c19467cc0 2009-08-31T14:00:19-07:00 2009-08-31T14:00:19-07:00 Removed unnecessary remember_token_expires_at column and the remember? and forget_me! user instance methods bd21a64bc67785b5cd508ffd916769b98827c4e5 Daniel Croak dancroak@dan-lawlesss-macbook.local