From 805e3504c7671a01339521c064b820060d5d9930 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 27 Jun 2022 23:33:25 +0200
Subject: [PATCH] Set autocomplete attributes on username & password fields

---
 app/views/devise/registrations/new.haml | 8 ++++----
 app/views/devise/sessions/new.haml      | 4 ++--
 app/views/modal/_password.haml          | 2 +-
 app/views/settings/_account.haml        | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/devise/registrations/new.haml b/app/views/devise/registrations/new.haml
index 3d2f3ab3..68fbe38a 100644
--- a/app/views/devise/registrations/new.haml
+++ b/app/views/devise/registrations/new.haml
@@ -9,10 +9,10 @@
             = render "devise/shared/error_messages", resource: resource
             = render "layouts/messages"
 
-            = f.text_field :screen_name, autofocus: true
-            = f.email_field :email, autofocus: false
-            = f.password_field :password, autocomplete: :off
-            = f.password_field :password_confirmation, autocomplete: :off
+            = f.text_field :screen_name, autofocus: true, autocomplete: :username
+            = f.email_field :email, autofocus: false, autocomplete: :email
+            = f.password_field :password, autocomplete: "new-password"
+            = f.password_field :password_confirmation, autocomplete: "new-password"
 
             - if APP_CONFIG.dig(:hcaptcha, :enabled)
               = hcaptcha_tags
diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.haml
index fb868d50..09e82bc5 100644
--- a/app/views/devise/sessions/new.haml
+++ b/app/views/devise/sessions/new.haml
@@ -8,8 +8,8 @@
           %h1.mb-3.mt-0= t(".title")
           = bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
 
-            = f.text_field :login, autofocus: true
-            = f.password_field :password, autocomplete: :off
+            = f.text_field :login, autofocus: true, autocomplete: :username
+            = f.password_field :password, autocomplete: "current-password"
 
             - if devise_mapping.rememberable?
               = f.check_box :remember_me
diff --git a/app/views/modal/_password.haml b/app/views/modal/_password.haml
index 1b134ec6..ab30621c 100644
--- a/app/views/modal/_password.haml
+++ b/app/views/modal/_password.haml
@@ -7,7 +7,7 @@
           %span{ aria: { hidden: true } } ×
           %span.sr-only= t("voc.close")
       .modal-body
-        = f.password_field :current_password, autocomplete: :off
+        = f.password_field :current_password, autocomplete: "current-password"
       .modal-footer
         %button.btn.btn-default{ data: { dismiss: :modal }, type: :button }= t("voc.cancel")
         = f.primary
diff --git a/app/views/settings/_account.haml b/app/views/settings/_account.haml
index dc5bfa11..bdc928bc 100644
--- a/app/views/settings/_account.haml
+++ b/app/views/settings/_account.haml
@@ -4,14 +4,14 @@
       = render "modal/password", f: f
       = render "devise/shared/error_messages", resource: resource
 
-      = f.text_field :screen_name, autofocus: true
+      = f.text_field :screen_name, autofocus: true, autocomplete: :username
 
-      = f.email_field :email
+      = f.email_field :email, autocomplete: :email
       - if devise_mapping.confirmable? && resource.pending_reconfirmation?
         .alert.alert-info= raw t(".email_confirm", resource: resource.unconfirmed_email)
 
-      = f.password_field :password, autocomplete: :off, help: t(".help.password")
-      = f.password_field :password_confirmation, autocomplete: :off
+      = f.password_field :password, autocomplete: "new-password", help: t(".help.password")
+      = f.password_field :password_confirmation, autocomplete: "new-password"
 
       %button.btn.btn-primary{ data: { target: "#modal-passwd", toggle: :modal, type: :button } }
         = t("voc.save")