Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-token"

This reverts commit 224eddfc0eeff6555ae88691306e61c7a9e8b758, reversing
changes made to 9d681fc74c6251d5f2b93fa9576c9b2113116680.

When merging the pull request, I misunderstood `has_secure_token` as declaring a model
has a token from birth and through the rest of its lifetime.

Therefore, supporting conditional creation doesn't make sense. You should never mark a
model as having a secure token if there's a time when it shouldn't have it on creation.

5 files changed, 2 insertions, 45 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index a017ac6f18..eaeb808144 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -4,10 +4,6 @@
 
     *Yves Senn*
 
-*   Support `:if` and `:unless` options in `has_secure_token`.
-
-    *Griffin Smith*
-
 *   Use `version` column as primary key for schema_migrations table because
     `schema_migrations` versions are guaranteed to be unique.
 
diff --git a/activerecord/lib/active_record/secure_token.rb b/activerecord/lib/active_record/secure_token.rb
index f10f7a1515..8abda2ac49 100644
--- a/activerecord/lib/active_record/secure_token.rb
+++ b/activerecord/lib/active_record/secure_token.rb
@@ -20,35 +20,14 @@ module ActiveRecord
       #
       # <tt>SecureRandom::base58</tt> is used to generate the 24-character unique token, so collisions are highly unlikely.
       #
-      # A secure token can also be only created given a condition, for example if a user should only have an
-      # auto-generated invitation token if the user was invited:
-      #
-      #   # Schema: User(token:string, invited:boolean)
-      #   class User < ActiveRecord::Base
-      #     has_secure_token if: :invited?
-      #   end
-      #
-      #   user = User.new(invited: true)
-      #   user.save
-      #   user.token # => "pX27zsMN2ViQKta1bGfLmVJE"
-      #
-      #   user = User.new(invited: false)
-      #   user.save
-      #   user.token # => nil
-      #
-      # The secure token creation supports all the options a `before_create` does - like +:if+ and +:unless+.
-      #
       # Note that it's still possible to generate a race condition in the database in the same way that
       # {validates_uniqueness_of}[rdoc-ref:Validations::ClassMethods#validates_uniqueness_of] can.
       # You're encouraged to add a unique index in the database to deal with this even more unlikely scenario.
-      def has_secure_token(attribute = :token, **before_create_options)
+      def has_secure_token(attribute = :token)
         # Load securerandom only when has_secure_token is used.
         require 'active_support/core_ext/securerandom'
-
         define_method("regenerate_#{attribute}") { update! attribute => self.class.generate_unique_secure_token }
-        before_create(before_create_options) do
-          self.send("#{attribute}=", self.class.generate_unique_secure_token) unless self.send("#{attribute}?")
-        end
+        before_create { self.send("#{attribute}=", self.class.generate_unique_secure_token) unless self.send("#{attribute}?")}
       end
 
       def generate_unique_secure_token
diff --git a/activerecord/test/cases/secure_token_test.rb b/activerecord/test/cases/secure_token_test.rb
index 239b975d82..e731443fc2 100644
--- a/activerecord/test/cases/secure_token_test.rb
+++ b/activerecord/test/cases/secure_token_test.rb
@@ -29,18 +29,4 @@ class SecureTokenTest < ActiveRecord::TestCase
 
     assert_equal @user.token, "custom-secure-token"
   end
-
-  def test_failing_if_condition_does_not_set_token
-    @user.token_condition = false
-    @user.save
-
-    assert_nil @user.conditional_token
-  end
-
-  def test_passing_if_condition_sets_token
-    @user.token_condition = true
-    @user.save
-
-    assert_not_nil @user.conditional_token
-  end
 end
diff --git a/activerecord/test/models/user.rb b/activerecord/test/models/user.rb
index a40385e047..f5dc93e994 100644
--- a/activerecord/test/models/user.rb
+++ b/activerecord/test/models/user.rb
@@ -1,9 +1,6 @@
 class User < ActiveRecord::Base
   has_secure_token
   has_secure_token :auth_token
-  has_secure_token :conditional_token, if: :token_condition
-
-  attr_accessor :token_condition
 end
 
 class UserWithNotification < User
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 4a74137c00..025184f63a 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -1007,7 +1007,6 @@ ActiveRecord::Schema.define do
   create_table :users, force: true do |t|
     t.string :token
     t.string :auth_token
-    t.string :conditional_token
   end
 
   create_table :test_with_keyword_column_name, force: true do |t|