@user.terms_seen = true
if @user.save
- flash[:notice] = t "user.new.terms declined", :url => t("user.new.terms declined url")
+ flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
end
if params[:referer]
@user.terms_agreed = Time.now.getutc
@user.terms_seen = true
- if @user.auth_uid.nil? || @user.auth_uid.empty?
+ if @user.auth_uid.blank?
@user.auth_provider = nil
@user.auth_uid = nil
end
session[:new_user_settings] = params
redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
end
+ elsif errors = session.delete(:user_errors)
+ errors.each do |attribute, error|
+ @user.errors.add(attribute, error)
+ end
end
end
@user.data_public = true
@user.save
flash[:notice] = t "user.go_public.flash success"
- redirect_to :controller => "user", :action => "account", :display_name => @user.display_name
+ redirect_to :action => "account", :display_name => @user.display_name
end
def lost_password
@title = t "user.lost_password.title"
if params[:user] && params[:user][:email]
- user = User.visible.find_by_email(params[:user][:email])
+ user = User.visible.find_by(:email => params[:user][:email])
if user.nil?
users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
@title = t "user.reset_password.title"
if params[:token]
- token = UserToken.find_by_token(params[:token])
+ token = UserToken.find_by(:token => params[:token])
if token
@user = token.user
if @user.save
token.destroy
flash[:notice] = t "user.reset_password.flash changed"
- redirect_to :action => "login"
+ successful_login(@user)
end
end
else
redirect_to :action => "lost_password"
end
else
- render :text => "", :status => :bad_request
+ head :bad_request
end
end
:auth_provider => params[:auth_provider],
:auth_uid => params[:auth_uid])
- flash.now[:notice] = t "user.new.auth association"
+ flash.now[:notice] = render_to_string :partial => "auth_association"
else
check_signup_allowed
end
@user.status = "pending"
- if @user.auth_provider.present? && @user.auth_uid.present? && @user.pass_crypt.empty?
+ if @user.auth_provider.present? && @user.pass_crypt.empty?
# We are creating an account with external authentication and
# no password was specified so create a random one
@user.pass_crypt = SecureRandom.base64(16)
if @user.invalid?
# Something is wrong with a new user, so rerender the form
render :action => "new"
- elsif @user.auth_provider.present? && @user.auth_uid.present?
+ elsif @user.auth_provider.present?
# Verify external authenticator before moving on
session[:new_user] = @user
redirect_to auth_url(@user.auth_provider, @user.auth_uid)
end
def login
- if params[:username] || params[:openid_url]
- session[:referer] ||= params[:referer]
+ session[:referer] = params[:referer] if params[:referer]
- if params[:openid_url].present?
- session[:remember_me] ||= params[:remember_me_openid]
- redirect_to auth_url("openid", params[:openid_url])
- else
- session[:remember_me] ||= params[:remember_me]
- password_authentication(params[:username], params[:password])
- end
+ if params[:username].present? && params[:password].present?
+ session[:remember_me] ||= params[:remember_me]
+ password_authentication(params[:username], params[:password])
+ elsif params[:openid_url].present?
+ session[:remember_me] ||= params[:remember_me_openid]
+ redirect_to auth_url("openid", params[:openid_url], params[:referer])
end
end
if params[:session] == request.session_options[:id]
if session[:token]
- token = UserToken.find_by_token(session[:token])
+ token = UserToken.find_by(:token => session[:token])
token.destroy if token
session.delete(:token)
end
def confirm
if request.post?
- token = UserToken.find_by_token(params[:confirm_string])
+ token = UserToken.find_by(:token => params[:confirm_string])
if token && token.user.active?
flash[:error] = t("user.confirm.already active")
redirect_to :action => "login"
user = token.user
user.status = "active"
user.email_valid = true
+ flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
user.save!
referer = token.referer
token.destroy
if session[:token]
- token = UserToken.find_by_token(session[:token])
+ token = UserToken.find_by(:token => session[:token])
session.delete(:token)
else
token = nil
end
end
else
- user = User.find_by_display_name(params[:display_name])
+ user = User.find_by(:display_name => params[:display_name])
- redirect_to root_path if !user || user.active?
+ redirect_to root_path if user.nil? || user.active?
end
end
def confirm_resend
- if user = User.find_by_display_name(params[:display_name])
- Notifier.signup_confirm(user, user.tokens.create).deliver_now
- flash[:notice] = t "user.confirm_resend.success", :email => user.email
- else
+ user = User.find_by(:display_name => params[:display_name])
+ token = UserToken.find_by(:token => session[:token])
+
+ if user.nil? || token.nil? || token.user != user
flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
+ else
+ Notifier.signup_confirm(user, user.tokens.create).deliver_now
+ flash[:notice] = t("user.confirm_resend.success", :email => user.email, :sender => SUPPORT_EMAIL).html_safe
end
redirect_to :action => "login"
def confirm_email
if request.post?
- token = UserToken.find_by_token(params[:confirm_string])
+ token = UserToken.find_by(:token => params[:confirm_string])
if token && token.user.new_email?
@user = token.user
@user.email = @user.new_email
@user.new_email = nil
@user.email_valid = true
+ gravatar_enabled = gravatar_enable(@user)
if @user.save
- flash[:notice] = t "user.confirm_email.success"
+ flash[:notice] = if gravatar_enabled
+ t("user.confirm_email.success") + " " + gravatar_status_message(@user)
+ else
+ t("user.confirm_email.success")
+ end
else
flash[:errors] = @user.errors
end
if @this_user.visible?
render :action => :api_read, :content_type => "text/xml"
else
- render :text => "", :status => :gone
+ head :gone
end
end
@user.traces.reload.each do |trace|
doc.root << trace.to_xml_node
end
- render :text => doc.to_s, :content_type => "text/xml"
+ render :xml => doc.to_s
end
def view
- @this_user = User.find_by_display_name(params[:display_name])
+ @this_user = User.find_by(:display_name => params[:display_name])
if @this_user &&
(@this_user.visible? || (@user && @user.administrator?))
end
def make_friend
- @new_friend = User.find_by_display_name(params[:display_name])
+ @new_friend = User.find_by(:display_name => params[:display_name])
if @new_friend
if request.post?
friend.friend_user_id = @new_friend.id
if @user.is_friends_with?(@new_friend)
flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
+ elsif friend.save
+ flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
+ Notifier.friend_notification(friend).deliver_now
else
- if friend.save
- flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
- Notifier.friend_notification(friend).deliver_now
- else
- friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))
- end
+ friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))
end
if params[:referer]
redirect_to params[:referer]
else
- redirect_to :controller => "user", :action => "view"
+ redirect_to :action => "view"
end
end
else
end
def remove_friend
- @friend = User.find_by_display_name(params[:display_name])
+ @friend = User.find_by(:display_name => params[:display_name])
if @friend
if request.post?
if @user.is_friends_with?(@friend)
- Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{@friend.id}"
+ Friend.where(:user_id => @user.id, :friend_user_id => @friend.id).delete_all
flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name
else
flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name
if params[:referer]
redirect_to params[:referer]
else
- redirect_to :controller => "user", :action => "view"
+ redirect_to :action => "view"
end
end
else
def set_status
@this_user.status = params[:status]
@this_user.save
- redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
+ redirect_to :action => "view", :display_name => params[:display_name]
end
##
# delete a user, marking them as deleted and removing personal data
def delete
@this_user.delete
- redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
+ redirect_to :action => "view", :display_name => params[:display_name]
end
##
when "openid"
email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
uid.match(%r{https://me.yahoo.com/(.*)})
+ when "google", "facebook"
+ email_verified = true
else
email_verified = false
end
- if user = User.find_by_auth_provider_and_auth_uid(provider, uid)
- case user.status
- when "pending" then
- unconfirmed_login(user)
- when "active", "confirmed" then
- successful_login(user)
- when "suspended" then
- failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
- else
- failed_login t("user.login.auth failure")
- end
- elsif settings = session.delete(:new_user_settings)
+ if settings = session.delete(:new_user_settings)
@user.auth_provider = provider
@user.auth_uid = uid
update_user(@user, settings)
+ session[:user_errors] = @user.errors.as_json
+
redirect_to :action => "account", :display_name => @user.display_name
elsif session[:new_user]
session[:new_user].auth_provider = provider
redirect_to :action => "terms"
else
- redirect_to :action => "new", :nickname => name, :email => email,
- :auth_provider => provider, :auth_uid => uid
+ user = User.find_by(:auth_provider => provider, :auth_uid => uid)
+
+ if user.nil? && provider == "google"
+ openid_url = auth_info[:extra][:id_info]["openid_id"]
+ user = User.find_by(:auth_provider => "openid", :auth_uid => openid_url) if openid_url
+ user.update(:auth_provider => provider, :auth_uid => uid) if user
+ end
+
+ if user
+ case user.status
+ when "pending" then
+ unconfirmed_login(user)
+ when "active", "confirmed" then
+ successful_login(user, env["omniauth.params"]["referer"])
+ when "suspended" then
+ failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}")
+ else
+ failed_login t("user.login.auth failure")
+ end
+ else
+ redirect_to :action => "new", :nickname => name, :email => email,
+ :auth_provider => provider, :auth_uid => uid
+ end
end
end
# omniauth failure callback
def auth_failure
flash[:error] = t("user.auth_failure." + params[:message])
- redirect_to params[:origin]
+ redirect_to params[:origin] || login_url
end
private
elsif user = User.authenticate(:username => username, :password => password, :pending => true)
unconfirmed_login(user)
elsif User.authenticate(:username => username, :password => password, :suspended => true)
- failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
+ failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}"), username
else
- failed_login t("user.login.auth failure")
+ failed_login t("user.login.auth failure"), username
end
end
##
# return the URL to use for authentication
- def auth_url(provider, uid)
- if provider == "openid"
- auth_path(:provider => "openid", :openid_url => openid_expand_url(uid), :origin => request.path)
+ def auth_url(provider, uid, referer = nil)
+ params = { :provider => provider }
+
+ params[:openid_url] = openid_expand_url(uid) if provider == "openid"
+
+ if referer.nil?
+ params[:origin] = request.path
else
- auth_path(:provider => provider, :origin => request.path)
+ params[:origin] = request.path + "?referer=" + CGI.escape(referer)
+ params[:referer] = referer
end
+
+ auth_path(params)
end
##
# try and come up with the correct URL based on what the user entered
def openid_expand_url(openid_url)
if openid_url.nil?
- return nil
- elsif openid_url.match(/(.*)gmail.com(\/?)$/) || openid_url.match(/(.*)googlemail.com(\/?)$/)
+ nil
+ elsif openid_url.match(%r{(.*)gmail.com(/?)$}) || openid_url.match(%r{(.*)googlemail.com(/?)$})
# Special case gmail.com as it is potentially a popular OpenID
# provider and, unlike yahoo.com, where it works automatically, Google
# have hidden their OpenID endpoint somewhere obscure this making it
# somewhat less user friendly.
- return "https://www.google.com/accounts/o8/id"
+ "https://www.google.com/accounts/o8/id"
else
- return openid_url
+ openid_url
end
end
##
# process a successful login
- def successful_login(user)
+ def successful_login(user, referer = nil)
session[:user] = user.id
session_expires_after 28.days if session[:remember_me]
- target = session[:referer] || url_for(:controller => :site, :action => :index)
+ target = referer || session[:referer] || url_for(:controller => :site, :action => :index)
# The user is logged in, so decide where to send them:
#
# - If they were referred to the login, send them back there.
# - Otherwise, send them to the home page.
if REQUIRE_TERMS_SEEN && !user.terms_seen
- redirect_to :controller => :user, :action => :terms, :referer => target
+ redirect_to :action => :terms, :referer => target
elsif user.blocked_on_view
redirect_to user.blocked_on_view, :referer => target
else
##
# process a failed login
- def failed_login(message)
+ def failed_login(message, username = nil)
flash[:error] = message
- redirect_to :action => "login", :referer => session[:referer]
+ redirect_to :action => "login", :referer => session[:referer],
+ :username => username, :remember_me => session[:remember_me]
session.delete(:remember_me)
session.delete(:referer)
##
#
def unconfirmed_login(user)
+ session[:token] = user.tokens.create.token
+
redirect_to :action => "confirm", :display_name => user.display_name
session.delete(:remember_me)
user.display_name = params[:user][:display_name]
user.new_email = params[:user][:new_email]
- if params[:user][:pass_crypt].length > 0 || params[:user][:pass_crypt_confirmation].length > 0
+ unless params[:user][:pass_crypt].empty? && params[:user][:pass_crypt_confirmation].empty?
user.pass_crypt = params[:user][:pass_crypt]
user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
end
user.home_lat = params[:user][:home_lat]
user.home_lon = params[:user][:home_lon]
- if params[:user][:preferred_editor] == "default"
- user.preferred_editor = nil
- else
- user.preferred_editor = params[:user][:preferred_editor]
- end
+ user.preferred_editor = if params[:user][:preferred_editor] == "default"
+ nil
+ else
+ params[:user][:preferred_editor]
+ end
- if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank? ||
- params[:user][:auth_uid].nil? || params[:user][:auth_uid].blank?
+ if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
user.auth_provider = nil
user.auth_uid = nil
end
flash[:error] = t("user.filter.not_an_administrator")
if params[:display_name]
- redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]
+ redirect_to :action => "view", :display_name => params[:display_name]
else
- redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+ redirect_to :action => "login", :referer => request.fullpath
end
elsif !@user
- redirect_to :controller => "user", :action => "login", :referer => request.fullpath
+ redirect_to :action => "login", :referer => request.fullpath
end
end
##
# require that the user in the URL is the logged in user
def require_self
- if params[:display_name] != @user.display_name
- render :text => "", :status => :forbidden
- end
+ head :forbidden if params[:display_name] != @user.display_name
end
##
##
# ensure that there is a "this_user" instance variable
def lookup_user_by_name
- @this_user = User.find_by_display_name(params[:display_name])
+ @this_user = User.find_by(:display_name => params[:display_name])
rescue ActiveRecord::RecordNotFound
- redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] unless @this_user
+ redirect_to :action => "view", :display_name => params[:display_name] unless @this_user
end
##
##
# check signup acls
def check_signup_allowed(email = nil)
- if email.nil?
- domain = nil
- else
- domain = email.split("@").last
- end
+ domain = if email.nil?
+ nil
+ else
+ email.split("@").last
+ end
if blocked = Acl.no_account_creation(request.remote_ip, domain)
logger.info "Blocked signup from #{request.remote_ip} for #{email}"
!blocked
end
+
+ ##
+ # check if this user has a gravatar and set the user pref is true
+ def gravatar_enable(user)
+ # code from example https://en.gravatar.com/site/implement/images/ruby/
+ return false if user.image.present?
+ hash = Digest::MD5.hexdigest(user.email.downcase)
+ url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back
+ response = OSM.http_client.get(URI.parse(url))
+ oldsetting = user.image_use_gravatar
+ user.image_use_gravatar = response.success?
+ oldsetting != user.image_use_gravatar
+ end
+
+ ##
+ # display a message about th current status of the gravatar setting
+ def gravatar_status_message(user)
+ if user.image_use_gravatar
+ t "user.account.gravatar.enabled"
+ else
+ t "user.account.gravatar.disabled"
+ end
+ end
end
projects / rails.git / blobdiff