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

Add social signin buttons to signup screen, avoid repeating round trip to auth provider.

Browse source
This commit is contained in:
Milan Cvetkovic 2024-03-18 15:32:00 +00:00 • committed by Tom Hughes
parent ae87d2ca7f
commit 0c7c950149
4 changed files with 495 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

41
app/controllers/users_controller.rb
View file

@ -69,12 +69,17 @@ class UsersController < ApplicationController
# page, instead send them to the home page
redirect_to @referer || { :controller => "site", :action => "index" }
elsif params.key?(:auth_provider) && params.key?(:auth_uid)
@verified_email = params[:verified_email]
self.current_user = User.new(:email => params[:email],
:display_name => params[:nickname],
:auth_provider => params[:auth_provider],
:auth_uid => params[:auth_uid])
flash.now[:notice] = render_to_string :partial => "auth_association"
# validate before displaying to show email field if it conflicts
flash.now[:notice] = t ".duplicate_social_email" unless current_user.valid? && current_user.errors[:email].empty?
else
check_signup_allowed
@ -90,7 +95,7 @@ class UsersController < ApplicationController
Rails.logger.info "create: #{session[:referer]}"
if current_user.auth_provider.present? && current_user.pass_crypt.empty?
if current_user.auth_uid.present?
# We are creating an account with external authentication and
# no password was specified so create a random one
current_user.pass_crypt = SecureRandom.base64(16)
@ -100,14 +105,9 @@ class UsersController < ApplicationController
if current_user.invalid?
# Something is wrong with a new user, so rerender the form
render :action => "new"
elsif current_user.auth_provider.present?
# Verify external authenticator before moving on
session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation", "consider_pd")
redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect
else
# Save the user record
session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation", "consider_pd")
save_new_user
save_new_user params[:verified_email]
end
end
end
@ -131,7 +131,7 @@ class UsersController < ApplicationController
if current_user&.terms_agreed?
# Already agreed to terms, so just show settings
redirect_to edit_account_path
elsif current_user.nil? && session[:new_user].nil?
elsif current_user.nil?
redirect_to login_path(:referer => request.fullpath)
end
end
@ -220,12 +220,6 @@ class UsersController < ApplicationController
session[:user_errors] = current_user.errors.as_json
redirect_to edit_account_path
elsif session[:new_user]
session[:new_user]["auth_provider"] = provider
session[:new_user]["auth_uid"] = uid
session[:new_user]["verified_email"] = email if email_verified
save_new_user
else
user = User.find_by(:auth_provider => provider, :auth_uid => uid)
@ -247,7 +241,8 @@ class UsersController < ApplicationController
failed_login t("sessions.new.auth failure")
end
else
redirect_to :action => "new", :nickname => name, :email => email,
verified_email = UsersController.message_hmac(email) if email_verified && email
redirect_to :action => "new", :nickname => name, :email => email, :verified_email => verified_email,
:auth_provider => provider, :auth_uid => uid
end
end
@ -263,14 +258,16 @@ class UsersController < ApplicationController
redirect_to origin || login_url
end
def self.message_hmac(text)
sha256 = Digest::SHA256.new
sha256 << Rails.application.key_generator.generate_key("openstreetmap/verified_email")
sha256 << text
Base64.urlsafe_encode64(sha256.digest)
end
private
def save_new_user
new_user = session.delete(:new_user)
verified_email = new_user.delete("verified_email")
self.current_user = User.new(new_user)
def save_new_user(email_hmac)
if check_signup_allowed(current_user.email)
current_user.data_public = true
current_user.description = "" if current_user.description.nil?
@ -283,7 +280,7 @@ class UsersController < ApplicationController
if current_user.auth_uid.blank?
current_user.auth_provider = nil
current_user.auth_uid = nil
elsif current_user.email == verified_email
elsif email_hmac && ActiveSupport::SecurityUtils.secure_compare(email_hmac, UsersController.message_hmac(current_user.email))
current_user.activate
end

79
app/views/users/new.html.erb
View file

@ -1,5 +1,6 @@
<% content_for :head do %>
<%= javascript_include_tag "user" %>
<%= javascript_include_tag "auth_providers" %>
<% end %>
<% content_for :heading_class, "p-0 mw-100" %>
@ -11,59 +12,73 @@
<% end %>
<div class="auth-container mx-auto my-0">
<div class="text-muted fs-6">
<p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>
<p><%= t ".about.paragraph_2" %></p>
</div>
<% if current_user.auth_uid.nil? %>
<div class="text-muted fs-6">
<p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>
<p><%= t ".about.paragraph_2" %></p>
</div>
<% else %>
<h4><%= t ".about.welcome" %></h4>
<% end %>
<%= bootstrap_form_for current_user, :url => { :action => "create" } do |f| %>
<%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
<%= hidden_field_tag("verified_email", h(@verified_email)) unless @verified_email.nil? %>
<%= f.hidden_field :auth_provider unless current_user.auth_provider.nil? %>
<%= f.hidden_field :auth_uid unless current_user.auth_uid.nil? %>
<%= f.email_field :email, :help => t(".email_help_html",
:privacy_policy_link => link_to(t(".privacy_policy"),
t(".privacy_policy_url"),
:title => t(".privacy_policy_title"))),
:tabindex => 1 %>
<% if current_user.auth_uid.nil? or not current_user.errors[:email].empty? %>
<%= f.email_field :email, :help => t(".email_help_html",
:privacy_policy_link => link_to(t(".privacy_policy"),
t(".privacy_policy_url"),
:title => t(".privacy_policy_title"),
:target => :new)),
:tabindex => 1 %>
<% else %>
<%= f.hidden_field :email %>
<% end %>
<%= f.text_field :display_name, :help => t(".display name description"), :tabindex => 2 %>
<fieldset class="mb-3" id="auth_field">
<label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
<% if current_user.auth_uid.nil? %>
<div class="row">
<%= f.select(:auth_provider, Auth.providers, :default => "", :hide_label => true, :wrapper => { :class => "col-auto mb-0" }, :tabindex => 3) %>
<%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }, :tabindex => 4) %>
<div class="col-sm">
<%= f.password_field :pass_crypt, :tabindex => 3 %>
</div>
<div class="col-sm">
<%= f.password_field :pass_crypt_confirmation, :tabindex => 4 %>
</div>
</div>
<small class="form-text text-muted"><%= t ".auth no password" %></small>
</fieldset>
<%= f.password_field :pass_crypt, :tabindex => 5 %>
<%= f.password_field :pass_crypt_confirmation, :tabindex => 6 %>
<% end %>
<p class="mb-3 text-muted"><%= t(".by_signing_up_html",
:tou_link => link_to(t("layouts.tou"),
"https://wiki.osmfoundation.org/wiki/Terms_of_Use",
:target => :new),
:privacy_policy_link => link_to(t(".privacy_policy"),
t(".privacy_policy_url"),
:title => t(".privacy_policy_title"),
:target => :new),
:contributor_terms_link => link_to(t(".contributor_terms"),
t(".contributor_terms_url"),
:target => :new)) %></p>
<div class="mb-3">
<%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :class => "btn btn-primary", :tabindex => 7) %>
</div>
<%= f.form_group do %>
<%= f.check_box :consider_pd,
:tabindex => 5,
:label => t(".consider_pd_html",
:consider_pd_link => link_to(t(".consider_pd"),
t(".consider_pd_url"),
:target => :new)) %>
<% end %>
<div class="mb-3">
<div class="form-check">
<%= check_box("user", "consider_pd", :class => "form-check-input") %>
<label for="user_consider_pd" class="form-check-label">
<%= t ".consider_pd" %>
</label>
<span class="minorNote">(<%= link_to(t(".consider_pd_why"), t(".consider_pd_why_url"), :target => :new) %>)</span>
</div>
</div>
<div id="auth_prompt">
<p><%= link_to t(".use external auth"), "#", :id => "auth_enable" %></p>
<%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :class => "btn btn-primary", :tabindex => 6) %>
</div>
<% end %>
<% if current_user.auth_uid.nil? %>
<hr>
<%= render :partial => "auth_providers" %>
<% end %>
</div>