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

Refactor login/logout into sessions controller

Browse source 
Certain controller methods are shared with oauth-based logins, and these have been
moved to a concern.
This commit is contained in:
Andy Allan 2021-03-10 14:15:14 +00:00
parent 3512d6303c
commit f18baae22e
16 changed files with 285 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

64
app/views/users/login.html.erb
View file

@ -1,64 +0,0 @@
<% content_for :head do %>
<%= javascript_include_tag "login" %>
<% end %>
<% content_for :heading do %>
<h1><%= t ".heading" %></h1>
<% end %>
<div id="login_login">
<p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
<%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
<%= hidden_field_tag("referer", h(params[:referer])) %>
<%= f.text_field :username, :label => t(".email or username"), :tabindex => 1, :value => params[:username] %>
<%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), :controller => "users", :action => "lost_password") %>
<%= f.form_group do %>
<%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
<% end %>
<%= f.primary t(".login_button"), :tabindex => 4 %>
<% end %>
<hr>
<div id="loginForm">
<div class="form-group">
<label><%= t ".with external" %></label>
<ul class='list-unstyled' id="login_auth_buttons">
<li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
<% if Settings.key?(:google_auth_id) -%>
<li><%= auth_button "google", "google" %></li>
<% end -%>
<% if Settings.key?(:facebook_auth_id) -%>
<li><%= auth_button "facebook", "facebook" %></li>
<% end -%>
<% if Settings.key?(:windowslive_auth_id) -%>
<li><%= auth_button "windowslive", "windowslive" %></li>
<% end -%>
<% if Settings.key?(:github_auth_id) -%>
<li><%= auth_button "github", "github" %></li>
<% end -%>
<% if Settings.key?(:wikipedia_auth_id) -%>
<li><%= auth_button "wikipedia", "wikipedia" %></li>
<% end -%>
<li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
<li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
<li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
</ul>
<%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
<div id='login_openid_url' class="form-group">
<label for='openid_url'><%= t ".openid_html", :logo => openid_logo %></label>
<%= hidden_field_tag("referer", params[:referer]) %>
<%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url form-control") %>
<span class="form-text text-muted">(<a href="<%= t "users.account.openid.link" %>" target="_new"><%= t "users.account.openid.link text" %></a>)</span>
</div>
<%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit", :class => "btn btn-primary" %>
<% end %>
</div>
</div>
</div>

8
app/views/users/logout.html.erb
View file

@ -1,8 +0,0 @@
<% content_for :heading do %>
<h1><%= t ".heading" %></h1>
<% end %>
<%= bootstrap_form_tag do |f| %>
<%= f.hidden_field :referer, :value => params[:referer] %>
<%= f.primary t(".logout_button") %>
<% end %>