devise_jwt_auth 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7477d1f078d762ffca1b359a0b487d33816238f9cde0567a9e35731eb323b65e
-  data.tar.gz: ebed2ca767f26b34ccae1cde42ec8c62352f3cbb14a11e2f3f6c2566217b0ee5
+  metadata.gz: a15d74ac0fd5ea01fed0ef24dd71dd28f04391a2467598be4a6738a2f19ca0df
+  data.tar.gz: 527bb191cbf4bf2baf1bdf56fa3e3308da17c012f3dcf8c391d7db47c3903816
 SHA512:
-  metadata.gz: eb35296a86e539a9464bb086a7a2c25802a258f5e9de9f9b9eb177d93f2d0fac20767eed1115a9b9910c67a1e2f806ca16a7cd334356b1e74653ad19015164c5
-  data.tar.gz: df54db926c3e38c54fcf46f284491f13e8b4f5c1be052aebbb2d2ce007139749a67b6c1e91104f39ca6f95c90f355fa168bb32a2879d0c9d83e727b199fe6d6d
+  metadata.gz: 6332f906fd89b8938de3a6c16916805802ac5d04b71e7ef8e437ff00b69b6f12101d929aec8271306029047abaed0de6fa4be061abd13425a019efa1f3aee793
+  data.tar.gz: 4d26f6f3c681ec83d5d0b518d4def8afab6a6c587dbffbbf37ffd690c75c06a7497d3c89f0a217f6a3fcf9545dcb19520b3832fb77e36fe8b1524a627f2179ce

data/app/controllers/devise_jwt_auth/concerns/set_user_by_token.rb

@@ -107,5 +107,11 @@ module DeviseJwtAuth::Concerns::SetUserByToken
     )
   end
   
-  
+  def clear_refresh_token_cookie
+    response.set_cookie(DeviseJwtAuth.refresh_token_name,
+                        value: '',
+                        path: '/auth/refresh_token', # TODO: Use configured auth path
+                        expires: Time.zone.now
+    )
+  end
 end

data/app/controllers/devise_jwt_auth/sessions_controller.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# see http://www.emilsoman.com/blog/2013/05/18/building-a-tested/
 module DeviseJwtAuth
   class SessionsController < DeviseJwtAuth::ApplicationController
     before_action :set_user_by_token, only: [:destroy]
@@ -48,18 +47,13 @@ module DeviseJwtAuth
 
     def destroy
       # TODO: logout? update token version?
-      
+
       # remove auth instance variables so that after_action does not run
       user = remove_instance_variable(:@resource) if @resource
-      # client = @token.client if @token.client
-      # @token.clear!
-
-      if user # && client && user.tokens[client]
-        # user.tokens.delete(client)
-        # user.save!
 
+      if user
         yield user if block_given?
-
+        clear_refresh_token_cookie
         render_destroy_success
       else
         render_destroy_error

data/lib/devise_jwt_auth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeviseJwtAuth
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

data/lib/generators/devise_jwt_auth/install_generator_helpers.rb

@@ -67,6 +67,20 @@ module DeviseJwtAuth
             end
           end
 
+          def ip_column
+            # Padded with spaces so it aligns nicely with the rest of the columns.
+            "%-8s" % (inet? ? "inet" : "string")
+          end
+
+          def inet?
+            postgresql?
+          end
+
+          def postgresql?
+            config = ActiveRecord::Base.configurations[Rails.env]
+            config && config['adapter'] == 'postgresql'
+          end
+
           private
 
           def insert_after_line(filename, line, str)

data/lib/generators/devise_jwt_auth/templates/devise_jwt_auth_create_users.rb.erb

@@ -2,12 +2,18 @@
 
 class DeviseJwtAuthCreate<%= user_class.pluralize.gsub("::","") %> < ActiveRecord::Migration<%= "[#{Rails::VERSION::STRING[0..2]}]" if Rails::VERSION::MAJOR > 4 %>
   def change
-    <% table_name = @user_class.pluralize.gsub("::","").underscore %>
-    create_table(:<%= table_name %><%= primary_key_type %>) do |t|
+    <% table_name = @user_class.pluralize.gsub("::","").underscore -%>
+create_table(:<%= table_name %><%= primary_key_type %>) 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 +25,13 @@ class DeviseJwtAuthCreate<%= user_class.pluralize.gsub("::","") %> < ActiveRecor
       ## 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.<%= ip_column %> :current_sign_in_ip
+      # t.<%= ip_column %> :last_sign_in_ip
+
       ## Confirmable
       t.string   :confirmation_token
       t.datetime :confirmed_at
@@ -30,15 +43,6 @@ class DeviseJwtAuthCreate<%= user_class.pluralize.gsub("::","") %> < ActiveRecor
       # 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
-      <%= json_supported_database? ? 't.json :tokens' : 't.text :tokens' %>
-
       t.timestamps
     end
 

data/lib/generators/devise_jwt_auth/templates/user.rb.erb

@@ -2,8 +2,8 @@
 
 class <%= user_class %> < 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/controllers/devise_jwt_auth/sessions_controller_test.rb

@@ -141,7 +141,8 @@ class DeviseJwtAuth::SessionsControllerTest < ActionController::TestCase
           assert_nil @data[DeviseJwtAuth.access_token_name]
         end
 
-        test 'response should not have refresh token' do
+        test 'response should delete refresh token from client' do
+          assert_equal true, response.cookies.keys.include?(DeviseJwtAuth.refresh_token_name)
           assert_nil response.cookies[DeviseJwtAuth.refresh_token_name]
         end
 
@@ -284,7 +285,6 @@ class DeviseJwtAuth::SessionsControllerTest < ActionController::TestCase
           @data = JSON.parse(response.body)
 
           assert_equal 200, response.status
-          # p 'DATA', @data.inspect
           assert @data[DeviseJwtAuth.access_token_name]
           assert response.cookies[DeviseJwtAuth.refresh_token_name]
         end

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/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/{20200210193225_devise_jwt_auth_create_azpire_v1_human_resource_users.rb → 20200228012905_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/20200228012905_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Aaron A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,20 +64,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         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: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -348,9 +334,12 @@ files:
 - test/dummy/db/migrate/20190924101113_devise_jwt_auth_create_confirmable_users.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/migration_database_helper.rb
-- test/dummy/tmp/generators/app/models/azpire/v1/human_resource/user.rb
+- test/dummy/tmp/generators/app/models/mang.rb
+- test/dummy/tmp/generators/app/models/user.rb
 - test/dummy/tmp/generators/config/initializers/devise_jwt_auth.rb
-- test/dummy/tmp/generators/db/migrate/20200210193225_devise_jwt_auth_create_azpire_v1_human_resource_users.rb
+- test/dummy/tmp/generators/config/routes.rb
+- test/dummy/tmp/generators/db/migrate/20200228012905_devise_jwt_auth_create_mangs.rb
+- test/dummy/tmp/generators/db/migrate/20200228012905_devise_jwt_auth_create_users.rb
 - test/factories/users.rb
 - test/lib/devise_jwt_auth/blacklist_test.rb
 - test/lib/devise_jwt_auth/token_factory_test.rb
@@ -405,9 +394,12 @@ test_files:
 - test/test_helper.rb
 - test/dummy/lib/migration_database_helper.rb
 - test/dummy/config.ru
-- test/dummy/tmp/generators/db/migrate/20200210193225_devise_jwt_auth_create_azpire_v1_human_resource_users.rb
+- test/dummy/tmp/generators/db/migrate/20200228012905_devise_jwt_auth_create_users.rb
+- test/dummy/tmp/generators/db/migrate/20200228012905_devise_jwt_auth_create_mangs.rb
+- test/dummy/tmp/generators/config/routes.rb
 - test/dummy/tmp/generators/config/initializers/devise_jwt_auth.rb
-- test/dummy/tmp/generators/app/models/azpire/v1/human_resource/user.rb
+- test/dummy/tmp/generators/app/models/mang.rb
+- test/dummy/tmp/generators/app/models/user.rb
 - test/dummy/db/migrate/20150708104536_devise_jwt_auth_create_unconfirmable_users.rb
 - test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb
 - test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb