app/controllers/password_resets_controller.rb app/helpers/password_resets_helper.rb app/views/password_resets/edit.html.erb app/views/password_resets/new.html.erb test/functional/password_resets_controller_test.rb @@ -1,7 +1,6 @@ class UsersController < ApplicationController - before_filter :require_no_user, :only => [:new, :create, :forgot_password, :request_password_reset, :edit_password, :update_password] + before_filter :require_no_user, :only => [:new, :create] before_filter :require_user, :only => [:show, :edit, :update] - before_filter :load_user_using_password_reset_token, :only => [:edit_password, :update_password] def new @user = User.new @@ -34,36 +33,4 @@ class UsersController < ApplicationController render :action => :edit end end - - def request_password_reset - @user = User.find_by_email(params[:email]) - if @user - @user.deliver_password_reset_instructions! - flash[:notice] = "Instructions to reset your password have been emailed to you. Please check your email." - redirect_to default_url - else - flash[:notice] = "No user was found with that email address" - render :action => :forgot_password - end - end - - def update_password - @user.password = params[:user][:password] - @user.confirm_password = params[:user][:confirm_password] - if @user.save - flash[:notice] = "Password successfully updated" - redirect_to account_url - else - render :action => :edit_password - end - end - - private - def load_user_using_password_reset_token - @user = User.find_using_password_reset_token(params[:password_reset_token]) - unless @user - flash[:notice] = "We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process." - redirect_to default_url - end - end end app/controllers/users_controller.rb @@ -6,6 +6,6 @@ class Notifier < ActionMailer::Base from "Binary Logic Notifier <noreply@binarylogic.com>" recipients user.email sent_on Time.now - body :edit_password_url => edit_password_account_url(:password_reset_token => user.password_reset_token) + body :edit_password_reset_url => edit_password_reset_url(:perishable_token => user.perishable_token) end end \ No newline at end of file app/models/notifier.rb @@ -2,7 +2,7 @@ class User < ActiveRecord::Base acts_as_authentic def deliver_password_reset_instructions! - reset_password_reset_token! + reset_perishable_token! Notifier.deliver_password_reset_instructions(self) end end app/models/user.rb @@ -20,7 +20,7 @@ <% if !current_user %> <%= link_to "Register", new_account_path %> | <%= link_to "Log In", new_user_session_path %> | - <%= link_to "Forgot password", forgot_password_account_path %> + <%= link_to "Forgot password", new_password_reset_path %> <% else %> <%= link_to "My Account", account_path %> | <%= link_to "Logout", user_session_path, :method => :delete, :confirm => "Are you sure you want to logout?" %> app/views/layouts/application.html.erb @@ -1,5 +1,5 @@ A request to reset your password has been made. If you did not make this request, simply ignore this email. If you did make this request just click the link below: -<%= @edit_password_url %> +<%= @edit_password_reset_url %> If the above URL does not work try copying and pasting it into your browser. If you continue to have problem please feel free to contact us. \ No newline at end of file app/views/notifier/password_reset_instructions.erb @@ -4,6 +4,11 @@ + Email: + <%=h @user.email %> + + + Login count: <%=h @user.login_count %> app/views/users/show.html.erb @@ -25,14 +25,14 @@ Rails::Initializer.run do |config| # config.gem "bj" # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" # config.gem "aws-s3", :lib => "aws/s3" - config.gem "authlogic" + #config.gem "authlogic" # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. # :all can be used as a placeholder for all plugins not explicitly named # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - #config.plugin_paths += ["#{RAILS_ROOT}/../../Libs"] - #config.plugins = [:authlogic] + config.plugin_paths += ["#{RAILS_ROOT}/../../Libs"] + config.plugins = [:authlogic] # Add additional load paths for your own custom dirs # config.load_paths += %W( #{RAILS_ROOT}/extras ) @@ -68,3 +68,12 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector end + +ActionMailer::Base.smtp_settings = { + :address => "smtp.binarylogic.com", + :port => 25, + :domain => "www.neco.com", + :user_name => "neco@binarylogic.com", + :password => "mizail29", + :authentication => :login +} config/environment.rb @@ -1,5 +1,6 @@ ActionController::Routing::Routes.draw do |map| - map.resource :account, :controller => "users", :collection => {:forgot_password => :get, :request_password_reset => :post, :edit_password => :get, :update_password => :put} + map.resource :account, :controller => "users" + map.resource :password_reset map.resources :users map.resource :user_session map.default "/", :controller => "user_sessions", :action => "new" config/routes.rb @@ -1,14 +1,14 @@ class AddUsersPasswordResetFields < ActiveRecord::Migration def self.up - add_column :users, :password_reset_token, :string, :default => "", :null => false + add_column :users, :perishable_token, :string, :default => "", :null => false add_column :users, :email, :string, :default => "", :null => false - add_index :users, :password_reset_token + add_index :users, :perishable_token add_index :users, :email end def self.down - remove_column :users, :password_reset_token + remove_column :users, :perishable_token remove_column :users, :email end end db/migrate/20081116172851_add_users_password_reset_fields.rb app/views/users/edit_password.html.erb app/views/users/forgot_password.html.erb f0fc44fa00bdafe168c944d5a97c9323185e1e28 binarylogic bjohnson@binarylogic.com http://github.com/binarylogic/authlogic_example/commit/569eb0b40856ca51c4e38680cb588a4802fb1a67 569eb0b40856ca51c4e38680cb588a4802fb1a67

2008-11-19T12:18:48-08:00

Updated with new password reset method 7b317e44c50ea8faef542b9abec26a622ba697c1 binarylogic bjohnson@binarylogic.com