app/controllers/clearance/sessions_controller.rb in thoughtbot-clearance-0.6.3 vs app/controllers/clearance/sessions_controller.rb in thoughtbot-clearance-0.6.4
- old
+ new
@@ -10,53 +10,36 @@
def create
@user = ::User.authenticate(params[:session][:email],
params[:session][:password])
if @user.nil?
- flash.now[:notice] = "Bad email or password."
+ flash.now[:failure] = "Bad email or password."
render :template => 'sessions/new', :status => :unauthorized
else
if @user.email_confirmed?
- remember(@user) if remember?
sign_user_in(@user)
- flash[:notice] = "Signed in successfully."
+ remember(@user) if remember?
+ flash[:success] = "Signed in."
redirect_back_or url_after_create
else
::ClearanceMailer.deliver_confirmation(@user)
deny_access("User has not confirmed email. Confirmation email will be resent.")
end
end
end
def destroy
forget(current_user)
- reset_session
- flash[:notice] = "You have been signed out."
+ flash[:success] = "Signed out."
redirect_to url_after_destroy
end
private
- def remember?
- params[:session] && params[:session][:remember_me] == "1"
- end
-
- def remember(user)
- user.remember_me!
- cookies[:remember_token] = { :value => user.token,
- :expires => user.token_expires_at }
- end
-
- def forget(user)
- user.forget_me! if user
- cookies.delete :remember_token
- end
-
def url_after_create
root_url
end
def url_after_destroy
new_session_url
end
-
end