OpenNeo/impress
OpenNeo/impress
1
0
Fork 0
Code Pull requests Activity

Don't require current_password for settings if user doesn't have one

Browse source
This commit is contained in:
Emi Matchu 2024-04-08 04:13:07 -07:00
parent 0f5bb2a861
commit f6d3992045
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/auth_users_controller.rb
View file

@ -24,7 +24,13 @@ class AuthUsersController < ApplicationController
def update def update
@auth_user = load_auth_user @auth_user = load_auth_user
if @auth_user.update_with_password(auth_user_params) # If the user has a password, then the `current_password` field is required
# when updating. If not, then it's not!
success = @auth_user.uses_password? ?
@auth_user.update_with_password(auth_user_params) :
@auth_user.update(auth_user_params)
if success
# NOTE: Changing the password will sign you out, so make sure we stay # NOTE: Changing the password will sign you out, so make sure we stay
# signed in! # signed in!
bypass_sign_in @auth_user, scope: :auth_user bypass_sign_in @auth_user, scope: :auth_user

19
app/views/auth_users/edit.html.erb
View file

@ -38,14 +38,17 @@
</div> </div>
</fieldset> </fieldset>
<fieldset> <%# Current password is only required if you have one! %>
<div class="field"> <% if @auth_user.uses_password? %>
<%= f.label :current_password %> <fieldset>
<span class="hint">We need your current password to confirm your changes.</span> <div class="field">
<br /> <%= f.label :current_password %>
<%= f.password_field :current_password, autocomplete: "current-password" %> <span class="hint">We need your current password to confirm your changes.</span>
</div> <br />
</fieldset> <%= f.password_field :current_password, autocomplete: "current-password" %>
</div>
</fieldset>
<% end %>
<div class="actions"> <div class="actions">
<%= f.submit "Save changes" %> <%= f.submit "Save changes" %>