Merge 8dfd4fa into 40feccf

thewca · Jan 22, 2020 · 7d9d865 · 7d9d865
2 parents 40feccf + 8dfd4fa
commit 7d9d865
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/WcaOnRails/app/controllers/sessions_controller.rb b/WcaOnRails/app/controllers/sessions_controller.rb
@@ -43,7 +43,7 @@ def authenticate_via_otp(user)
        user.invalidate_otp_backup_code!(user_params[:otp_attempt])
       # Remove any lingering user data from login
       session.delete(:otp_user_id)
-      user.remember_me! if user_params[:remember_me] == '1'
+      user.remember_me = 1 if user_params[:remember_me] == '1'
       user.save!
       sign_in(user, event: :authentication)
     else

diff --git a/WcaOnRails/app/views/devise/sessions/2fa.html.erb b/WcaOnRails/app/views/devise/sessions/2fa.html.erb
@@ -6,7 +6,7 @@
       </div>
       <div class="panel-body">
         <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name), html: { role: "form" }, method: :post) do |f| %>
-          <%= f.input :remember_me, as: :hidden, value: resource_params.fetch(:remember_me, 0) %>
+          <%= f.input :remember_me, as: :hidden, input_html: { value: resource_params.fetch(:remember_me, 0) } %>
           <%= f.input :otp_attempt, autofocus: true, class: "form-control" %>
           <%= f.submit t('devise.sessions.new.2fa.confirm'), class: "btn btn-primary", tabindex: "3" %>
         <% end %>