devise_token_auth 0.1.43 → 1.2.0

data/test/test_helper.rb

@@ -1,27 +1,30 @@
-require 'simplecov'
-
-# SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-#   SimpleCov::Formatter::HTMLFormatter,
-#   CodeClimate::TestReporter::Formatter
-# ]
+# frozen_string_literal: true
 
-SimpleCov.start 'rails'
+require 'simplecov'
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+SimpleCov.start 'rails' do
+  add_filter ['.bundle', 'test', 'config']
+end
 
 ENV['RAILS_ENV'] = 'test'
+DEVISE_TOKEN_AUTH_ORM = (ENV['DEVISE_TOKEN_AUTH_ORM'] || :active_record).to_sym
 
-require File.expand_path('../dummy/config/environment', __FILE__)
-require 'rails/test_help'
-require 'minitest/rails'
+puts "\n==> DeviseTokenAuth.orm = #{DEVISE_TOKEN_AUTH_ORM.inspect}"
 
-# To add Capybara feature tests add `gem "minitest-rails-capybara"`
-# to the test group in the Gemfile and uncomment the following:
-# require "minitest/rails/capybara"
+require File.expand_path('dummy/config/environment', __dir__)
+require 'active_support/testing/autorun'
+require 'minitest/rails'
+require 'mocha/minitest'
+if DEVISE_TOKEN_AUTH_ORM == :active_record
+  require 'database_cleaner'
+else
+  require 'database_cleaner/mongoid'
+end
 
-# Uncomment for awesome colorful output
-# require "minitest/pride"
+FactoryBot.definition_file_paths = [File.expand_path('factories', __dir__)]
+FactoryBot.find_definitions
 
-ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
-ActionDispatch::IntegrationTest.fixture_path = File.expand_path('../fixtures', __FILE__)
+Dir[File.join(__dir__, 'support/**', '*.rb')].each { |file| require file }
 
 # I hate the default reporter. Use ProgressReporter instead.
 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new
@@ -33,26 +36,55 @@ class ActionDispatch::IntegrationTest
 end
 
 class ActiveSupport::TestCase
-  ActiveRecord::Migration.check_pending!
+  include FactoryBot::Syntax::Methods
+
+  ActiveRecord::Migration.check_pending! if DEVISE_TOKEN_AUTH_ORM == :active_record
 
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
+  strategies = { active_record: :transaction,
+                 mongoid: :deletion }
+  DatabaseCleaner.strategy = strategies[DEVISE_TOKEN_AUTH_ORM]
+  setup { DatabaseCleaner.start }
+  teardown { DatabaseCleaner.clean }
 
   # Add more helper methods to be used by all tests here...
 
+  # Execute the block setting the given values and restoring old values after
+  # the block is executed.
+  # shamelessly copied from devise test_helper.
+  def swap(object, new_values)
+    old_values = {}
+    new_values.each do |key, value|
+      old_values[key] = object.send key
+      object.send :"#{key}=", value
+    end
+    clear_cached_variables(new_values)
+    yield
+  ensure
+    clear_cached_variables(new_values)
+    old_values.each do |key, value|
+      object.send :"#{key}=", value
+    end
+  end
+
+  # shamelessly copied from devise test_helper.
+  def clear_cached_variables(options)
+    if options.key?(:case_insensitive_keys) || options.key?(:strip_whitespace_keys)
+      Devise.mappings.each do |_, mapping|
+        mapping.to.instance_variable_set(:@devise_parameter_filter, nil)
+      end
+    end
+  end
+
   def age_token(user, client_id)
     if user.tokens[client_id]
-      user.tokens[client_id]['updated_at'] = Time.now - (DeviseTokenAuth.batch_request_buffer_throttle + 10.seconds)
+      user.tokens[client_id]['updated_at'] = (Time.zone.now - (DeviseTokenAuth.batch_request_buffer_throttle + 10.seconds))
       user.save!
     end
   end
 
   def expire_token(user, client_id)
     if user.tokens[client_id]
-      user.tokens[client_id]['expiry'] = (Time.now - (DeviseTokenAuth.token_lifespan.to_f + 10.seconds)).to_i
+      user.tokens[client_id]['expiry'] = (Time.zone.now - (DeviseTokenAuth.token_lifespan.to_f + 10.seconds)).to_i
       user.save!
     end
   end
@@ -60,7 +92,7 @@ class ActiveSupport::TestCase
   # Suppress OmniAuth logger output
   def silence_omniauth
     previous_logger = OmniAuth.config.logger
-    OmniAuth.config.logger = Logger.new("/dev/null")
+    OmniAuth.config.logger = Logger.new('/dev/null')
     yield
   ensure
     OmniAuth.config.logger = previous_logger
@@ -75,3 +107,28 @@ class ActionController::TestCase
     @request.env['devise.mapping'] = Devise.mappings[:user]
   end
 end
+
+# TODO: remove it when support for Rails < 5 has been dropped
+module Rails
+  module Controller
+    module Testing
+      module Integration
+        %w[get post patch put head delete get_via_redirect post_via_redirect].each do |method|
+          define_method(method) do |path_or_action, **args|
+            if Rails::VERSION::MAJOR >= 5
+              super path_or_action, **args
+            else
+              super path_or_action, args[:params], args[:headers]
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+module ActionController
+  class TestCase
+    include Rails::Controller::Testing::Integration
+  end
+end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 1.2.0
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +39,7 @@ dependencies:
         version: 3.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,21 +49,49 @@ dependencies:
         version: 3.5.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +120,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: mongoid-locker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: For use with client side single page apps such as the venerable https://github.com/lynndylanhurley/ng-token-auth.
 email:
 - lynn.dylan.hurley@gmail.com
@@ -106,21 +174,26 @@ files:
 - app/controllers/devise_token_auth/sessions_controller.rb
 - app/controllers/devise_token_auth/token_validations_controller.rb
 - app/controllers/devise_token_auth/unlocks_controller.rb
+- app/models/devise_token_auth/concerns/active_record_support.rb
+- app/models/devise_token_auth/concerns/confirmable_support.rb
+- app/models/devise_token_auth/concerns/mongoid_support.rb
+- app/models/devise_token_auth/concerns/tokens_serialization.rb
 - app/models/devise_token_auth/concerns/user.rb
 - app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb
-- app/validators/email_validator.rb
+- app/validators/devise_token_auth_email_validator.rb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.erb
 - app/views/devise_token_auth/omniauth_external_window.html.erb
-- config/initializers/devise.rb
 - config/locales/da-DK.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/he.yml
 - config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/ko.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -128,24 +201,31 @@ files:
 - config/locales/ro.yml
 - config/locales/ru.yml
 - config/locales/sq.yml
+- config/locales/sv.yml
 - config/locales/uk.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-HK.yml
 - config/locales/zh-TW.yml
 - lib/devise_token_auth.rb
+- lib/devise_token_auth/blacklist.rb
 - lib/devise_token_auth/controllers/helpers.rb
 - lib/devise_token_auth/controllers/url_helpers.rb
 - lib/devise_token_auth/engine.rb
+- lib/devise_token_auth/errors.rb
 - lib/devise_token_auth/rails/routes.rb
+- lib/devise_token_auth/token_factory.rb
 - lib/devise_token_auth/url.rb
 - lib/devise_token_auth/version.rb
 - lib/generators/devise_token_auth/USAGE
 - lib/generators/devise_token_auth/install_generator.rb
+- lib/generators/devise_token_auth/install_generator_helpers.rb
+- lib/generators/devise_token_auth/install_mongoid_generator.rb
 - lib/generators/devise_token_auth/install_views_generator.rb
 - lib/generators/devise_token_auth/templates/devise_token_auth.rb
 - lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb.erb
-- lib/generators/devise_token_auth/templates/user.rb
+- lib/generators/devise_token_auth/templates/user.rb.erb
+- lib/generators/devise_token_auth/templates/user_mongoid.rb.erb
 - lib/tasks/devise_token_auth_tasks.rake
 - test/controllers/custom/custom_confirmations_controller_test.rb
 - test/controllers/custom/custom_omniauth_callbacks_controller_test.rb
@@ -170,6 +250,14 @@ files:
 - test/controllers/overrides/sessions_controller_test.rb
 - test/controllers/overrides/token_validations_controller_test.rb
 - test/dummy/README.rdoc
+- test/dummy/app/active_record/confirmable_user.rb
+- test/dummy/app/active_record/lockable_user.rb
+- test/dummy/app/active_record/mang.rb
+- test/dummy/app/active_record/only_email_user.rb
+- test/dummy/app/active_record/scoped_user.rb
+- test/dummy/app/active_record/unconfirmable_user.rb
+- test/dummy/app/active_record/unregisterable_user.rb
+- test/dummy/app/active_record/user.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/auth_origin_controller.rb
 - test/dummy/app/controllers/custom/confirmations_controller.rb
@@ -188,15 +276,15 @@ files:
 - test/dummy/app/controllers/overrides/sessions_controller.rb
 - test/dummy/app/controllers/overrides/token_validations_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/evil_user.rb
-- test/dummy/app/models/lockable_user.rb
-- test/dummy/app/models/mang.rb
-- test/dummy/app/models/nice_user.rb
-- test/dummy/app/models/only_email_user.rb
-- test/dummy/app/models/scoped_user.rb
-- test/dummy/app/models/unconfirmable_user.rb
-- test/dummy/app/models/unregisterable_user.rb
-- test/dummy/app/models/user.rb
+- test/dummy/app/models/concerns/favorite_color.rb
+- test/dummy/app/mongoid/confirmable_user.rb
+- test/dummy/app/mongoid/lockable_user.rb
+- test/dummy/app/mongoid/mang.rb
+- test/dummy/app/mongoid/only_email_user.rb
+- test/dummy/app/mongoid/scoped_user.rb
+- test/dummy/app/mongoid/unconfirmable_user.rb
+- test/dummy/app/mongoid/unregisterable_user.rb
+- test/dummy/app/mongoid/user.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -206,7 +294,6 @@ files:
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/devise.rb
@@ -224,24 +311,32 @@ files:
 - test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
 - test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb
 - test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb
-- test/dummy/db/migrate/20140928231203_devise_token_auth_create_evil_users.rb
 - test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb
 - test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb
-- test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb
 - test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb
 - test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb
 - test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb
+- test/dummy/db/migrate/20190924101113_devise_token_auth_create_confirmable_users.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/migration_database_helper.rb
-- test/dummy/tmp/generators/app/models/user.rb
+- test/dummy/tmp/generators/app/controllers/application_controller.rb
+- test/dummy/tmp/generators/app/models/azpire/v1/human_resource/user.rb
 - test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20171014052631_devise_token_auth_create_users.rb
-- test/integration/navigation_test.rb
+- test/factories/users.rb
+- test/lib/devise_token_auth/blacklist_test.rb
+- test/lib/devise_token_auth/rails/custom_routes_test.rb
+- test/lib/devise_token_auth/rails/routes_test.rb
+- test/lib/devise_token_auth/token_factory_test.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
+- test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb
 - test/lib/generators/devise_token_auth/install_views_generator_test.rb
+- test/models/concerns/mongoid_support_test.rb
+- test/models/concerns/tokens_serialization_test.rb
+- test/models/confirmable_user_test.rb
 - test/models/only_email_user_test.rb
 - test/models/user_test.rb
+- test/support/controllers/routes.rb
 - test/test_helper.rb
 homepage: http://github.com/lynndylanhurley/devise_token_auth
 licenses:
@@ -255,28 +350,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Token based authentication for rails. Uses Devise + OmniAuth.
 test_files:
-- test/dummy/app/models/nice_user.rb
-- test/dummy/app/models/only_email_user.rb
-- test/dummy/app/models/scoped_user.rb
-- test/dummy/app/models/evil_user.rb
-- test/dummy/app/models/mang.rb
-- test/dummy/app/models/unregisterable_user.rb
-- test/dummy/app/models/lockable_user.rb
-- test/dummy/app/models/unconfirmable_user.rb
-- test/dummy/app/models/user.rb
+- test/dummy/app/mongoid/only_email_user.rb
+- test/dummy/app/mongoid/scoped_user.rb
+- test/dummy/app/mongoid/confirmable_user.rb
+- test/dummy/app/mongoid/mang.rb
+- test/dummy/app/mongoid/unregisterable_user.rb
+- test/dummy/app/mongoid/lockable_user.rb
+- test/dummy/app/mongoid/unconfirmable_user.rb
+- test/dummy/app/mongoid/user.rb
+- test/dummy/app/models/concerns/favorite_color.rb
+- test/dummy/app/active_record/only_email_user.rb
+- test/dummy/app/active_record/scoped_user.rb
+- test/dummy/app/active_record/confirmable_user.rb
+- test/dummy/app/active_record/mang.rb
+- test/dummy/app/active_record/unregisterable_user.rb
+- test/dummy/app/active_record/lockable_user.rb
+- test/dummy/app/active_record/unconfirmable_user.rb
+- test/dummy/app/active_record/user.rb
 - test/dummy/app/controllers/overrides/token_validations_controller.rb
 - test/dummy/app/controllers/overrides/omniauth_callbacks_controller.rb
 - test/dummy/app/controllers/overrides/passwords_controller.rb
@@ -311,7 +413,6 @@ test_files:
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/devise.rb
 - test/dummy/config/initializers/omniauth.rb
@@ -326,21 +427,29 @@ test_files:
 - test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb
 - test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb
 - test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb
-- test/dummy/db/migrate/20140928231203_devise_token_auth_create_evil_users.rb
 - test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb
 - test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
 - test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
-- test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb
-- test/dummy/tmp/generators/app/models/user.rb
+- test/dummy/db/migrate/20190924101113_devise_token_auth_create_confirmable_users.rb
+- test/dummy/tmp/generators/app/models/azpire/v1/human_resource/user.rb
+- test/dummy/tmp/generators/app/controllers/application_controller.rb
 - test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20171014052631_devise_token_auth_create_users.rb
 - test/dummy/README.rdoc
-- test/integration/navigation_test.rb
 - test/models/only_email_user_test.rb
+- test/models/confirmable_user_test.rb
+- test/models/concerns/mongoid_support_test.rb
+- test/models/concerns/tokens_serialization_test.rb
 - test/models/user_test.rb
+- test/support/controllers/routes.rb
+- test/factories/users.rb
 - test/lib/devise_token_auth/url_test.rb
+- test/lib/devise_token_auth/blacklist_test.rb
+- test/lib/devise_token_auth/token_factory_test.rb
+- test/lib/devise_token_auth/rails/custom_routes_test.rb
+- test/lib/devise_token_auth/rails/routes_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
 - test/lib/generators/devise_token_auth/install_views_generator_test.rb
+- test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb
 - test/test_helper.rb
 - test/controllers/overrides/token_validations_controller_test.rb
 - test/controllers/overrides/confirmations_controller_test.rb