app/views/shared/_personal_details.html.erb @@ -43,8 +43,10 @@ class PeopleController < ApplicationController @person = Person.new(params[:person]) respond_to do |format| @person.email_verified = false if global_prefs.email_verifications? + @person.identity_url = session[:verified_identity_url] @person.save if @person.errors.empty? + session[:verified_identity_url] = nil if global_prefs.email_verifications? @person.email_verifications.create flash[:notice] = %(Thanks for signing up! Check your email @@ -57,7 +59,12 @@ class PeopleController < ApplicationController end else @body = "register single-col" - format.html { render :action => 'new' } + format.html { if @person.identity_url.blank? + render :action => 'new' + else + render :partial => "shared/personal_details.html.erb", :object => @person, :layout => 'application' + end + } end end rescue ActiveRecord::StatementInvalid app/controllers/people_controller.rb @@ -17,29 +17,45 @@ class SessionsController < ApplicationController def open_id_authentication(openid_url) authenticate_with_open_id(openid_url, :required => [:nickname, :email]) do |result, identity_url, registration| - if result.successful? + if !result.successful? + failed_login result.message + else @person = Person.find_or_initialize_by_identity_url(identity_url) if @person.new_record? + @person.email_verified = false if global_prefs.email_verifications? @person.name = registration['nickname'] @person.email = registration['email'] - # XXX for now, don't mess with email verification for openid guys - @person.email_verified = true if global_prefs.email_verifications? + @person.save if !@person.errors.empty? err_message = "The following problems exist with your OpenID profile:<br>" - @person.errors.each do |attr,val| - logger.warn "XXX #{attr}:#{val}" - err_message += "#{attr}: #{val}<br>" + @person.errors.each do |attr,val| + logger.warn "open_id_authentication() Error: #{attr}:#{val}" + err_message += "#{attr}: #{val}<br>" end - - failed_login err_message.chop - return + + flash[:error] = err_message.chop + @body = "login single-col" + session[:verified_identity_url] = identity_url + render :partial => "shared/personal_details.html.erb", :object => @person, :layout => 'application' + elsif global_prefs.email_verifications? + @person.email_verifications.create + flash[:notice] = %(Thanks for signing up! Check your email + to activate your account.) + redirect_to(home_url) + else + successful_login("Thanks for signing up!") end + + return + end # if new record + + if @person.deactivated? + flash[:error] = "Your account has been deactivated" + redirect_to home_url and return end - self.current_person = @person + successful_login - else - failed_login result.message end end end @@ -50,13 +66,14 @@ class SessionsController < ApplicationController render :action => 'new' end - def successful_login + def successful_login(message = "Logged in successfully") + self.current_person = @person if params[:remember_me] == "1" self.current_person.remember_me cookies[:auth_token] = { :value => self.current_person.remember_token , :expires => self.current_person.remember_token_expires_at } end redirect_back_or_default('/') - flash[:notice] = "Logged in successfully" + flash[:notice] = message end def password_authentication(login, password) app/controllers/sessions_controller.rb @@ -101,6 +101,7 @@ class Person < ActiveRecord::Base :with => EMAIL_REGEX, :message => "must be a valid email address" validates_uniqueness_of :email + validates_uniqueness_of :identity_url, :allow_nil => true before_create :create_blog before_save :encrypt_password @@ -391,7 +392,6 @@ class Person < ActiveRecord::Base end def log_activity_description_changed - debugger unless @old_description == description or description.blank? add_activities(:item => self, :person => self) end app/models/person.rb @@ -77,6 +77,6 @@ <div><%= render :partial => 'shared/debug' %></div> <%- end -%> </div> - <%= global_prefs.analytics %> + <%= global_prefs.analytics %> </body> </html> app/views/layouts/application.html.erb 7d06a62e163ec11b832445b9f1946a6256da3c86 Tom Brown herestomwiththeweather@gmail.com http://github.com/herestomwiththeweather/insoshi/commit/1652833b0b0246832cd4da27573242f73a73ae17 1652833b0b0246832cd4da27573242f73a73ae17 2008-09-10T01:18:56-07:00 2008-09-10T01:18:56-07:00 allow openid registration to recover from validation errors from simple registration info 92d0c9e070247b958ed0ead33ef71a21f4d339ee Tom Brown herestomwiththeweather@gmail.com