codenotifier - Redmine: revision 915

Project: Redmine

Revision: 915

Author: jplang

Date: 18 Nov 2007 20:46:55

Changes:

There's now 3 account activation strategies (available in application settings):
* activation by email: the user receives an email containing a link to active his account
* manual activation: an email is sent to administrators for account approval (default)
* automatic activation: the user can log in as soon as he has registered

Files:
modified: /trunk/lang/it.yml (try)
modified: /trunk/test/integration/account_test.rb (try)
modified: /trunk/lang/ro.yml (try)
modified: /trunk/lang/zh.yml (try)
modified: /trunk/lang/pt.yml (try)
modified: /trunk/lang/sr.yml (try)
modified: /trunk/lang/pt-br.yml (try)
modified: /trunk/config/settings.yml (try)
modified: /trunk/lang/ru.yml (try)
modified: /trunk/lang/sv.yml (try)
modified: /trunk/lang/bg.yml (try)
modified: /trunk/lang/de.yml (try)
modified: /trunk/lang/ja.yml (try)
modified: /trunk/lang/he.yml (try)
modified: /trunk/app/models/mailer.rb (try)
modified: /trunk/app/views/account/register.rhtml (try)
modified: /trunk/lang/en.yml (try)
added: /trunk/app/views/mailer/account_activation_request.text.plain.rhtml (try)
modified: /trunk/lang/cs.yml (try)
added: /trunk/app/views/mailer/account_activation_request.text.html.rhtml (try)
modified: /trunk/app/views/settings/edit.rhtml (try)
modified: /trunk/app/controllers/account_controller.rb (try)
modified: /trunk/lang/fr.yml (try)
modified: /trunk/lang/es.yml (try)
modified: /trunk/lang/ko.yml (try)
modified: /trunk/lang/nl.yml (try)
modified: /trunk/lang/pl.yml (try)

Diff:

/trunk/config/settings.yml

...... @@ -28,7 +28,7 @@
28 28 login_required:

29 29 default: 0

30 30 self_registration:

31 default: 1

31 default: '2'

32 32 lost_password:

33 33 default: 1

34 34 attachment_max_size:

/trunk/app/views/mailer/account_activation_request.text.plain.rhtml

...... @@ -0,0 +1,2 @@

1 <%= l(:mail_body_account_activation_request, @user.login) %>

2 <%= @url %>

/trunk/lang/cs.yml

/trunk/app/views/mailer/account_activation_request.text.html.rhtml

...... @@ -0,0 +1,2 @@

1 <p><%= l(:mail_body_account_activation_request, @user.login) %></p>

2 <p><%= link_to @url, @url %></p>

......	@@ -538,3 +538,9 @@
538	538	setting_protocol: Protocol
539	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	540	setting_time_format: Time format
	541	label_registration_activation_by_email: account activation by email
	542	mail_subject_account_activation_request: Redmine account activation request
	543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
	544	label_registration_automatic_activation: automatic account activation
	545	label_registration_manual_activation: manual account activation
	546	notice_account_pending: "Your account was created and is now pending administrator approval."

......	@@ -56,5 +56,46 @@
56	56
57	57	log_user('jsmith', 'newpass')
58	58	assert_equal 0, Token.count
59		end
	59	end
	60
	61	def test_register_with_automatic_activation
	62	Setting.self_registration = '3'
	63
	64	get 'account/register'
	65	assert_response :success
	66	assert_template 'account/register'
	67
	68	post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
	69	:password => "newpass", :password_confirmation => "newpass"
	70	assert_redirected_to 'account/login'
	71	log_user('newuser', 'newpass')
	72	end
	73
	74	def test_register_with_manual_activation
	75	Setting.self_registration = '2'
	76
	77	post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
	78	:password => "newpass", :password_confirmation => "newpass"
	79	assert_redirected_to 'account/login'
	80	assert !User.find_by_login('newuser').active?
	81	end
	82
	83	def test_register_with_email_activation
	84	Setting.self_registration = '1'
	85	Token.delete_all
	86
	87	post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
	88	:password => "newpass", :password_confirmation => "newpass"
	89	assert_redirected_to 'account/login'
	90	assert !User.find_by_login('newuser').active?
	91
	92	token = Token.find(:first)
	93	assert_equal 'register', token.action
	94	assert_equal 'newuser@foo.bar', token.user.mail
	95	assert !token.expired?
	96
	97	get 'account/activate', :token => token.value
	98	assert_redirected_to 'account/login'
	99	log_user('newuser', 'newpass')
	100	end
60	101	end

......	@@ -538,3 +538,9 @@
538	538	setting_protocol: Protocol
539	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	540	setting_time_format: Time format
	541	label_registration_activation_by_email: account activation by email
	542	mail_subject_account_activation_request: Redmine account activation request
	543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
	544	label_registration_automatic_activation: automatic account activation
	545	label_registration_manual_activation: manual account activation
	546	notice_account_pending: "Your account was created and is now pending administrator approval."

......	@@ -541,3 +541,9 @@
541	541	setting_protocol: Protocol
542	542	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
543	543	setting_time_format: Time format
	544	label_registration_activation_by_email: account activation by email
	545	mail_subject_account_activation_request: Redmine account activation request
	546	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
	547	label_registration_automatic_activation: automatic account activation
	548	label_registration_manual_activation: manual account activation
	549	notice_account_pending: "Your account was created and is now pending administrator approval."

......	@@ -538,3 +538,9 @@
538	538	setting_protocol: Protocol
539	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	540	setting_time_format: Time format
	541	label_registration_activation_by_email: account activation by email
	542	mail_subject_account_activation_request: Redmine account activation request
	543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
	544	label_registration_automatic_activation: automatic account activation
	545	label_registration_manual_activation: manual account activation
	546	notice_account_pending: "Your account was created and is now pending administrator approval."

......	@@ -539,3 +539,9 @@
539	539	setting_protocol: Protocol
540	540	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
541	541	setting_time_format: Time format
	542	label_registration_activation_by_email: account activation by email
	543	mail_subject_account_activation_request: Redmine account activation request
	544	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
	545	label_registration_automatic_activation: automatic account activation
	546	label_registration_manual_activation: manual account activation
	547	notice_account_pending: "Your account was created and is now pending administrator approval."

......	@@ -28,7 +28,7 @@
28	28	login_required:
29	29	default: 0
30	30	self_registration:
31		default: 1
	31	default: '2'
32	32	lost_password:
33	33	default: 1
34	34	attachment_max_size:

......	@@ -538,3 +538,9 @@
538	538	enumeration_issue_priorities: Приоритеты задач
539	539	enumeration_doc_categories: Категории документов
540	540	enumeration_activities: Действия (учет времени)
	541	label_registration_activation_by_email: account activation by email
	542	mail_subject_account_activation_request: Redmine account activation request
	543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
	544	label_registration_automatic_activation: automatic account activation
	545	label_registration_manual_activation: manual account activation
	546	notice_account_pending: "Your account was created and is now pending administrator approval."

......	@@ -88,6 +88,14 @@
88	88	:password => password,
89	89	:login_url => url_for(:controller => 'account', :action => 'login')
90	90	end
	91
	92	def account_activation_request(user)
	93	# Send the email to all active administrators
	94	recipients User.find_active(:all, :conditions => {:admin => true}).collect { \|u\| u.mail }.compact
	95	subject l(:mail_subject_account_activation_request)
	96	body :user => user,
	97	:url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
	98	end
91	99
92	100	def lost_password(token)
93	101	set_language_if_valid(token.user.language)
......	@@ -102,7 +110,7 @@
102	110	recipients token.user.mail
103	111	subject l(:mail_subject_register)
104	112	body :token => token,
105		:url => url_for(:controller => 'account', :action => 'register', :token => token.value)
	113	:url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
106	114	end
107	115
108	116	def test(user)

......	@@ -29,9 +29,6 @@
29	29	<% for @custom_value in @custom_values %>
30	30	<p><%= custom_field_tag_with_label @custom_value %></p>
31	31	<% end %>
32
33		<p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
34		<%= check_box 'user', 'mail_notification' %></p>
35	32	<!--[eoform:user]-->
36	33	</div>
37	34

......	@@ -75,6 +75,7 @@
75	75	notice_feeds_access_key_reseted: Your RSS access key was reseted.
76	76	notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
77	77	notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
	78	notice_account_pending: "Your account was created and is now pending administrator approval."
78	79
79	80	mail_subject_lost_password: Your Redmine password
80	81	mail_body_lost_password: 'To change your Redmine password, click on the following link:'
......	@@ -82,6 +83,8 @@
82	83	mail_body_register: 'To activate your Redmine account, click on the following link:'
83	84	mail_body_account_information_external: You can use your "%s" account to log into Redmine.
84	85	mail_body_account_information: Your Redmine account information
	86	mail_subject_account_activation_request: Redmine account activation request
	87	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
85	88
86	89	gui_validation_error: 1 error
87	90	gui_validation_error_plural: %d errors
......	@@ -171,8 +174,8 @@
171	174	setting_app_subtitle: Application subtitle
172	175	setting_welcome_text: Welcome text
173	176	setting_default_language: Default language
174		setting_login_required: Authent. required
175		setting_self_registration: Self-registration enabled
	177	setting_login_required: Authentication required
	178	setting_self_registration: Self-registration
176	179	setting_attachment_max_size: Attachment max. size
177	180	setting_issues_export_limit: Issues export limit
178	181	setting_mail_from: Emission email address
......	@@ -446,6 +449,9 @@
446	449	label_user_mail_option_selected: "For any event on the selected projects only..."
447	450	label_user_mail_option_none: "Only for things I watch or I'm involved in"
448	451	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
	452	label_registration_activation_by_email: account activation by email
	453	label_registration_manual_activation: manual account activation
	454	label_registration_automatic_activation: automatic account activation
449	455
450	456	button_login: Login
451	457	button_submit: Submit

......	@@ -0,0 +1,2 @@
	1	<%= l(:mail_body_account_activation_request, @user.login) %>
	2	<%= @url %>

......	@@ -0,0 +1,2 @@
	1	<p><%= l(:mail_body_account_activation_request, @user.login) %></p>
	2	<p><%= link_to @url, @url %></p>

......	@@ -78,7 +78,12 @@
78	78	<%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{\|days\| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
79	79
80	80	<p><label><%= l(:setting_self_registration) %></label>
81		<%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
	81	<%= select_tag 'settings[self_registration]',
	82	options_for_select( [[l(:label_disabled), "0"],
	83	[l(:label_registration_activation_by_email), "1"],
	84	[l(:label_registration_manual_activation), "2"],
	85	[l(:label_registration_automatic_activation), "3"]
	86	], Setting.self_registration ) %></p>
82	87
83	88	<p><label><%= l(:label_password_lost) %></label>
84	89	<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>

......	@@ -21,7 +21,7 @@
21	21	include CustomFieldsHelper
22	22
23	23	# prevents login action to be filtered by check_if_login_required application scope filter
24		skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
	24	skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
25	25
26	26	# Show user's account
27	27	def show
......	@@ -106,40 +106,62 @@
106	106	# User self-registration
107	107	def register
108	108	redirect_to(home_url) && return unless Setting.self_registration?
109		if params[:token]
110		token = Token.find_by_action_and_value("register", params[:token])
111		redirect_to(home_url) && return unless token and !token.expired?
112		user = token.user
113		redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
114		user.status = User::STATUS_ACTIVE
115		if user.save
116		token.destroy
117		flash[:notice] = l(:notice_account_activated)
118		redirect_to :action => 'login'
119		return
120		end
	109	if request.get?
	110	@user = User.new(:language => Setting.default_language)
	111	@custom_values = UserCustomField.find(:all).collect { \|x\| CustomValue.new(:custom_field => x, :customized => @user) }
121	112	else
122		if request.get?
123		@user = User.new(:language => Setting.default_language)
124		@custom_values = UserCustomField.find(:all).collect { \|x\| CustomValue.new(:custom_field => x, :customized => @user) }
125		else
126		@user = User.new(params[:user])
127		@user.admin = false
128		@user.login = params[:user][:login]
129		@user.status = User::STATUS_REGISTERED
130		@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
	113	@user = User.new(params[:user])
	114	@user.admin = false
	115	@user.login = params[:user][:login]
	116	@user.status = User::STATUS_REGISTERED
	117	@user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
	118	if params["custom_fields"]
131	119	@custom_values = UserCustomField.find(:all).collect { \|x\| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
132	120	@user.custom_values = @custom_values
	121	end
	122	case Setting.self_registration
	123	when '1'
	124	# Email activation
133	125	token = Token.new(:user => @user, :action => "register")
134	126	if @user.save and token.save
135	127	Mailer.deliver_register(token)
136	128	flash[:notice] = l(:notice_account_register_done)
137		redirect_to :controller => 'account', :action => 'login'
	129	redirect_to :action => 'login'
	130	end
	131	when '3'
	132	# Automatic activation
	133	@user.status = User::STATUS_ACTIVE
	134	if @user.save
	135	flash[:notice] = l(:notice_account_activated)
	136	redirect_to :action => 'login'
	137	end
	138	else
	139	# Manual activation by the administrator
	140	if @user.save
	141	# Sends an email to the administrators
	142	Mailer.deliver_account_activation_request(@user)
	143	flash[:notice] = l(:notice_account_pending)
	144	redirect_to :action => 'login'
138	145	end
139	146	end
140	147	end
141	148	end
142	149
	150	# Token based account activation
	151	def activate
	152	redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
	153	token = Token.find_by_action_and_value('register', params[:token])
	154	redirect_to(home_url) && return unless token and !token.expired?
	155	user = token.user
	156	redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
	157	user.status = User::STATUS_ACTIVE
	158	if user.save
	159	token.destroy
	160	flash[:notice] = l(:notice_account_activated)
	161	end
	162	redirect_to :action => 'login'
	163	end
	164
143	165	private
144	166	def logged_user=(user)
145	167	if user && user.is_a?(User)

......	@@ -75,6 +75,7 @@
75	75	notice_feeds_access_key_reseted: Votre clé d'accès aux flux RSS a été réinitialisée.
76	76	notice_failed_to_save_issues: "%d demande(s) sur les %d sélectionnées n'ont pas pu être mise(s) à jour: %s."
77	77	notice_no_issue_selected: "Aucune demande sélectionnée ! Cochez les demandes que vous voulez mettre à jour."
	78	notice_account_pending: "Votre compte a été créé et attend l'approbation de l'administrateur."
78	79
79	80	mail_subject_lost_password: Votre mot de passe redMine
80	81	mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
......	@@ -82,6 +83,8 @@
82	83	mail_body_register: 'Pour activer votre compte Redmine, cliquez sur le lien suivant:'
83	84	mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter à Redmine.
84	85	mail_body_account_information: Paramètres de connexion de votre compte Redmine
	86	mail_subject_account_activation_request: "Demande d'activation d'un compte Redmine"
	87	mail_body_account_activation_request: "Un nouvel utilisateur (%s) s'est inscrit. Son compte nécessite votre approbation:"
85	88
86	89	gui_validation_error: 1 erreur
87	90	gui_validation_error_plural: %d erreurs
......	@@ -171,8 +174,8 @@
171	174	setting_app_subtitle: Sous-titre de l'application
172	175	setting_welcome_text: Texte d'accueil
173	176	setting_default_language: Langue par défaut
174		setting_login_required: Authentif. obligatoire
175		setting_self_registration: Enregistrement autorisé
	177	setting_login_required: Authentification obligatoire
	178	setting_self_registration: Inscription des nouveaux utilisateurs
176	179	setting_attachment_max_size: Taille max des fichiers
177	180	setting_issues_export_limit: Limite export demandes
178	181	setting_mail_from: Adresse d'émission
......	@@ -446,6 +449,9 @@
446	449	label_user_mail_option_selected: "Pour tous les événements des projets sélectionnés..."
447	450	label_user_mail_option_none: "Seulement pour ce que je surveille ou à quoi je participe"
448	451	label_user_mail_no_self_notified: "Je ne veux pas être notifié des changements que j'effectue"
	452	label_registration_activation_by_email: activation du compte par email
	453	label_registration_manual_activation: activation manuelle du compte
	454	label_registration_automatic_activation: activation automatique du compte
449	455
450	456	button_login: Connexion
451	457	button_submit: Soumettre

......	@@ -170,7 +170,7 @@
170	170	setting_welcome_text: Welcome text
171	171	setting_default_language: Default language
172	172	setting_login_required: Authent. required
173		setting_self_registration: Self-registration enabled
	173	setting_self_registration: Self-registration
174	174	setting_attachment_max_size: Attachment max. size
175	175	setting_issues_export_limit: Issues export limit
176	176	setting_mail_from: Emission mail address
......	@@ -538,3 +538,9 @@
538	538	mail_body_account_information: Your Redmine account information
539	539	label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
540	540	setting_time_format: Time format
	541	label_registration_activation_by_email: account activation by email
	542	mail_subject_account_activation_request: Redmine account activation request
	543	mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
	544	label_registration_automatic_activation: automatic account activation
	545	label_registration_manual_activation: manual account activation
	546	notice_account_pending: "Your account was created and is now pending administrator approval."