1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/concerns/token_authenticatable.rb b/app/models/concerns/token_authenticatable.rb
index f44ad8ebe90..d91ec161b84 100644
--- a/app/models/concerns/token_authenticatable.rb
+++ b/app/models/concerns/token_authenticatable.rb
@@ -8,6 +8,10 @@ module TokenAuthenticatable
       @encrypted_token_authenticatable_fields ||= []
     end
 
+    def token_authenticatable_fields
+      @token_authenticatable_fields ||= []
+    end
+
     private
 
     def add_authentication_token_field(token_field, options = {})
@@ -23,6 +27,8 @@ module TokenAuthenticatable
       strategy = TokenAuthenticatableStrategies::Base
         .fabricate(self, token_field, options)
 
+      prevent_from_serialization(*strategy.token_fields) if respond_to?(:prevent_from_serialization)
+
       if options.fetch(:unique, true)
         define_singleton_method("find_by_#{token_field}") do |token|
           strategy.find_token_authenticatable(token)
@@ -82,9 +88,5 @@ module TokenAuthenticatable
       @token_authenticatable_module ||=
         const_set(:TokenAuthenticatable, Module.new).tap(&method(:include))
     end
-
-    def token_authenticatable_fields
-      @token_authenticatable_fields ||= []
-    end
   end
 end