@@ -8,21 +8,11 @@ class UserSessionsController < ApplicationController def create @user_session = UserSession.new(params[:user_session]) - # We are saving with a block to accomodate for OpenID authentication - # If you are not using OpenID you can save without a block: - # - # if @user_session.save - # # ... successful login - # else - # # ... unsuccessful login - # end - @user_session.save do |result| - if result - flash[:notice] = "Login successful!" - redirect_back_or_default account_url - else - render :action => :new - end + if @user_session.save + flash[:notice] = "Login successful!" + redirect_back_or_default account_url + else + render :action => :new end end app/controllers/user_sessions_controller.rb @@ -1,28 +1,3 @@ class User < ActiveRecord::Base - # ALL of the following code is for OpenID integration. If you are not using OpenID in your app - # just remove all of the following code, to the point where you User class is completely blank. - acts_as_authentic :login_field_validation_options => {:if => :openid_identifier_blank?}, :password_field_validation_options => {:if => :openid_identifier_blank?} - - validate :normalize_openid_identifier - validates_uniqueness_of :openid_identifier, :allow_blank => true - validates_length_of :email, :minimum => 500, :unless => "true" - - # For acts_as_authentic configuration - def openid_identifier_blank? - openid_identifier.blank? - end - - def deliver_password_reset_instructions! - reset_perishable_token! - Notifier.deliver_password_reset_instructions(self) - end - - private - def normalize_openid_identifier - begin - self.openid_identifier = OpenIdAuthentication.normalize_url(openid_identifier) if !openid_identifier.blank? - rescue OpenIdAuthentication::InvalidOpenId => e - errors.add(:openid_identifier, e.message) - end - end + acts_as_authentic end app/models/user.rb @@ -21,7 +21,6 @@ <% if !current_user %> <%= link_to "Register", new_account_path %> | <%= link_to "Log In", new_user_session_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 @@ -2,23 +2,11 @@ <% form_for @user_session, :url => user_session_path do |f| %> <%= f.error_messages %> - <div id="login_container"<% unless @user_session.openid_identifier.blank? %> style="display: none;"<% end %>> - <%= f.label :login %> (or <%= link_to_function "login using OpenID", "$('login_container').toggle(); $('openid_container').toggle();" %>)<br /> - <%= f.text_field :login %><br /> - <br /> - <%= f.label :password %><br /> - <%= f.password_field :password %><br /> - </div> - <!-- - Notice the following is for OpenID. If you are not implementing OpenID in your app, simply remove the following <div> block. - Also, notice the <div id="login_container"> above, those fields do not need to be wrapped in a <div>, you can remove that as well. - I apologize if this makes it a little confusing, I have been building this app with a number of tutorials and one of them has been - OpenID integration. - --> - <div id="openid_container"<% if @user_session.openid_identifier.blank? %> style="display: none;"<% end %>> - <%= f.label :openid_identifier, "OpenID" %> (or <%= link_to_function "login using a standard username / password", "$('login_container').toggle(); $('openid_container').toggle();" %>)<br /><br /> - <%= f.text_field :openid_identifier %><br /> - </div> + <%= f.label :login %><br /> + <%= f.text_field :login %><br /> + <br /> + <%= f.label :password %><br /> + <%= f.password_field :password %><br /> <br /> <%= f.check_box :remember_me %><%= f.label :remember_me %><br /> <br /> app/views/user_sessions/new.html.erb @@ -6,14 +6,4 @@ <br /> <%= form.label :password_confirmation %><br /> <%= form.password_field :password_confirmation %><br /> -<br /> -<!-- - The following is for OpenID integration, if you are not using OpenID in your app - simple remove the :openid_identifier label and field ---> -<%= form.label :openid_identifier, "Or use OpenID instead of a standard login / password" %><br /> -<%= form.text_field :openid_identifier %><br /> -<br /> -<%= form.label :email %><br /> -<%= form.text_field :email %><br /> <br /> \ No newline at end of file app/views/users/_form.erb @@ -1,21 +1,6 @@ -<!-- - The following is for OpenID, if you are not using OpenID in your app remove - the OpenID if statement and field below. ---> -<% if @user.openid_identifier.blank? %> - <p> - <b>Login:</b> - <%=h @user.login %> - </p> -<% else %> - <p> - <b>OpenID:</b> - <%=h @user.openid_identifier %> - </p> -<% end %> <p> - <b>Email:</b> - <%=h @user.email %> + <b>Login:</b> + <%=h @user.login %> </p> <p> app/views/users/show.html.erb @@ -1,6 +1,5 @@ ActionController::Routing::Routes.draw do |map| map.resource :account, :controller => "users" - map.resources :password_resets map.resources :users map.resource :user_session map.root :controller => "user_sessions", :action => "new" config/routes.rb app/controllers/password_resets_controller.rb app/models/notifier.rb app/views/notifier/password_reset_instructions.erb db/migrate/20081116172851_add_users_password_reset_fields.rb db/migrate/20081119233359_add_users_openid_field.rb db/migrate/20081120163933_create_openid_tables.rb vendor/plugins/open_id_authentication/CHANGELOG vendor/plugins/open_id_authentication/README vendor/plugins/open_id_authentication/Rakefile vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/open_id_authentication_tables_generator.rb vendor/plugins/open_id_authentication/generators/open_id_authentication_tables/templates/migration.rb vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/templates/migration.rb vendor/plugins/open_id_authentication/generators/upgrade_open_id_authentication_tables/upgrade_open_id_authentication_tables_generator.rb vendor/plugins/open_id_authentication/init.rb vendor/plugins/open_id_authentication/lib/open_id_authentication.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/db_store.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/mem_cache_store.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb vendor/plugins/open_id_authentication/lib/open_id_authentication/timeout_fixes.rb vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake vendor/plugins/open_id_authentication/test/mem_cache_store_test.rb vendor/plugins/open_id_authentication/test/normalize_test.rb vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb vendor/plugins/open_id_authentication/test/status_test.rb vendor/plugins/open_id_authentication/test/test_helper.rb 32eaec9f48827d85d7ce062a330302f11e626997 binarylogic bjohnson@binarylogic.com http://github.com/binarylogic/authlogic_example/commit/d1cf131a86d578041e8f58b0caafbda3ab499d71 d1cf131a86d578041e8f58b0caafbda3ab499d71 2008-12-11T20:43:59-08:00 2008-12-11T20:43:59-08:00 Removed all password resets and openid code and put them in their own branch 1eda82ab3dbd7979f7325bda4ea5e7ef24c8c7db binarylogic bjohnson@binarylogic.com