devise_jwt_auth 0.1.5 → 0.1.6

data/test/dummy/tmp/generators/app/controllers/application_controller.rb

@@ -0,0 +1,6 @@
+            class ApplicationController < ActionController::Base
+        include DeviseJwtAuth::Concerns::SetUserByToken
+              def whatever
+                'whatever'
+              end
+            end

data/test/dummy/tmp/generators/config/initializers/devise_jwt_auth.rb

@@ -6,7 +6,7 @@ DeviseJwtAuth.setup do |config|
   # use the HTTP only refresh cookie that is sent during the authentication
   # process and make refresh token requests.
   # config.send_new_access_token_on_each_request = false
-  
+
   # By default, refresh token HTTP Only cookies last for 2 weeks. These tokens
   # are used for requesting shorter-lived acccess tokens.
   # config.refresh_token_lifespan = 2.weeks
@@ -32,7 +32,7 @@ DeviseJwtAuth.setup do |config|
   # environment variable or secret key base that isn't store in a repository.
   # Also, its a good idea to NOT use the same key for access tokens.
   config.refresh_token_encryption_key = 'your-refresh-token-secret-key-here'
-  
+
   # This is the refresh token encryption key. You should set this in an
   # environment variable or secret key base that isn't store in a repository.
   # Also, its a good idea to NOT use the same key for access tokens.
@@ -70,5 +70,4 @@ DeviseJwtAuth.setup do |config|
   # config.update_token_version_after_password_reset = true
   # config.bypass_sign_in                            = true
   # config.require_client_password_reset_token       = false
-
 end

data/test/factories/users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :user do
     email { Faker::Internet.unique.safe_email }
@@ -13,13 +15,13 @@ FactoryBot.define do
     end
 
     trait :confirmed do
-      after(:create) { |user| user.confirm }
+      after(:create, &:confirm)
     end
 
     # confirmation period is expired
     trait :unconfirmed do
       after(:create) do |user, evaluator|
-        user.update_attribute(:confirmation_sent_at, evaluator.allow_unconfirmed_period - 1.day )
+        user.update_attribute(:confirmation_sent_at, evaluator.allow_unconfirmed_period - 1.day)
       end
     end
 
@@ -29,7 +31,7 @@ FactoryBot.define do
     end
 
     trait :locked do
-      after(:create) { |user| user.lock_access! }
+      after(:create, &:lock_access!)
     end
 
     factory :lockable_user, class: 'LockableUser'

data/test/lib/devise_jwt_auth/token_factory_test.rb

@@ -5,15 +5,15 @@ require 'test_helper'
 class DeviseJwtAuth::TokenFactoryTest < ActiveSupport::TestCase
   describe 'TokenFactory module' do
     let(:tf) { DeviseJwtAuth::TokenFactory }
-    let(:token_regexp) { /^[A-Za-z0-9\-_=]+\.[A-Za-z0-9\-_=]+\.?[A-Za-z0-9\-_.+\/=]*$/ }
-    
+    let(:token_regexp) { %r{^[A-Za-z0-9\-_=]+\.[A-Za-z0-9\-_=]+\.?[A-Za-z0-9\-_.+/=]*$} }
+
     it 'should be defined' do
       assert_equal(tf.present?, true)
       assert_kind_of(Module, tf)
     end
-    
+
     describe 'interface' do
-      let(:payload) { { foo: 'test'} }
+      let(:payload) { { foo: 'test' } }
       let(:future_exp) { (Time.zone.now + 1.hour).to_i }
       let(:past_exp) { (Time.zone.now - 1.hour).to_i }
 
@@ -50,7 +50,7 @@ class DeviseJwtAuth::TokenFactoryTest < ActiveSupport::TestCase
           result = tf.decode_refresh_token(token)
           assert_nil result['exp']
         end
-        
+
         it 'invalidates bogus token' do
           result = tf.decode_refresh_token('bogus token')
           assert_empty result
@@ -91,7 +91,7 @@ class DeviseJwtAuth::TokenFactoryTest < ActiveSupport::TestCase
           result = tf.decode_access_token(token)
           assert_nil result['exp']
         end
-        
+
         it 'invalidates bogus token' do
           result = tf.decode_access_token('bogus token')
           assert_empty result

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

@@ -44,17 +44,6 @@ module DeviseJwtAuth
             assert_migration 'db/migrate/devise_jwt_auth_create_users.rb'
           end
         end
-
-=begin
-        test 'add primary key type with rails 5 when specified in rails generator' do
-          run_generator %w[--primary_key_type=uuid --force]
-          if Rails::VERSION::MAJOR >= 5
-            assert_migration 'db/migrate/devise_jwt_auth_create_users.rb', /create_table\(:users, id: :uuid\) do/
-          else
-            assert_migration 'db/migrate/devise_jwt_auth_create_users.rb', /create_table\(:users\) do/
-          end
-        end
-=end
       end
     end
 
@@ -72,15 +61,12 @@ module DeviseJwtAuth
         case DEVISE_JWT_AUTH_ORM
         when :active_record
           # account for rails version 5
-          active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
+          active_record_needle = Rails::VERSION::MAJOR == 5 ? 'ApplicationRecord' : 'ActiveRecord::Base'
 
           @f = File.open(@fname, 'w') do |f|
             f.write <<-RUBY
               class User < #{active_record_needle}
-
-                def whatever
-                  puts 'whatever'
-                end
+                def whatever; puts 'whatever'; end
               end
             RUBY
           end
@@ -88,10 +74,7 @@ module DeviseJwtAuth
           @f = File.open(@fname, 'w') do |f|
             f.write <<-'RUBY'
               class User
-
-                def whatever
-                  puts 'whatever'
-                end
+                def whatever; puts 'whatever'; end
               end
             RUBY
           end

data/test/lib/generators/devise_jwt_auth/install_generator_with_namespace_test.rb

@@ -14,7 +14,7 @@ module DeviseJwtAuth
     # The namespaced user model for testing
     let(:user_class) { 'Azpire::V1::HumanResource::User' }
     let(:namespace_path) { user_class.underscore }
-    let(:table_name) { user_class.pluralize.underscore.gsub('/','_') }
+    let(:table_name) { user_class.pluralize.underscore.gsub('/', '_') }
 
     describe 'user model with namespace, clean install' do
       setup :prepare_destination
@@ -49,17 +49,6 @@ module DeviseJwtAuth
             assert_migration "db/migrate/devise_jwt_auth_create_#{table_name}.rb"
           end
         end
-
-=begin
-        test 'add primary key type with rails 5 when specified in rails generator' do
-          run_generator %W[#{user_class} auth --primary_key_type=uuid --force]
-          if Rails::VERSION::MAJOR >= 5
-            assert_migration "db/migrate/devise_jwt_auth_create_#{table_name}.rb", /create_table\(:#{table_name}, id: :uuid\) do/
-          else
-            assert_migration "db/migrate/devise_jwt_auth_create_#{table_name}.rb", /create_table\(:#{table_name}\) do/
-          end
-        end
-=end
       end
     end
 
@@ -77,15 +66,12 @@ module DeviseJwtAuth
         case DEVISE_JWT_AUTH_ORM
         when :active_record
           # account for rails version 5
-          active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
+          active_record_needle = Rails::VERSION::MAJOR == 5 ? 'ApplicationRecord' : 'ActiveRecord::Base'
 
           @f = File.open(@fname, 'w') do |f|
             f.write <<-RUBY
               class User < #{active_record_needle}
-
-                def whatever
-                  puts 'whatever'
-                end
+                def whatever; puts 'whatever'; end
               end
             RUBY
           end
@@ -93,10 +79,7 @@ module DeviseJwtAuth
           @f = File.open(@fname, 'w') do |f|
             f.write <<-'RUBY'
               class User
-
-                def whatever
-                  puts 'whatever'
-                end
+                def whatever; puts 'whatever'; end
               end
             RUBY
           end

data/test/models/concerns/tokens_serialization_test.rb

@@ -1,72 +1,72 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 if DEVISE_JWT_AUTH_ORM == :active_record
-=begin
-  describe 'DeviseJwtAuth::Concerns::TokensSerialization' do
-    let(:ts) { DeviseJwtAuth::Concerns::TokensSerialization }
-    let(:user) { FactoryBot.create(:user) }
-    let(:tokens) do
-      # Сreate all possible token's attributes combinations
-      user.create_token
-      2.times { user.create_new_auth_token(user.tokens.first[0]) }
-      user.create_new_auth_token
-      user.create_token
-
-      user.tokens
-    end
-    let(:json) { JSON.generate(tokens) }
-
-    it 'is defined' do
-      assert_equal(ts.present?, true)
-      assert_kind_of(Module, ts)
-    end
-
-    describe '.load(json)' do
-      let(:default) { {} }
-
-      it 'is defined' do
-        assert_respond_to(ts, :load)
-      end
-
-      it 'handles nil' do
-        assert_equal(ts.load(nil), default)
-      end
-
-      it 'handles string' do
-        assert_equal(ts.load(json), JSON.parse(json))
-      end
-
-      it 'returns object of undesirable class' do
-        assert_equal(ts.load([]), [])
-      end
-    end
-
-    describe '.dump(object)' do
-      let(:default) { 'null' }
-
-      it 'is defined' do
-        assert_respond_to(ts, :dump)
-      end
-
-      it 'handles nil' do
-        assert_equal(ts.dump(nil), default)
-      end
-
-      it 'handles empty hash' do
-        assert_equal(ts.dump({}), '{}')
-      end
-
-      it 'deserialize tokens' do
-        assert_equal(ts.dump(tokens), json)
-      end
-
-      it 'removes nil values' do
-        new_tokens = tokens.dup
-        new_tokens[new_tokens.first[0]][:kos] = nil
-
-        assert_equal(ts.dump(tokens), ts.dump(new_tokens))
-      end
-    end
-  end
-=end
+  #   describe 'DeviseJwtAuth::Concerns::TokensSerialization' do
+  #     let(:ts) { DeviseJwtAuth::Concerns::TokensSerialization }
+  #     let(:user) { FactoryBot.create(:user) }
+  #     let(:tokens) do
+  #       # Create all possible token's attributes combinations
+  #       user.create_token
+  #       2.times { user.create_new_auth_token(user.tokens.first[0]) }
+  #       user.create_new_auth_token
+  #       user.create_token
+  #
+  #       user.tokens
+  #     end
+  #     let(:json) { JSON.generate(tokens) }
+  #
+  #     it 'is defined' do
+  #       assert_equal(ts.present?, true)
+  #       assert_kind_of(Module, ts)
+  #     end
+  #
+  #     describe '.load(json)' do
+  #       let(:default) { {} }
+  #
+  #       it 'is defined' do
+  #         assert_respond_to(ts, :load)
+  #       end
+  #
+  #       it 'handles nil' do
+  #         assert_equal(ts.load(nil), default)
+  #       end
+  #
+  #       it 'handles string' do
+  #         assert_equal(ts.load(json), JSON.parse(json))
+  #       end
+  #
+  #       it 'returns object of undesirable class' do
+  #         assert_equal(ts.load([]), [])
+  #       end
+  #     end
+  #
+  #     describe '.dump(object)' do
+  #       let(:default) { 'null' }
+  #
+  #       it 'is defined' do
+  #         assert_respond_to(ts, :dump)
+  #       end
+  #
+  #       it 'handles nil' do
+  #         assert_equal(ts.dump(nil), default)
+  #       end
+  #
+  #       it 'handles empty hash' do
+  #         assert_equal(ts.dump({}), '{}')
+  #       end
+  #
+  #       it 'deserialize tokens' do
+  #         assert_equal(ts.dump(tokens), json)
+  #       end
+  #
+  #       it 'removes nil values' do
+  #         new_tokens = tokens.dup
+  #         new_tokens[new_tokens.first[0]][:kos] = nil
+  #
+  #         assert_equal(ts.dump(tokens), ts.dump(new_tokens))
+  #       end
+  #     end
+  #   end
 end

data/test/models/user_test.rb

@@ -58,43 +58,41 @@ class UserTest < ActiveSupport::TestCase
       end
     end
 
-=begin
-    describe 'token expiry' do
-      before do
-        @resource = create(:user, :confirmed)
-        # TODO: expire this token?
-        @auth_headers = @resource.create_named_token_pair
-
-        # @token     = @auth_headers['access-token']
-        # @client_id = @auth_headers['client']
-      end
-
-      test 'should properly indicate whether token is current' do
-        assert @resource.token_is_current?(@token, @client_id)
-        # we want to update the expiry without forcing a cleanup (see below)
-        @resource.tokens[@client_id]['expiry'] = Time.zone.now.to_i - 10.seconds
-        refute @resource.token_is_current?(@token, @client_id)
-      end
-    end
-
-    describe 'expired tokens are destroyed on save' do
-      before do
-        @resource = create(:user, :confirmed)
-
-        @old_auth_headers = @resource.create_new_auth_token
-        @new_auth_headers = @resource.create_new_auth_token
-        expire_token(@resource, @old_auth_headers['client'])
-      end
-
-      test 'expired token was removed' do
-        refute @resource.tokens[@old_auth_headers[:client]]
-      end
-
-      test 'current token was not removed' do
-        assert @resource.tokens[@new_auth_headers['client']]
-      end
-    end
-=end
+    #     describe 'token expiry' do
+    #       before do
+    #         @resource = create(:user, :confirmed)
+    #         # TODO: expire this token?
+    #         @auth_headers = @resource.create_named_token_pair
+    #
+    #         # @token     = @auth_headers['access-token']
+    #         # @client_id = @auth_headers['client']
+    #       end
+    #
+    #       test 'should properly indicate whether token is current' do
+    #         assert @resource.token_is_current?(@token, @client_id)
+    #         # we want to update the expiry without forcing a cleanup (see below)
+    #         @resource.tokens[@client_id]['expiry'] = Time.zone.now.to_i - 10.seconds
+    #         refute @resource.token_is_current?(@token, @client_id)
+    #       end
+    #     end
+    #
+    #     describe 'expired tokens are destroyed on save' do
+    #       before do
+    #         @resource = create(:user, :confirmed)
+    #
+    #         @old_auth_headers = @resource.create_new_auth_token
+    #         @new_auth_headers = @resource.create_new_auth_token
+    #         expire_token(@resource, @old_auth_headers['client'])
+    #       end
+    #
+    #       test 'expired token was removed' do
+    #         refute @resource.tokens[@old_auth_headers[:client]]
+    #       end
+    #
+    #       test 'current token was not removed' do
+    #         assert @resource.tokens[@new_auth_headers['client']]
+    #       end
+    #     end
 
     describe 'nil tokens are handled properly' do
       before do

data/test/support/controllers/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Module
   include Minitest::Spec::DSL
 end
@@ -31,12 +33,12 @@ module OverridesControllersRoutes
   before do
     Rails.application.routes.draw do
       mount_devise_jwt_auth_for 'User', at: 'evil_user_auth', controllers: {
-        confirmations:      'overrides/confirmations',
-        passwords:          'overrides/passwords',
+        confirmations: 'overrides/confirmations',
+        passwords: 'overrides/passwords',
         omniauth_callbacks: 'overrides/omniauth_callbacks',
-        registrations:      'overrides/registrations',
-        sessions:           'overrides/sessions',
-        refresh_token:      'overrides/refresh_token'
+        registrations: 'overrides/registrations',
+        sessions: 'overrides/sessions',
+        refresh_token: 'overrides/refresh_token'
       }
     end
   end