Fix token_set? method by checking migration status

68780d29 · Grzegorz Bizon · 239a4f72 · 68780d29
Commit 68780d29 authored Dec 04, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

app/models/concerns/token_authenticatable_strategies/encrypted.rb ...ls/concerns/token_authenticatable_strategies/encrypted.rb +4 -1

No files found.
--- a/app/models/concerns/token_authenticatable_strategies/encrypted.rb
+++ b/app/models/concerns/token_authenticatable_strategies/encrypted.rb
@@ -88,7 +88,10 @@ module TokenAuthenticatableStrategies

    def token_set?(instance)
      raw_token = instance.read_attribute(encrypted_field)
-      raw_token ||= (insecure_strategy.get_token(instance) if fallback?)
+
+      unless fully_encrypted?
+        raw_token ||= insecure_strategy.get_token(instance)
+      end

      raw_token.present?
    end