Extract token authenticatable strategy fabrication

2 files changed, 12 insertions, 7 deletions

diff --git a/app/models/concerns/token_authenticatable.rb b/app/models/concerns/token_authenticatable.rb
index f881d119a17..fd8b4d70532 100644
--- a/app/models/concerns/token_authenticatable.rb
+++ b/app/models/concerns/token_authenticatable.rb
@@ -20,13 +20,8 @@ module TokenAuthenticatable
 
       attr_accessor :cleartext_tokens
 
-      strategy = if options[:digest]
-                   TokenAuthenticatableStrategies::Digest.new(self, token_field, options)
-                 elsif options[:encrypted]
-                   TokenAuthenticatableStrategies::Encrypted.new(self, token_field, options)
-                 else
-                   TokenAuthenticatableStrategies::Insecure.new(self, token_field, options)
-                 end
+      strategy = TokenAuthenticatableStrategies::Base
+        .fabricate(self, token_field, options)
 
       if unique
         define_singleton_method("find_by_#{token_field}") do |token|
diff --git a/app/models/concerns/token_authenticatable_strategies/base.rb b/app/models/concerns/token_authenticatable_strategies/base.rb
index 53b09ffd4d9..a722616756a 100644
--- a/app/models/concerns/token_authenticatable_strategies/base.rb
+++ b/app/models/concerns/token_authenticatable_strategies/base.rb
@@ -43,6 +43,16 @@ module TokenAuthenticatableStrategies
       options[:fallback] == true
     end
 
+    def self.fabricate(instance, field, options)
+      if options[:digest]
+       TokenAuthenticatableStrategies::Digest.new(instance, field, options)
+      elsif options[:encrypted]
+       TokenAuthenticatableStrategies::Encrypted.new(instance, field, options)
+      else
+       TokenAuthenticatableStrategies::Insecure.new(instance, field, options)
+      end
+    end
+
     protected
 
     def write_new_token(instance)