devise_token_auth 0.1.42 → 0.1.43.beta1

data/test/dummy/tmp/generators/app/models/user.rb

@@ -1,4 +1,4 @@
-            class User < ActiveRecord::Base
+            class User < ApplicationRecord
   # Include default devise modules.
   devise :database_authenticatable, :registerable,
           :recoverable, :rememberable, :trackable, :validatable,

data/test/dummy/tmp/generators/db/migrate/{20170517171822_devise_token_auth_create_users.rb → 20171014052631_devise_token_auth_create_users.rb}

@@ -1,4 +1,4 @@
-class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[4.2]
+class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[5.1]
   def change
     create_table(:users) do |t|
       ## Required
@@ -11,6 +11,7 @@ class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[4.2]
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at

data/test/lib/generators/devise_token_auth/install_generator_test.rb

@@ -29,7 +29,11 @@ module DeviseTokenAuth
       end
 
       test 'migration file contains rails version' do
-        assert_migration 'db/migrate/devise_token_auth_create_users.rb', /#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}/
+        if Rails::VERSION::MAJOR >= 5
+          assert_migration 'db/migrate/devise_token_auth_create_users.rb', /#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}/
+        else
+          assert_migration 'db/migrate/devise_token_auth_create_users.rb'
+        end
       end
 
       test 'subsequent runs raise no errors' do

data/test/models/user_test.rb

@@ -65,7 +65,7 @@ class UserTest < ActiveSupport::TestCase
         @resource.password_confirmation = @password
 
         assert @resource.save
-        refute @resource.errors.messages[:email]
+        assert @resource.errors.messages[:email].blank?
       end
     end
 
@@ -89,6 +89,40 @@ class UserTest < ActiveSupport::TestCase
       end
     end
 
+    describe 'user specific token lifespan' do
+      before do
+        @resource = users(:confirmed_email_user)
+        @resource.skip_confirmation!
+        @resource.save!
+
+        auth_headers = @resource.create_new_auth_token
+        @token_global     = auth_headers['access-token']
+        @client_id_global = auth_headers['client']
+
+        def @resource.token_lifespan
+          1.minute
+        end
+
+        auth_headers = @resource.create_new_auth_token
+        @token_specific     = auth_headers['access-token']
+        @client_id_specific = auth_headers['client']
+      end
+
+      test 'works per user' do
+        assert @resource.token_is_current?(@token_global, @client_id_global)
+
+        time = Time.now.to_i
+        expiry_global = @resource.tokens[@client_id_global]['expiry']
+
+        assert expiry_global > time + DeviseTokenAuth.token_lifespan - 5.seconds
+        assert expiry_global < time + DeviseTokenAuth.token_lifespan + 5.seconds
+
+        expiry_specific = @resource.tokens[@client_id_specific]['expiry']
+        assert expiry_specific > time + 55.seconds
+        assert expiry_specific < time + 65.seconds
+      end
+    end
+
     describe 'expired tokens are destroyed on save' do
       before do
         @resource = users(:confirmed_email_user)

data/test/test_helper.rb

@@ -1,31 +1,37 @@
 require 'simplecov'
 
-#SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  #SimpleCov::Formatter::HTMLFormatter,
-  #CodeClimate::TestReporter::Formatter
-#]
+# SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+#   SimpleCov::Formatter::HTMLFormatter,
+#   CodeClimate::TestReporter::Formatter
+# ]
 
 SimpleCov.start 'rails'
 
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path("../dummy/config/environment", __FILE__)
-require "rails/test_help"
-require "minitest/rails"
+require File.expand_path('../dummy/config/environment', __FILE__)
+require 'rails/test_help'
+require 'minitest/rails'
 
 # 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"
 
 # Uncomment for awesome colorful output
-require "minitest/pride"
+# require "minitest/pride"
 
-ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-ActionDispatch::IntegrationTest.fixture_path = File.expand_path("../fixtures", __FILE__)
+ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
+ActionDispatch::IntegrationTest.fixture_path = File.expand_path('../fixtures', __FILE__)
 
 # I hate the default reporter. Use ProgressReporter instead.
 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new
 
+class ActionDispatch::IntegrationTest
+  def follow_all_redirects!
+    follow_redirect! while response.status.to_s =~ /^3\d{2}/
+  end
+end
+
 class ActiveSupport::TestCase
   ActiveRecord::Migration.check_pending!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.43.beta1
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,9 +31,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.2
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +41,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.2
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/devise_token_auth/application_controller.rb
+- app/controllers/devise_token_auth/concerns/resource_finder.rb
 - app/controllers/devise_token_auth/concerns/set_user_by_token.rb
 - app/controllers/devise_token_auth/confirmations_controller.rb
 - app/controllers/devise_token_auth/omniauth_callbacks_controller.rb
@@ -104,6 +105,7 @@ files:
 - app/controllers/devise_token_auth/registrations_controller.rb
 - 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/user.rb
 - app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb
 - app/validators/email_validator.rb
@@ -112,6 +114,7 @@ files:
 - 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
@@ -157,6 +160,7 @@ files:
 - test/controllers/devise_token_auth/registrations_controller_test.rb
 - test/controllers/devise_token_auth/sessions_controller_test.rb
 - test/controllers/devise_token_auth/token_validations_controller_test.rb
+- test/controllers/devise_token_auth/unlocks_controller_test.rb
 - test/controllers/overrides/confirmations_controller_test.rb
 - test/controllers/overrides/omniauth_callbacks_controller_test.rb
 - test/controllers/overrides/passwords_controller_test.rb
@@ -229,7 +233,7 @@ files:
 - test/dummy/lib/migration_database_helper.rb
 - test/dummy/tmp/generators/app/models/user.rb
 - test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20170517171822_devise_token_auth_create_users.rb
+- test/dummy/tmp/generators/db/migrate/20171014052631_devise_token_auth_create_users.rb
 - test/integration/navigation_test.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
@@ -252,108 +256,109 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Token based authentication for rails. Uses Devise + OmniAuth.
 test_files:
-- test/controllers/custom/custom_confirmations_controller_test.rb
-- test/controllers/custom/custom_omniauth_callbacks_controller_test.rb
-- test/controllers/custom/custom_passwords_controller_test.rb
-- test/controllers/custom/custom_registrations_controller_test.rb
-- test/controllers/custom/custom_sessions_controller_test.rb
-- test/controllers/custom/custom_token_validations_controller_test.rb
-- test/controllers/demo_group_controller_test.rb
-- test/controllers/demo_mang_controller_test.rb
-- test/controllers/demo_user_controller_test.rb
-- test/controllers/devise_token_auth/confirmations_controller_test.rb
-- test/controllers/devise_token_auth/omniauth_callbacks_controller_test.rb
-- test/controllers/devise_token_auth/passwords_controller_test.rb
-- test/controllers/devise_token_auth/registrations_controller_test.rb
-- test/controllers/devise_token_auth/sessions_controller_test.rb
-- test/controllers/devise_token_auth/token_validations_controller_test.rb
-- test/controllers/overrides/confirmations_controller_test.rb
-- test/controllers/overrides/omniauth_callbacks_controller_test.rb
-- test/controllers/overrides/passwords_controller_test.rb
-- test/controllers/overrides/registrations_controller_test.rb
-- test/controllers/overrides/sessions_controller_test.rb
-- test/controllers/overrides/token_validations_controller_test.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/auth_origin_controller.rb
-- test/dummy/app/controllers/custom/confirmations_controller.rb
-- test/dummy/app/controllers/custom/omniauth_callbacks_controller.rb
-- test/dummy/app/controllers/custom/passwords_controller.rb
-- test/dummy/app/controllers/custom/registrations_controller.rb
-- test/dummy/app/controllers/custom/sessions_controller.rb
-- test/dummy/app/controllers/custom/token_validations_controller.rb
-- test/dummy/app/controllers/demo_group_controller.rb
-- test/dummy/app/controllers/demo_mang_controller.rb
-- test/dummy/app/controllers/demo_user_controller.rb
-- test/dummy/app/controllers/overrides/confirmations_controller.rb
-- test/dummy/app/controllers/overrides/omniauth_callbacks_controller.rb
-- test/dummy/app/controllers/overrides/passwords_controller.rb
-- test/dummy/app/controllers/overrides/registrations_controller.rb
-- 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/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/controllers/overrides/token_validations_controller.rb
+- test/dummy/app/controllers/overrides/omniauth_callbacks_controller.rb
+- test/dummy/app/controllers/overrides/passwords_controller.rb
+- test/dummy/app/controllers/overrides/sessions_controller.rb
+- test/dummy/app/controllers/overrides/confirmations_controller.rb
+- test/dummy/app/controllers/overrides/registrations_controller.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/demo_user_controller.rb
+- test/dummy/app/controllers/auth_origin_controller.rb
+- test/dummy/app/controllers/demo_mang_controller.rb
+- test/dummy/app/controllers/demo_group_controller.rb
+- test/dummy/app/controllers/custom/token_validations_controller.rb
+- test/dummy/app/controllers/custom/omniauth_callbacks_controller.rb
+- test/dummy/app/controllers/custom/passwords_controller.rb
+- test/dummy/app/controllers/custom/sessions_controller.rb
+- test/dummy/app/controllers/custom/confirmations_controller.rb
+- test/dummy/app/controllers/custom/registrations_controller.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/application.yml.bk
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
+- test/dummy/config/spring.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/application.yml.bk
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/devise.rb
 - test/dummy/config/initializers/devise_token_auth.rb
-- test/dummy/config/initializers/figaro.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/omniauth.rb
+- 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/routes.rb
-- test/dummy/config/spring.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
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/figaro.rb
 - test/dummy/config.ru
-- test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
-- test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
+- test/dummy/lib/migration_database_helper.rb
+- test/dummy/db/schema.rb
+- test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.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/20141222035835_devise_token_auth_create_only_email_users.rb
 - test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb
-- test/dummy/db/schema.rb
-- test/dummy/lib/migration_database_helper.rb
-- test/dummy/README.rdoc
+- 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/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20170517171822_devise_token_auth_create_users.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/user_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_views_generator_test.rb
-- test/models/only_email_user_test.rb
-- test/models/user_test.rb
 - test/test_helper.rb
+- test/controllers/overrides/token_validations_controller_test.rb
+- test/controllers/overrides/confirmations_controller_test.rb
+- test/controllers/overrides/registrations_controller_test.rb
+- test/controllers/overrides/omniauth_callbacks_controller_test.rb
+- test/controllers/overrides/sessions_controller_test.rb
+- test/controllers/overrides/passwords_controller_test.rb
+- test/controllers/demo_mang_controller_test.rb
+- test/controllers/devise_token_auth/token_validations_controller_test.rb
+- test/controllers/devise_token_auth/confirmations_controller_test.rb
+- test/controllers/devise_token_auth/unlocks_controller_test.rb
+- test/controllers/devise_token_auth/registrations_controller_test.rb
+- test/controllers/devise_token_auth/omniauth_callbacks_controller_test.rb
+- test/controllers/devise_token_auth/sessions_controller_test.rb
+- test/controllers/devise_token_auth/passwords_controller_test.rb
+- test/controllers/demo_user_controller_test.rb
+- test/controllers/custom/custom_omniauth_callbacks_controller_test.rb
+- test/controllers/custom/custom_sessions_controller_test.rb
+- test/controllers/custom/custom_confirmations_controller_test.rb
+- test/controllers/custom/custom_token_validations_controller_test.rb
+- test/controllers/custom/custom_registrations_controller_test.rb
+- test/controllers/custom/custom_passwords_controller_test.rb
+- test/controllers/demo_group_controller_test.rb