GRN2-xx: Restructured email verification and password reset (#1444)

* Restructured email verification and password reset * Fixed issue with password reset Co-authored-by: Jesus Federico <jesus@123it.ca>
2020-04-29 17:56:46 -04:00
parent 8f3ba8a038
commit 28302107bd
10 changed files with 46 additions and 81 deletions
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@ -133,9 +133,7 @@ class AdminsController < ApplicationController

  # GET /admins/reset
  def reset
-    @user.create_reset_digest
-
-    send_password_reset_email(@user)
+    send_password_reset_email(@user, @user.create_reset_digest)

    if session[:prev_url].present?
      redirect_path = session[:prev_url]