@@ -90,7 +90,7 @@ class UsersController < ApplicationController authenticate_with_open_id(params[:open_id_url], :return_to => open_id_create_url, :required => [:nickname, :email]) do |result, identity_url, registration| if result.successful? - create_new_user(:identity_url => identity_url, :login => registration['nickname'], :email => registration['email']) + create_new_user(:identity_url => identity_url, :login => identity_url, :email => registration['email']) else failed_creation(result.message || "Sorry, something went wrong") end app/controllers/users_controller.rb @@ -97,46 +97,5 @@ protected # Give the user a profile self.profile = Profile.create end - -# -------- - - # Virtual attribute for the unencrypted password - # attr_accessor :password - - # Per page pagination - # TODO: Replace with searchgasm - # cattr_reader :per_page - # @@per_page = 25 - - - - - # Encrypts some data with the salt. - # def self.encrypt(password, salt) - # Digest::SHA1.hexdigest("--#{salt}--#{password}--") - # end - - - - - - # before filter - # def encrypt_password - # return if password.blank? - # self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record? - # self.crypted_password = encrypt(password) - # end - - - - # def do_delete - # self.deleted_at = Time.now.utc - # end - # - # def do_activate - # self.activated_at = Time.now.utc - # self.deleted_at = self.activation_code = nil - # end - end app/models/user.rb @@ -1,4 +1,4 @@ -<% @user.password = @user.password_confirmation = nil %> +<% (@user.password = @user.password_confirmation = nil) rescue nil %> <% content_for :header do -%> Create a new <%= configatron.site_name %> account app/views/users/new.rhtml 3fac4e01db394cc436a29306758d272e9df35338 Ariejan de Vroom ariejan@ariejan.net http://github.com/ariejan/baseapp/commit/89422374684f30d6be6031ce5c8be0fe24f9a6f7 89422374684f30d6be6031ce5c8be0fe24f9a6f7 2008-12-22T05:44:23-08:00 2008-12-22T05:44:23-08:00 Fixed OpenID login and signup 0d9dcc34da279dbc8d0ea4c11914d22f6d635876 Ariejan de Vroom ariejan@ariejan.net