jro_apps/redmine Commit - r2381:896e64b759ae

Added the ability to login via OpenID....

Eric Davis -

r2381:896e64b759ae

parent child

Context file:

r2381:896e64b759ae

Collapse all files

public/images/openid-bg.gif created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

app/controllers/account_controller.rb +58 -17

@@ -46,24 +46,10 class AccountController < ApplicationController
46	self.logged_user = nil	46	self.logged_user = nil
47	else	47	else
48	# Authenticate user	48	# Authenticate user
49	user = User.try_to_login(params[:username], params[:password])	49	unless using_open_id?
50	if user.nil?	50	password_authentication
51	# Invalid credentials
52	flash.now[:error] = l(:notice_account_invalid_creditentials)
53	elsif user.new_record?
54	# Onthefly creation failed, display the registration form to fill/fix attributes
55	@user = user
56	session[:auth_source_registration] = {:login => user.login, :auth_source_id => user.auth_source_id }
57	render :action => 'register'
58	else	51	else
59	# Valid user	52	open_id_authenticate(params[:openid_url])
60	self.logged_user = user
61	# generate a key and set cookie if autologin
62	if params[:autologin] && Setting.autologin?
63	token = Token.create(:user => user, :action => 'autologin')
64	cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
65	end
66	redirect_back_or_default :controller => 'my', :action => 'page'
67	end	53	end
68	end	54	end
69	end	55	end
@@ -191,4 +177,59 private
191	session[:user_id] = nil	177	session[:user_id] = nil
192	end	178	end
193	end	179	end
		180
		181	def password_authentication
		182	user = User.try_to_login(params[:username], params[:password])
		183	if user.nil?
		184	# Invalid credentials
		185	flash.now[:error] = l(:notice_account_invalid_creditentials)
		186	elsif user.new_record?
		187	# Onthefly creation failed, display the registration form to fill/fix attributes
		188	@user = user
		189	session[:auth_source_registration] = {:login => user.login, :auth_source_id => user.auth_source_id }
		190	render :action => 'register'
		191	else
		192	# Valid user
		193	successful_authentication(user)
		194	end
		195	end
		196
		197
		198	def open_id_authenticate(openid_url)
		199	user = nil
		200	authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url) do \|result, identity_url, registration\|
		201	if result.successful?
		202	user = User.find_or_initialize_by_identity_url(identity_url)
		203	if user.new_record?
		204	# Create on the fly
		205	# TODO: name
		206	user.login = registration['nickname']
		207	user.mail = registration['email']
		208	user.save
		209	end
		210
		211	user.reload
		212	if user.new_record?
		213	# Onthefly creation failed, display the registration form to fill/fix attributes
		214	@user = user
		215	session[:auth_source_registration] = {:login => user.login, :identity_url => identity_url }
		216	render :action => 'register'
		217	else
		218	successful_authentication(user)
		219	end
		220	end
		221	end
		222	end
		223
		224	def successful_authentication(user)
		225	# Valid user
		226	self.logged_user = user
		227	# generate a key and set cookie if autologin
		228	if params[:autologin] && Setting.autologin?
		229	token = Token.create(:user => user, :action => 'autologin')
		230	cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
		231	end
		232	redirect_back_or_default :controller => 'my', :action => 'page'
		233	end
		234
194	end	235	end

app/views/account/login.rhtml +4 0

                 <td align="left"><%= password_field_tag 'password', nil, :size => 40 %></td>
             </tr>
             <tr>
+              <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
+              <td align="left"><%= text_field_tag "openid_url" %></td>
+            </tr>
+            <tr>
                 <td></td>
                 <td align="left">
                     <% if Setting.autologin? %>

app/views/account/register.rhtml +4 -1

-            <h2><%=l(:label_register)%></h2>
+            <h2><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url %></h2>
             <% form_tag({:action => 'register'}, :class => "tabular") do %>
             <%= error_messages_for 'user' %>
             <p><label for="user_language"><%=l(:field_language)%></label>
             <%= select("user", "language", lang_options_for_select) %></p>
+            <p><label for="user_identity_url"><%=l(:field_identity_url)%></label>
+            <%= text_field 'user', 'identity_url'  %></p>
             <% @user.custom_field_values.select {|v| v.editable? || v.required?}.each do |value| %>
             	<p><%= custom_field_tag_with_label :user, value %></p>
             <% end %>

app/views/my/account.rhtml +1 0

             <p><%= f.text_field :lastname, :required => true %></p>
             <p><%= f.text_field :mail, :required => true %></p>
             <p><%= f.select :language, lang_options_for_select %></p>
+            <p><%= f.text_field :identity_url  %></p>
             <% @user.custom_field_values.select(&:editable?).each do |value| %>
             	<p><%= custom_field_tag_with_label :user, value %></p>

app/views/users/_form.rhtml +1 0

             <p><%= f.text_field :lastname, :required => true %></p>
             <p><%= f.text_field :mail, :required => true %></p>
             <p><%= f.select :language, lang_options_for_select %></p>
+            <p><%= f.text_field :identity_url  %></p>
             <% @user.custom_field_values.each do |value| %>
             	<p><%= custom_field_tag_with_label :user, value %></p>

config/routes.rb +2 0

               # Install the default route as the lowest priority.
               map.connect ':controller/:action/:id'
               map.connect 'robots.txt', :controller => 'welcome', :action => 'robots'
+              # Used for OpenID
+              map.root :controller => 'account', :action => 'login'
             end

lang/en.yml +2 0

             field_admin: Administrator
             field_last_login_on: Last connection
             field_language: Language
+            field_identity_url: OpenID URL
             field_effective_date: Date
             field_password: Password
             field_new_password: New password
             label_information_plural: Information
             label_please_login: Please log in
             label_register: Register
+            label_login_with_open_id_option: or login with OpenID
             label_password_lost: Lost password
             label_home: Home
             label_my_page: My page

public/stylesheets/application.css +2 0

             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
+            input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages