Updated OpenID related issues

app/controllers/profiles_controller.rb

@@ -2,8 +2,6 @@ class ProfilesController < ApplicationController
   before_filter :find_profile
   before_filter :check_owner_access, :only => [:edit, :update]
 
-  require_role :user, :only => [:edit, :update]
-
   def show
     # render show.html.erb
   end

app/controllers/sessions_controller.rb

@@ -23,7 +23,7 @@ def destroy
   end
 
   def open_id_authentication
-    authenticate_with_open_id do |result, identity_url|
+    authenticate_with_open_id(params[:openid_url], :required => [:nickname, :email]) do |result, identity_url|
       if result.successful? && self.current_user = User.find_by_identity_url(identity_url)
         successful_login
       else
@@ -50,6 +50,20 @@ def password_authentication
   end
 
   def successful_login
+    # It's possible to use OpenID only, in which
+    # case the following would update a user's email and nickname
+    # on login. 
+    #
+    # This may give conflicts when used in combination with regular
+    # user accounts.
+    #
+    # TODO: Add a configuration option to disable regular accounts.
+    #
+    # current_user.update_attributes(
+    #   :login => "#{params[:openid.sreg.nickname]}",
+    #   :email => "#{params[:openid.sreg.email]}"
+    # )
+
     new_cookie_flag = (params[:remember_me] == "1")
     handle_remember_cookie! new_cookie_flag
     redirect_back_or_default(root_path)

app/views/profiles/edit.html.erb

@@ -10,6 +10,12 @@
 	<% end -%>
 
 	<%= render :partial => 'profiles/my_account' if current_user == @user %>
+
+	<% unless @profile.user.not_using_openid? %>
+	<p>
+		This is your <%= configatron.site_name %> profile. It's not related to your OpenID Identity.
+	</p>
+	<% end %>
 	
 	<% form_for :profile, @profile, :url => profile_url(@profile.user), :html => {:method => :put} do |f| %>