devise_jwt_auth 0.1.4 → 0.2.0

data/test/dummy/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,189 +12,187 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_09_24_101113) do
-
-  create_table "confirmable_users", force: :cascade do |t|
-    t.string "provider", default: "email", null: false
-    t.string "uid", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.boolean "allow_password_change", default: false
-    t.datetime "remember_created_at"
-    t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string "unconfirmed_email"
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "email"
-    t.text "tokens"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["confirmation_token"], name: "index_confirmable_users_on_confirmation_token", unique: true
-    t.index ["email"], name: "index_confirmable_users_on_email", unique: true
-    t.index ["reset_password_token"], name: "index_confirmable_users_on_reset_password_token", unique: true
-    t.index ["uid", "provider"], name: "index_confirmable_users_on_uid_and_provider", unique: true
+ActiveRecord::Schema.define(version: 20_190_924_101_113) do
+  create_table 'confirmable_users', force: :cascade do |t|
+    t.string 'provider', default: 'email', null: false
+    t.string 'uid', default: '', null: false
+    t.string 'encrypted_password', default: '', null: false
+    t.string 'reset_password_token'
+    t.datetime 'reset_password_sent_at'
+    t.boolean 'allow_password_change', default: false
+    t.datetime 'remember_created_at'
+    t.string 'confirmation_token'
+    t.datetime 'confirmed_at'
+    t.datetime 'confirmation_sent_at'
+    t.string 'unconfirmed_email'
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'email'
+    t.text 'tokens'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.index ['confirmation_token'], name: 'index_confirmable_users_on_confirmation_token', unique: true
+    t.index ['email'], name: 'index_confirmable_users_on_email', unique: true
+    t.index ['reset_password_token'], name: 'index_confirmable_users_on_reset_password_token', unique: true
+    t.index ['uid', 'provider'], name: 'index_confirmable_users_on_uid_and_provider', unique: true
   end
 
-  create_table "lockable_users", force: :cascade do |t|
-    t.string "provider", null: false
-    t.string "uid", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.integer "failed_attempts", default: 0, null: false
-    t.string "unlock_token"
-    t.datetime "locked_at"
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "email"
-    t.text "tokens"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["email"], name: "index_lockable_users_on_email"
-    t.index ["uid", "provider"], name: "index_lockable_users_on_uid_and_provider", unique: true
-    t.index ["unlock_token"], name: "index_lockable_users_on_unlock_token", unique: true
+  create_table 'lockable_users', force: :cascade do |t|
+    t.string 'provider', null: false
+    t.string 'uid', default: '', null: false
+    t.string 'encrypted_password', default: '', null: false
+    t.integer 'failed_attempts', default: 0, null: false
+    t.string 'unlock_token'
+    t.datetime 'locked_at'
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'email'
+    t.text 'tokens'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['email'], name: 'index_lockable_users_on_email'
+    t.index ['uid', 'provider'], name: 'index_lockable_users_on_uid_and_provider', unique: true
+    t.index ['unlock_token'], name: 'index_lockable_users_on_unlock_token', unique: true
   end
 
-  create_table "mangs", force: :cascade do |t|
-    t.string "email"
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.string "reset_password_redirect_url"
-    t.boolean "allow_password_change", default: false
-    t.datetime "remember_created_at"
-    t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string "unconfirmed_email"
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "provider"
-    t.string "uid", default: "", null: false
-    t.text "tokens"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string "favorite_color"
-    t.index ["confirmation_token"], name: "index_mangs_on_confirmation_token", unique: true
-    t.index ["email"], name: "index_mangs_on_email"
-    t.index ["reset_password_token"], name: "index_mangs_on_reset_password_token", unique: true
-    t.index ["uid", "provider"], name: "index_mangs_on_uid_and_provider", unique: true
+  create_table 'mangs', force: :cascade do |t|
+    t.string 'email'
+    t.string 'encrypted_password', default: '', null: false
+    t.string 'reset_password_token'
+    t.datetime 'reset_password_sent_at'
+    t.string 'reset_password_redirect_url'
+    t.boolean 'allow_password_change', default: false
+    t.datetime 'remember_created_at'
+    t.string 'confirmation_token'
+    t.datetime 'confirmed_at'
+    t.datetime 'confirmation_sent_at'
+    t.string 'unconfirmed_email'
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'provider'
+    t.string 'uid', default: '', null: false
+    t.text 'tokens'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.string 'favorite_color'
+    t.index ['confirmation_token'], name: 'index_mangs_on_confirmation_token', unique: true
+    t.index ['email'], name: 'index_mangs_on_email'
+    t.index ['reset_password_token'], name: 'index_mangs_on_reset_password_token', unique: true
+    t.index ['uid', 'provider'], name: 'index_mangs_on_uid_and_provider', unique: true
   end
 
-  create_table "only_email_users", force: :cascade do |t|
-    t.string "provider", null: false
-    t.string "uid", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "email"
-    t.text "tokens"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["email"], name: "index_only_email_users_on_email"
-    t.index ["uid", "provider"], name: "index_only_email_users_on_uid_and_provider", unique: true
+  create_table 'only_email_users', force: :cascade do |t|
+    t.string 'provider', null: false
+    t.string 'uid', default: '', null: false
+    t.string 'encrypted_password', default: '', null: false
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'email'
+    t.text 'tokens'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['email'], name: 'index_only_email_users_on_email'
+    t.index ['uid', 'provider'], name: 'index_only_email_users_on_uid_and_provider', unique: true
   end
 
-  create_table "scoped_users", force: :cascade do |t|
-    t.string "provider", null: false
-    t.string "uid", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.boolean "allow_password_change", default: false
-    t.datetime "remember_created_at"
-    t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string "unconfirmed_email"
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "email"
-    t.text "tokens"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["email"], name: "index_scoped_users_on_email"
-    t.index ["reset_password_token"], name: "index_scoped_users_on_reset_password_token", unique: true
-    t.index ["uid", "provider"], name: "index_scoped_users_on_uid_and_provider", unique: true
+  create_table 'scoped_users', force: :cascade do |t|
+    t.string 'provider', null: false
+    t.string 'uid', default: '', null: false
+    t.string 'encrypted_password', default: '', null: false
+    t.string 'reset_password_token'
+    t.datetime 'reset_password_sent_at'
+    t.boolean 'allow_password_change', default: false
+    t.datetime 'remember_created_at'
+    t.string 'confirmation_token'
+    t.datetime 'confirmed_at'
+    t.datetime 'confirmation_sent_at'
+    t.string 'unconfirmed_email'
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'email'
+    t.text 'tokens'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['email'], name: 'index_scoped_users_on_email'
+    t.index ['reset_password_token'], name: 'index_scoped_users_on_reset_password_token', unique: true
+    t.index ['uid', 'provider'], name: 'index_scoped_users_on_uid_and_provider', unique: true
   end
 
-  create_table "unconfirmable_users", force: :cascade do |t|
-    t.string "provider", null: false
-    t.string "uid", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.boolean "allow_password_change", default: false
-    t.datetime "remember_created_at"
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "email"
-    t.text "tokens"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["email"], name: "index_unconfirmable_users_on_email"
-    t.index ["reset_password_token"], name: "index_unconfirmable_users_on_reset_password_token", unique: true
-    t.index ["uid", "provider"], name: "index_unconfirmable_users_on_uid_and_provider", unique: true
+  create_table 'unconfirmable_users', force: :cascade do |t|
+    t.string 'provider', null: false
+    t.string 'uid', default: '', null: false
+    t.string 'encrypted_password', default: '', null: false
+    t.string 'reset_password_token'
+    t.datetime 'reset_password_sent_at'
+    t.boolean 'allow_password_change', default: false
+    t.datetime 'remember_created_at'
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'email'
+    t.text 'tokens'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['email'], name: 'index_unconfirmable_users_on_email'
+    t.index ['reset_password_token'], name: 'index_unconfirmable_users_on_reset_password_token', unique: true
+    t.index ['uid', 'provider'], name: 'index_unconfirmable_users_on_uid_and_provider', unique: true
   end
 
-  create_table "unregisterable_users", force: :cascade do |t|
-    t.string "provider", null: false
-    t.string "uid", default: "", null: false
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.boolean "allow_password_change", default: false
-    t.datetime "remember_created_at"
-    t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string "unconfirmed_email"
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "email"
-    t.text "tokens"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.index ["email"], name: "index_unregisterable_users_on_email"
-    t.index ["reset_password_token"], name: "index_unregisterable_users_on_reset_password_token", unique: true
-    t.index ["uid", "provider"], name: "index_unregisterable_users_on_uid_and_provider", unique: true
+  create_table 'unregisterable_users', force: :cascade do |t|
+    t.string 'provider', null: false
+    t.string 'uid', default: '', null: false
+    t.string 'encrypted_password', default: '', null: false
+    t.string 'reset_password_token'
+    t.datetime 'reset_password_sent_at'
+    t.boolean 'allow_password_change', default: false
+    t.datetime 'remember_created_at'
+    t.string 'confirmation_token'
+    t.datetime 'confirmed_at'
+    t.datetime 'confirmation_sent_at'
+    t.string 'unconfirmed_email'
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'email'
+    t.text 'tokens'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['email'], name: 'index_unregisterable_users_on_email'
+    t.index ['reset_password_token'], name: 'index_unregisterable_users_on_reset_password_token', unique: true
+    t.index ['uid', 'provider'], name: 'index_unregisterable_users_on_uid_and_provider', unique: true
   end
 
-  create_table "users", force: :cascade do |t|
-    t.string "email"
-    t.string "encrypted_password", default: "", null: false
-    t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.string "reset_password_redirect_url"
-    t.boolean "allow_password_change", default: false
-    t.datetime "remember_created_at"
-    t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string "unconfirmed_email"
-    t.string "name"
-    t.string "nickname"
-    t.string "image"
-    t.string "provider"
-    t.string "uid", default: "", null: false
-    t.text "tokens"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer "operating_thetan"
-    t.string "favorite_color"
-    t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-    t.index ["email"], name: "index_users_on_email"
-    t.index ["nickname"], name: "index_users_on_nickname", unique: true
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-    t.index ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true
+  create_table 'users', force: :cascade do |t|
+    t.string 'email'
+    t.string 'encrypted_password', default: '', null: false
+    t.string 'reset_password_token'
+    t.datetime 'reset_password_sent_at'
+    t.string 'reset_password_redirect_url'
+    t.boolean 'allow_password_change', default: false
+    t.datetime 'remember_created_at'
+    t.string 'confirmation_token'
+    t.datetime 'confirmed_at'
+    t.datetime 'confirmation_sent_at'
+    t.string 'unconfirmed_email'
+    t.string 'name'
+    t.string 'nickname'
+    t.string 'image'
+    t.string 'provider'
+    t.string 'uid', default: '', null: false
+    t.text 'tokens'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.integer 'operating_thetan'
+    t.string 'favorite_color'
+    t.index ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
+    t.index ['email'], name: 'index_users_on_email'
+    t.index ['nickname'], name: 'index_users_on_nickname', unique: true
+    t.index ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+    t.index ['uid', 'provider'], name: 'index_users_on_uid_and_provider', unique: true
   end
-
 end

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

@@ -0,0 +1,8 @@
+              class User < ActiveRecord::Base
+            # Include default devise modules.
+            devise :database_authenticatable, :registerable,
+                    :recoverable, :rememberable, :trackable, :validatable,
+                    :confirmable, :omniauthable
+            include DeviseJwtAuth::Concerns::User
+                def whatever; puts '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
@@ -29,13 +29,13 @@ DeviseJwtAuth.setup do |config|
   # 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.
+  # 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.
   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.
+
+  # 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
@@ -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/dummy/tmp/generators/db/migrate/{20200210193225_devise_jwt_auth_create_azpire_v1_human_resource_users.rb → 20220123023137_devise_jwt_auth_create_users.rb}

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
-class DeviseJwtAuthCreateAzpireV1HumanResourceUsers < ActiveRecord::Migration[6.0]
+class DeviseJwtAuthCreateUsers < ActiveRecord::Migration[6.1]
   def change
-    
-    create_table(:azpire_v1_human_resource_users) do |t|
+    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: ''
 
@@ -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 :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/blacklist_test.rb

@@ -3,9 +3,9 @@
 require 'test_helper'
 
 class DeviseJwtAuth::BlacklistTest < ActiveSupport::TestCase
-  describe Devise::Models::Authenticatable::BLACKLIST_FOR_SERIALIZATION do
+  describe Devise::Models::Authenticatable::UNSAFE_ATTRIBUTES_FOR_SERIALIZATION do
     test 'should include :tokens' do
-      assert Devise::Models::Authenticatable::BLACKLIST_FOR_SERIALIZATION.include?(:tokens)
+      assert Devise::Models::Authenticatable::UNSAFE_ATTRIBUTES_FOR_SERIALIZATION.include?(:tokens)
     end
   end
 end

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 }
 
@@ -44,13 +44,13 @@ class DeviseJwtAuth::TokenFactoryTest < ActiveSupport::TestCase
           result = tf.decode_refresh_token(token)
           assert result['exp'] == future_exp
         end
-
+        
         it 'invalidates expired token' do
           token = tf.create_refresh_token(payload.merge(exp: past_exp))
           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