devise_jwt_auth 0.1.2 → 0.1.7

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Mang < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :validatable
+  include DeviseJwtAuth::Concerns::User
+end

data/test/dummy/tmp/generators/app/models/{azpire/v1/human_resource/user.rb → user.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-class Azpire::V1::HumanResource::User < ActiveRecord::Base
+class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable and :omniauthable
+  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+         :recoverable, :rememberable, :validatable
   include DeviseJwtAuth::Concerns::User
 end

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

@@ -5,38 +5,38 @@ DeviseJwtAuth.setup do |config|
   # user. To receive new access tokens, you should either reauthenticate or
   # use the HTTP only refresh cookie that is sent during the authentication
   # process and make refresh token requests.
-  # self.send_new_access_token_on_each_request = false
-  
+  # 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.
-  # self.refresh_token_lifespan = 2.weeks
+  # config.refresh_token_lifespan = 2.weeks
 
   # By default, access tokens last for 15 minutes. These tokens are used to
   # access protected resources. When these tokens expire, you need to
   # reauthenticate the user or use a refresh token cookie to get a new access
   # token.
-  # self.access_token_lifespan = 15.minutes
+  # config.access_token_lifespan = 15.minutes
 
   # This is the name of the HTTP Only cookie that will be sent to the client
   # for the purpose of requesting new access tokens.
-  # self.refresh_token_name = 'refresh-token'
+  # config.refresh_token_name = 'refresh-token'
 
   # This is the name of the token that will be sent in the JSON responses used
   # for accessing protected resources. NEVER store this token in a cookie or
   # any form of local storage on the client. Save it in memory as a javascript
   # variable or in some kind of context manager like Redux. Send it in your
   # request headers when you want to be authenticated.
-  # self.access_token_name = 'access-token'
+  # config.access_token_name = 'access-token'
 
   # 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.
-  self.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.
+  # environment variable or secret key base that isn't stored in a repository.
   # Also, its a good idea to NOT use the same key for access tokens.
-  self.access_token_encryption_key = 'your-access-token-secret-key-here'
+  config.refresh_token_encryption_key = 'your-refresh-token-secret-key-here'
+
+  # This is the access token encryption key. You should set this in an
+  # environment variable or secret key base that isn't stored in a repository.
+  # Also, its a good idea to NOT use the same key for refresh tokens.
+  config.access_token_encryption_key = 'your-access-token-secret-key-here'
 
   # This route will be the prefix for all oauth2 redirect callbacks. For
   # example, using the default '/omniauth', the github oauth2 provider will
@@ -64,11 +64,10 @@ DeviseJwtAuth.setup do |config|
   # config.send_confirmation_email = true
 
   # TODO: Document these settings
-  # self.default_confirm_success_url               = nil
-  # self.default_password_reset_url                = nil
-  # self.redirect_whitelist                        = nil
-  # self.update_token_version_after_password_reset = true
-  # self.bypass_sign_in                            = true
-  # self.require_client_password_reset_token       = false
-
+  # config.default_confirm_success_url               = nil
+  # config.default_password_reset_url                = nil
+  # config.redirect_whitelist                        = nil
+  # config.update_token_version_after_password_reset = true
+  # config.bypass_sign_in                            = true
+  # config.require_client_password_reset_token       = false
 end

data/test/dummy/tmp/generators/config/routes.rb

@@ -0,0 +1,9 @@
+            Rails.application.routes.draw do
+  mount_devise_jwt_auth_for 'User', at: 'auth'
+
+  mount_devise_jwt_auth_for 'Mang', at: 'mangs'
+  as :mang do
+    # Define routes for Mang within this block.
+  end
+              patch '/chong', to: 'bong#index'
+            end

data/test/dummy/tmp/generators/db/migrate/{20200209222205_devise_jwt_auth_create_azpire_v1_human_resource_users.rb → 20201208044024_devise_jwt_auth_create_mangs.rb}

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
-class DeviseJwtAuthCreateAzpireV1HumanResourceUsers < ActiveRecord::Migration[6.0]
+class DeviseJwtAuthCreateMangs < ActiveRecord::Migration[6.0]
   def change
-    
-    create_table(:azpire_v1_human_resource_users) do |t|
+    create_table(:mangs) do |t|
       ## Required
       t.string :provider, null: false, default: 'email'
       t.string :uid, null: false, default: ''
 
+      ## User Info
+      t.string :name
+      t.string :nickname
+      t.string :image
+      t.string :email
+
       ## Database authenticatable
       t.string :encrypted_password, null: false, default: ''
 
@@ -19,6 +24,13 @@ class DeviseJwtAuthCreateAzpireV1HumanResourceUsers < ActiveRecord::Migration[6.
       ## Rememberable
       t.datetime :remember_created_at
 
+      ## Trackable
+      # t.integer  :sign_in_count, default: 0, null: false
+      # t.datetime :current_sign_in_at
+      # t.datetime :last_sign_in_at
+      # t.string   :current_sign_in_ip
+      # t.string   :last_sign_in_ip
+
       ## Confirmable
       t.string   :confirmation_token
       t.datetime :confirmed_at
@@ -30,22 +42,13 @@ class DeviseJwtAuthCreateAzpireV1HumanResourceUsers < ActiveRecord::Migration[6.
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
-      ## User Info
-      t.string :name
-      t.string :nickname
-      t.string :image
-      t.string :email
-
-      ## Tokens
-      t.text :tokens
-
       t.timestamps
     end
 
-    add_index :azpire_v1_human_resource_users, :email,                unique: true
-    add_index :azpire_v1_human_resource_users, [:uid, :provider],     unique: true
-    add_index :azpire_v1_human_resource_users, :reset_password_token, unique: true
-    add_index :azpire_v1_human_resource_users, :confirmation_token,   unique: true
-    # add_index :azpire_v1_human_resource_users, :unlock_token,       unique: true
+    add_index :mangs, :email,                unique: true
+    add_index :mangs, [:uid, :provider],     unique: true
+    add_index :mangs, :reset_password_token, unique: true
+    add_index :mangs, :confirmation_token,   unique: true
+    # add_index :mangs, :unlock_token,       unique: true
   end
 end

data/test/dummy/tmp/generators/db/migrate/20201208044024_devise_jwt_auth_create_users.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class DeviseJwtAuthCreateUsers < ActiveRecord::Migration[6.0]
+  def change
+    create_table(:users) do |t|
+      ## Required
+      t.string :provider, null: false, default: 'email'
+      t.string :uid, null: false, default: ''
+
+      ## User Info
+      t.string :name
+      t.string :nickname
+      t.string :image
+      t.string :email
+
+      ## Database authenticatable
+      t.string :encrypted_password, null: false, default: ''
+
+      ## 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
+
+      ## Trackable
+      # t.integer  :sign_in_count, default: 0, null: false
+      # t.datetime :current_sign_in_at
+      # t.datetime :last_sign_in_at
+      # t.string   :current_sign_in_ip
+      # t.string   :last_sign_in_ip
+
+      ## Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+      t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+      t.timestamps
+    end
+
+    add_index :users, :email,                unique: true
+    add_index :users, [:uid, :provider],     unique: true
+    add_index :users, :reset_password_token, unique: true
+    add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,       unique: true
+  end
+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