fix email otp bugs

obl-ong · Nov 20, 2023 · 189b88f · 189b88f
1 parent 9abf928
commit 189b88f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/auth_controller.rb b/app/controllers/auth_controller.rb
@@ -28,7 +28,7 @@ def email
     end
 
 
-    if !(Time.now.to_i <= user.otp_last_minted + 600) || params[:resend] == "true" then
+    if Time.now.to_i > (user.otp_last_minted.nil? ? 0 : user.otp_last_minted) + 600 || params[:resend] == "true" then
       User::Mailer.with(user: user).verification_email.deliver_later
     end
 

diff --git a/app/models/user/user.rb b/app/models/user/user.rb
@@ -8,6 +8,7 @@ class User::User < ApplicationRecord
   end
 
   def mint_otp
+    self.otp_counter += 1
     otp = @hotp.at(self.otp_counter)
     self.otp_last_minted = Time.now.to_i
     self.save
@@ -29,4 +30,4 @@ def use_otp(token)
     end
   end 
 
-end
+end
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ def email @@
         end
-        if !(Time.now.to_i <= user.otp_last_minted + 600) || params[:resend] == "true" then
+        if Time.now.to_i > (user.otp_last_minted.nil? ? 0 : user.otp_last_minted) + 600 || params[:resend] == "true" then
           User::Mailer.with(user: user).verification_email.deliver_later
         end
@@ Expand Down @@