bullet_train 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7ebfc0bd05abbc9e8be5ee1605c82f1e7606fb2113c8ee8234be5ad79e3920
-  data.tar.gz: 0f67c29f1578da48e8962262d2e316d98f4fe521dc22392124f6aff6015ed9d7
+  metadata.gz: 9521826a1552bab65baf10d7144bc10be7f61da32e17e799d498c3e7fdf32f82
+  data.tar.gz: cf4c3769472e2a4a25a497b1bc40ac95436dd83d9d0b06f78c23bfb30cc9c332
 SHA512:
-  metadata.gz: eaa103dae8c8a4b4d1eb8b986525d7cbcaaaa0a5e4a78a55ceb91c7db1000718057848c931e37a4d24a1e140eb4852afbc5e1aef2f1ba492f750e883a8521bd0
-  data.tar.gz: 324e50a48305acd6fe1dd1d6ce0a6df96d8b72187fdabff73178c7114c979de8520967342c765247de1c4e880db9914beb6ab26d0fad3be7815319592ee45276
+  metadata.gz: d6370f74971ba12c953ec66bd63edae2434457a0a84a07ec0dcab44685661026b1b57ba4b99377f2ef696c21bc63aaca6661008f4cc098aeed76fb55751aed68
+  data.tar.gz: 2705720d73d70dcd59ec85bc322d16f786ff6da81e3399a18b58b775a5a52befe7d8336e636f6544041843e829fd641d04096ab07d0cb865c8493f311b0333de

data/app/controllers/concerns/account/users/controller_base.rb

@@ -24,7 +24,17 @@ module Account::Users::ControllerBase
   def show
   end
 
+  def updating_password_or_email?
+    params[:user].key?(:password) || params[:user].key?(:email)
+  end
+
+  # TODO: We're keeping this method for backward compatibility in case someone in a downstream app
+  # might be using it. At some point in the future (unclear exactly when) we should remove it.
   def updating_password?
+    ActiveSupport::Deprecation.warn(
+      "#updating_password? is deprecated. " \
+      "Use #updating_password_or_email? instead."
+    )
     params[:user].key?(:password)
   end
 
@@ -32,7 +42,7 @@ module Account::Users::ControllerBase
   # PATCH/PUT /account/users/1.json
   def update
     respond_to do |format|
-      if updating_password? ? @user.update_with_password(user_params) : @user.update_without_password(user_params)
+      if updating_password_or_email? ? @user.update_with_password(user_params) : @user.update_without_password(user_params)
         # if you update your own user account, devise will normally kick you out, so we do this instead.
         bypass_sign_in current_user.reload
         format.html { redirect_to [:edit, :account, @user], notice: t("users.notifications.updated") }

data/app/views/account/users/_form.html.erb

@@ -1,10 +1,6 @@
 <%= form_for [:account, user], html: {id: dom_id(user, :details), class: 'form'} do |form| %>
   <% with_field_settings form: form do %>
     <div class="grid grid-cols-1 gap-y gap-x sm:grid-cols-2">
-      <div class="sm:col-span-2">
-        <%= render 'shared/fields/email_field', method: :email, options: {autofocus: true} %>
-      </div>
-
       <div class="sm:col-span-1">
         <%= render 'shared/fields/text_field', method: :first_name %>
       </div>

data/app/views/account/users/edit.html.erb

@@ -23,18 +23,35 @@
         <%= render 'account/users/oauth' %>
 
         <%= render 'account/shared/box', divider: true do |box| %>
-          <% box.title t('.password.header') %>
+          <% box.title t('.email_and_password.header') %>
+          <% box.description t('.email_and_password.description') %>
           <% box.body do %>
             <% within_fields_namespace(:update_self) do %>
               <%= form_for [:account, @user], html: {id: dom_id(@user, :password), class: 'form'} do |form| %>
                 <% with_field_settings form: form do %>
-                  <%= render 'shared/fields/password_field', method: :current_password %>
-                  <%= render 'shared/fields/password_field', method: :password, options: {show_strength_indicator: true} %>
-                  <%= render 'shared/fields/password_field', method: :password_confirmation %>
+                  <%= render 'shared/fields/email_field', method: :email, options: {autofocus: true} %>
+
+                  <hr>
+
+                  <p><%= t('.email_and_password.new_password') %></p>
+
+                  <div class="grid grid-cols-1 gap-y gap-x sm:grid-cols-2">
+                    <div class="sm:col-span-1">
+                      <%= render 'shared/fields/password_field', method: :password, options: {show_strength_indicator: true}, other_options: { required: false } %>
+                    </div>
+                    <div class="sm:col-span-1">
+                      <%= render 'shared/fields/password_field', method: :password_confirmation, other_options: { required: false, label: t('.email_and_password.confirm_new_password') } %>
+                    </div>
+                  </div>
+
+                  <hr>
+
+                  <p><%= t('.email_and_password.current_password') %></p>
+                  <%= render 'shared/fields/password_field', method: :current_password, other_options: { required: true } %>
                 <% end %>
 
                 <div class="buttons">
-                  <%= form.submit t('.buttons.update_password'), class: "button" %>
+                  <%= form.submit t('.buttons.update_email_and_password'), class: "button" %>
                 </div>
               <% end %>
             <% end %>

data/config/locales/en/users.en.yml

@@ -5,20 +5,24 @@ en:
       label: *label
     buttons: &buttons
       update_profile: Update Profile
-      update_password: Update Password
+      update_email_and_password: Update Email & Password
     edit:
       section: "%{users_possessive} Profile"
       profile:
         header: Update Your Profile
-        description: You can update the email address where you'll receive notifications and also update the way your name is displayed.
-      password:
-        header: Update Your Password
+        description: You can update the way your name is displayed and your time zone.
+      email_and_password:
+        header: Update Your Email Address & Password
+        description: When you change these credentials we'll email you a confirmation.
+        new_password: If you don't want to change your password, leave these two fields blank.
+        current_password: For security reasons we need you to confirm your current password.
+        confirm_new_password: Confirm New Password
       two_factor:
         header: Two-Factor Authentication
         description_enabled: 2FA is currently enabled for your account.
         description_disabled: You can increase the security of your account by enabling two-factor authentication.
         verification_fail: Verification failed. You can try enabling again. Please make sure you scan the new QR code with your Authenticator app.
-        verification_success: Success! Thanks for verifying. 2FA is now enabled. 
+        verification_success: Success! Thanks for verifying. 2FA is now enabled.
         warning: "In order to enable two-factor authentication, you <strong>must</strong> install an Authenticator app and <strong>enter your Verification Code from the app below</strong>. 2FA will not be enabled until you do so. This is to avoid you getting locked out of your account."
         instructions: "Install <a href='https://authy.com/download/' target='_blank'>Authy</a> or <a href='https://support.google.com/accounts/answer/1066447'>Google Authentication</a> on your phone and scan the barcode displayed below."
         recovery_codes: "You can also make a copy of the following recovery codes. Each one can help you get back into your account once should you lose access to the device you're using for two-factor authentication."

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard