if request.xhr?
render :partial => "terms"
- elsif using_open_id?
- # The redirect from the OpenID provider reenters here
- # again and we need to pass the parameters through to
- # the open_id_authentication function
- @user = session.delete(:new_user)
-
- openid_verify(nil, @user) do |user,verified_email|
- user.status = "active" if user.email == verified_email
- end
-
- if @user.openid_url.nil? or @user.invalid?
- render :action => 'new'
- else
- session[:new_user] = @user
- render :action => 'terms'
- end
- elsif params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last)
- render :action => 'blocked'
else
- session[:referer] = params[:referer]
-
@title = t 'user.terms.title'
- @user = User.new(params[:user]) if params[:user]
-
- if params[:user] and params[:user][:openid_url] and @user.pass_crypt.empty?
- # We are creating an account with OpenID and no password
- # was specified so create a random one
- @user.pass_crypt = SecureRandom.base64(16)
- @user.pass_crypt_confirmation = @user.pass_crypt
- end
-
- if @user
- @user.status = "pending"
+ @user ||= session[:new_user]
- if @user.invalid?
- if @user.new_record?
- # Something is wrong with a new user, so rerender the form
- render :action => :new
- else
- # Error in existing user, so go to account settings
- flash[:errors] = @user.errors
- redirect_to :action => :account, :display_name => @user.display_name
- end
- elsif @user.terms_agreed?
- # Already agreed to terms, so just show settings
- redirect_to :action => :account, :display_name => @user.display_name
- elsif params[:user] and params[:user][:openid_url] and not params[:user][:openid_url].empty?
- # Verify OpenID before moving on
- session[:new_user] = @user
- openid_verify(params[:user][:openid_url], @user)
- elsif @user.new_record?
- # Save the user record
- session[:new_user] = @user
- end
- else
- # Not logged in, so redirect to the login page
+ if !@user
redirect_to :action => :login, :referer => request.fullpath
+ elsif @user.terms_agreed?
+ # Already agreed to terms, so just show settings
+ redirect_to :action => :account, :display_name => @user.display_name
end
end
end
@title = t 'user.new.title'
@referer = params[:referer] || session[:referer]
- if @user
+ if using_open_id?
+ # The redirect from the OpenID provider reenters here
+ # again and we need to pass the parameters through to
+ # the open_id_authentication function
+ @user = session.delete(:new_user)
+
+ openid_verify(nil, @user) do |user, verified_email|
+ user.status = "active" if user.email == verified_email
+ end
+
+ if @user.openid_url.nil? or @user.invalid?
+ render :action => 'new'
+ else
+ session[:new_user] = @user
+ redirect_to :action => 'terms'
+ end
+ elsif @user
# The user is logged in already, so don't show them the signup
# page, instead send them to the home page
if @referer
end
end
+ def create
+ if params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last)
+ render :action => 'blocked'
+
+ else
+ session[:referer] = params[:referer]
+
+ @user = User.new(params[:user])
+ @user.status = "pending"
+
+ if @user.openid_url.present? && @user.pass_crypt.empty?
+ # We are creating an account with OpenID and no password
+ # was specified so create a random one
+ @user.pass_crypt = SecureRandom.base64(16)
+ @user.pass_crypt_confirmation = @user.pass_crypt
+ end
+
+ if @user.invalid?
+ # Something is wrong with a new user, so rerender the form
+ render :action => "new"
+ elsif @user.openid_url.present?
+ # Verify OpenID before moving on
+ session[:new_user] = @user
+ openid_verify(@user.openid_url, @user)
+ else
+ # Save the user record
+ session[:new_user] = @user
+ redirect_to :action => :terms
+ end
+ end
+ end
+
def login
if params[:username] or using_open_id?
session[:remember_me] ||= params[:remember_me]
<%= error_messages_for 'user' %>
-<%= form_for :user, :url => { :action => 'terms' } do %>
+<%= form_for :user, :url => { :action => 'create' } do %>
<%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
<div id="signupForm" class="standard-form">
match '/key' => 'site#key', :via => :get
match '/id' => 'site#id', :via => :get
match '/user/new' => 'user#new', :via => :get
- match '/user/terms' => 'user#terms', :via => [:get, :post]
+ match '/user/new' => 'user#create', :via => :post
+ match '/user/terms' => 'user#terms', :via => :get
match '/user/save' => 'user#save', :via => :post
match '/user/:display_name/confirm/resend' => 'user#confirm_resend', :via => :get
match '/user/:display_name/confirm' => 'user#confirm', :via => [:get, :post]
)
assert_routing(
- { :path => "/user/terms", :method => :get },
- { :controller => "user", :action => "terms" }
+ { :path => "/user/new", :method => :post },
+ { :controller => "user", :action => "create" }
)
+
assert_routing(
- { :path => "/user/terms", :method => :post },
+ { :path => "/user/terms", :method => :get },
{ :controller => "user", :action => "terms" }
)
end
assert_select "body", :count => 1 do
assert_select "div#content", :count => 1 do
- assert_select "form[action='/user/terms'][method=post]", :count => 1 do
+ assert_select "form[action='/user/new'][method=post]", :count => 1 do
assert_select "input[id=user_email]", :count => 1
assert_select "input[id=user_email_confirmation]", :count => 1
assert_select "input[id=user_display_name]", :count => 1
assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
end
+ def test_user_terms_new_user
+ get :terms, {}, { "new_user" => User.new }
+ assert_response :success
+ assert_template :terms
+ end
+
+ def test_user_terms_seen
+ user = users(:normal_user)
+
+ # Set the username cookie
+ @request.cookies["_osm_username"] = user.display_name
+
+ get :terms, {}, { "user" => user }
+ assert_response :redirect
+ assert_redirected_to :action => :account, :display_name => user.display_name
+ end
+
def test_user_lost_password
# Test fetching the lost password page
get :lost_password
display_name = "#{localer.to_s}_new_tester"
assert_difference('User.count', 0) do
assert_difference('ActionMailer::Base.deliveries.size', 0) do
- post '/user/terms',
+ post '/user/new',
{:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
{"HTTP_ACCEPT_LANGUAGE" => localer.to_s}
end
email = "#{locale.to_s}_new_tester"
assert_difference('User.count', 0) do
assert_difference('ActionMailer::Base.deliveries.size', 0) do
- post '/user/terms',
+ post '/user/new',
{:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
{"HTTP_ACCEPT_LANGUAGE" => locale.to_s}
end
assert_difference('User.count', 0) do
assert_difference('ActionMailer::Base.deliveries.size', 0) do
- post "/user/terms",
+ post "/user/new",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}
end
end
- assert_response :success
- assert_template 'user/terms'
+ assert_redirected_to "/user/terms"
assert_difference('User.count') do
assert_difference('ActionMailer::Base.deliveries.size', 1) do
referer = "/traces/mine"
assert_difference('User.count') do
assert_difference('ActionMailer::Base.deliveries.size', 1) do
- post "/user/terms",
+ post "/user/new",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password}, :referer => referer }
- assert_response :success
- assert_template 'terms'
+ assert_redirected_to "/user/terms"
post_via_redirect "/user/save",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password} }
end
password = "testtest"
assert_difference('User.count') do
assert_difference('ActionMailer::Base.deliveries.size', 1) do
- post "/user/terms",
+ post "/user/new",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
assert_response :redirect
res = openid_request(@response.redirect_url)
- post '/user/terms', res
- assert_response :success
- assert_template 'terms'
+ get "/user/new", res
+ assert_redirected_to "/user/terms"
post '/user/save',
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => password, :pass_crypt_confirmation => password}}
assert_response :redirect
password = "testtest2"
assert_difference('User.count',0) do
assert_difference('ActionMailer::Base.deliveries.size',0) do
- post "/user/terms",
+ post "/user/new",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.failure=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
assert_response :redirect
res = openid_request(@response.redirect_url)
- post '/user/terms', res
+ get '/user/new', res
assert_response :success
assert_template 'user/new'
end
referer = "/traces/mine"
assert_difference('User.count') do
assert_difference('ActionMailer::Base.deliveries.size', 1) do
- post "/user/terms",
+ post "/user/new",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}, :referer => referer }
- assert_response :redirect
+ assert_response :redirect
res = openid_request(@response.location)
- post '/user/terms', res
- assert_response :success
- assert_template 'terms'
+ get "/user/new", res
+ assert_redirected_to "/user/terms"
post_via_redirect "/user/save",
{:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} }
end
projects / rails.git / commitdiff