cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added referer URL in user_token so that redirections (e.g: from oauth token requests) are followed after the user has confirmed the sign-up. Added test for the same.

Browse source
This commit is contained in:
Matt Amos 2009-08-25 15:00:32 +00:00
parent b108476b9e
commit b34b898451
5 changed files with 58 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/user_controller.rb
View file

@ -29,7 +29,7 @@ class UserController < ApplicationController
if @user.save
flash[:notice] = t 'user.new.flash create success message'
Notifier.deliver_signup_confirm(@user, @user.tokens.create)
Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
redirect_to :action => 'login'
else
render :action => 'new'
@ -198,10 +198,15 @@ class UserController < ApplicationController
@user.active = true
@user.email_valid = true
@user.save!
referer = token.referer
token.destroy
flash[:notice] = t 'user.confirm.success'
session[:user] = @user.id
redirect_to :action => 'account', :display_name => @user.display_name
unless referer.nil?
redirect_to referer
else
redirect_to :action => 'account', :display_name => @user.display_name
end
else
@notice = t 'user.confirm.failure'
end