From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 7 Mar 2024 13:51:44 +0000 (+0000)
Subject: Merge pull request #4550 from tomhughes/drop-user-tokens
X-Git-Tag: live~1122
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0a10ac2e9be4246987951eea86ae201f14c65fc1?hp=-c

Merge pull request #4550 from tomhughes/drop-user-tokens

Drop user tokens table
---

0a10ac2e9be4246987951eea86ae201f14c65fc1
diff --combined app/controllers/passwords_controller.rb
index 25b2b9607,a70883eda..26b21b6d9
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@@ -19,8 -19,7 +19,7 @@@ class PasswordsController < Application
      @title = t ".title"
  
      if params[:token]
-       self.current_user = User.find_by_token_for(:password_reset, params[:token]) ||
-                           UserToken.unexpired.find_by(:token => params[:token])&.user
+       self.current_user = User.find_by_token_for(:password_reset, params[:token])
  
        if current_user.nil?
          flash[:error] = t ".flash token bad"
@@@ -43,16 -42,17 +42,15 @@@
      if user
        token = user.generate_token_for(:password_reset)
        UserMailer.lost_password(user, token).deliver_later
 -      flash[:notice] = t ".notice email on way"
 -      redirect_to login_path
 -    else
 -      flash.now[:error] = t ".notice email cannot find"
 -      render :new
      end
 +
 +    flash[:notice] = t ".send_paranoid_instructions"
 +    redirect_to login_path
    end
  
    def update
      if params[:token]
-       self.current_user = User.find_by_token_for(:password_reset, params[:token]) ||
-                           UserToken.unexpired.find_by(:token => params[:token])&.user
+       self.current_user = User.find_by_token_for(:password_reset, params[:token])
  
        if current_user
          if params[:user]
@@@ -62,7 -62,6 +60,6 @@@
            current_user.email_valid = true
  
            if current_user.save
-             UserToken.delete_by(:token => params[:token])
              session[:fingerprint] = current_user.fingerprint
              flash[:notice] = t ".flash changed"
              successful_login(current_user)