devise_jwt_auth 0.1.4 → 0.2.0

data/test/dummy/app/controllers/overrides/refresh_token_controller.rb

@@ -2,7 +2,7 @@
 
 module Overrides
   class RefreshTokenController < DeviseJwtAuth::RefreshTokenController
-    OVERRIDE_PROOF = '(^^,)'.freeze
+    OVERRIDE_PROOF = '(^^,)'
     def show
       # @resource will have been set by set_user_by_token concern
       if @resource

data/test/dummy/app/controllers/overrides/registrations_controller.rb

@@ -2,14 +2,14 @@
 
 module Overrides
   class RegistrationsController < DeviseJwtAuth::RegistrationsController
-    OVERRIDE_PROOF = '(^^,)'.freeze
+    OVERRIDE_PROOF = '(^^,)'
 
     def update
       if @resource
         if @resource.update(account_update_params)
           render json: {
             status: 'success',
-            data:   @resource.as_json,
+            data: @resource.as_json,
             override_proof: OVERRIDE_PROOF
           }
         else

data/test/dummy/app/controllers/overrides/sessions_controller.rb

@@ -2,7 +2,7 @@
 
 module Overrides
   class SessionsController < DeviseJwtAuth::SessionsController
-    OVERRIDE_PROOF = '(^^,)'.freeze
+    OVERRIDE_PROOF = '(^^,)'
 
     def create
       @resource = resource_class.dta_find_by(email: resource_params[:email])
@@ -16,7 +16,7 @@ module Overrides
           override_proof: OVERRIDE_PROOF
         }.merge(auth_header)
 
-      elsif @resource && (not @resource.confirmed?)
+      elsif @resource && !@resource.confirmed?
         render json: {
           success: false,
           errors: [

data/test/dummy/app/models/concerns/favorite_color.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FavoriteColor
   extend ActiveSupport::Concern
 
@@ -5,15 +7,15 @@ module FavoriteColor
     validates :operating_thetan, numericality: true, allow_nil: true
     validate :ensure_correct_favorite_color
   end
-  
+
   def ensure_correct_favorite_color
-    if favorite_color && (favorite_color != '')
-      unless ApplicationHelper::COLOR_NAMES.any?{ |s| s.casecmp(favorite_color)==0 }
-        matches = ApplicationHelper::COLOR_SEARCH.search(favorite_color)
-        closest_match = matches.last[:string]
-        second_closest_match = matches[-2][:string]
-        errors.add(:favorite_color, "We've never heard of the color \"#{favorite_color}\". Did you mean \"#{closest_match}\"? Or perhaps \"#{second_closest_match}\"?")
-      end
-    end
+    return unless favorite_color && (favorite_color != '')
+
+    return if ApplicationHelper::COLOR_NAMES.any? { |s| s.casecmp(favorite_color).zero? }
+
+    matches = ApplicationHelper::COLOR_SEARCH.search(favorite_color)
+    closest_match = matches.last[:string]
+    second_closest_match = matches[-2][:string]
+    errors.add(:favorite_color, "We've never heard of the color \"#{favorite_color}\". Did you mean \"#{closest_match}\"? Or perhaps \"#{second_closest_match}\"?")
   end
 end

data/test/dummy/config/application.rb

@@ -19,6 +19,7 @@ begin
     require 'mongoid-locker'
   end
 rescue LoadError
+  raise StandardError, 'Unsupported ORM'
 end
 
 require 'devise_jwt_auth'

data/test/dummy/config/boot.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 unless defined?(DEVISE_JWT_AUTH_ORM)
-  DEVISE_JWT_AUTH_ORM = (ENV["DEVISE_JWT_AUTH_ORM"] || :active_record).to_sym
+  DEVISE_JWT_AUTH_ORM = (ENV['DEVISE_JWT_AUTH_ORM'] || :active_record).to_sym
 end
 
 # Set up gems listed in the Gemfile.

data/test/dummy/config/environments/development.rb

@@ -19,7 +19,7 @@ Rails.application.configure do
   config.action_mailer.raise_delivery_errors = true
 
   # use mailcatcher for development
-  config.action_mailer.default_url_options = { host: 'devise-token-auth.dev' }
+  config.action_mailer.default_url_options = { host: 'devise-jwt-auth.dev' }
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 }
 
@@ -42,5 +42,5 @@ Rails.application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  OmniAuth.config.full_host = 'http://devise-token-auth.dev'
+  OmniAuth.config.full_host = 'http://devise-jwt-auth.dev'
 end

data/test/dummy/config/environments/test.rb

@@ -15,13 +15,17 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  Rails::VERSION::MAJOR == 5 ?
-      (config.public_file_server.enabled = true) :
-      (config.serve_static_files  = true)
-
-  Rails::VERSION::MAJOR == 5 ?
-      (config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }) :
-      (config.static_cache_control = 'public, max-age=3600')
+  if Rails::VERSION::MAJOR == 5
+    (config.public_file_server.enabled = true)
+  else
+    (config.serve_static_files = true)
+  end
+
+  if Rails::VERSION::MAJOR == 5
+    (config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' })
+  else
+    (config.static_cache_control = 'public, max-age=3600')
+  end
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 DeviseJwtAuth.setup do |config|
+  # TODO: Remove old config settings from DTA.
   # By default the authorization headers will change after each request. The
   # client is responsible for keeping track of the changing tokens. Change
   # this to false to prevent the Authorization header from changing after

data/test/dummy/config/initializers/figaro.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-#Figaro.require("GITHUB_KEY", "GITHUB_SECRET", "FACEBOOK_KEY", "FACEBOOK_SECRET", "GOOGLE_KEY", "GOOGLE_SECRET", "APPLE_CLIENT_ID", "APPLE_TEAM_ID", "APPLE_KEY", "APPLE_PEM")
+# Figaro.require("GITHUB_KEY", "GITHUB_SECRET", "FACEBOOK_KEY", "FACEBOOK_SECRET", "GOOGLE_KEY", "GOOGLE_SECRET", "APPLE_CLIENT_ID", "APPLE_TEAM_ID", "APPLE_KEY", "APPLE_PEM")

data/test/dummy/config/initializers/omniauth.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-Rails.application.config.middleware.use OmniAuth::Builder do |b|
-  provider :github,        ENV['GITHUB_KEY'],   ENV['GITHUB_SECRET'],   scope: 'email,profile'
+Rails.application.config.middleware.use OmniAuth::Builder do |_b|
+  provider :github,        ENV['GITHUB_KEY'],   ENV['GITHUB_SECRET'], scope: 'email,profile'
   provider :facebook,      ENV['FACEBOOK_KEY'], ENV['FACEBOOK_SECRET']
   provider :google_oauth2, ENV['GOOGLE_KEY'],   ENV['GOOGLE_SECRET']
   provider :apple,         ENV['APPLE_CLIENT_ID'], '', { scope: 'email name', team_id: ENV['APPLE_TEAM_ID'], key_id: ENV['APPLE_KEY'], pem: ENV['APPLE_PEM'] }

data/test/dummy/config/routes.rb

@@ -32,14 +32,14 @@ Rails.application.routes.draw do
   # test namespacing with not created devise mapping
   namespace :api_v2, defaults: { format: :json } do
     mount_devise_jwt_auth_for 'ScopedUser',
-                                at:          'auth',
-                                controllers: {
-                                  omniauth_callbacks: 'api_v2/omniauth_callbacks',
-                                  sessions:           'api_v2/sessions',
-                                  registrations:      'api_v2/registrations',
-                                  confirmations:      'api_v2/confirmations',
-                                  passwords:          'api_v2/passwords'
-                                }
+                              at: 'auth',
+                              controllers: {
+                                omniauth_callbacks: 'api_v2/omniauth_callbacks',
+                                sessions: 'api_v2/sessions',
+                                registrations: 'api_v2/registrations',
+                                confirmations: 'api_v2/confirmations',
+                                passwords: 'api_v2/passwords'
+                              }
   end
 
   # this route will authorize visitors using the User class
@@ -54,4 +54,6 @@ Rails.application.routes.draw do
 
   # we need a route for omniauth_callback_controller to redirect to in sameWindow case
   get 'auth_origin', to: 'auth_origin#redirected'
+
+  # get 'omniauth/facebook', to: 'omni#facebook'
 end

data/test/dummy/config.ru

@@ -2,7 +2,7 @@
 
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('config/environment', __dir__)
 run Rails.application
 
 # allow cross origin requests
@@ -12,7 +12,7 @@ use Rack::Cors do
     origins '*'
     resource '*',
              headers: :any,
-             expose: ['access-token', 'expiry', 'token-type', 'uid', 'client'],
+             expose: %w[access-token],
              methods: %i[get post options delete put]
   end
 end

data/test/dummy/db/migrate/20141222035835_devise_jwt_auth_create_only_email_users.rb

@@ -13,17 +13,17 @@ class DeviseJwtAuthCreateOnlyEmailUsers < ActiveRecord::Migration[4.2]
       t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
-      #t.string   :reset_password_token
-      #t.datetime :reset_password_sent_at
+      # t.string   :reset_password_token
+      # t.datetime :reset_password_sent_at
 
       ## Rememberable
-      #t.datetime :remember_created_at
+      # t.datetime :remember_created_at
 
       ## Confirmable
-      #t.string   :confirmation_token
-      #t.datetime :confirmed_at
-      #t.datetime :confirmation_sent_at
-      #t.string   :unconfirmed_email # Only if using reconfirmable
+      # 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
@@ -47,8 +47,8 @@ class DeviseJwtAuthCreateOnlyEmailUsers < ActiveRecord::Migration[4.2]
     end
 
     add_index :only_email_users, :email
-    add_index :only_email_users, [:uid, :provider],     unique: true
-    #add_index :only_email_users, :reset_password_token, :unique => true
+    add_index :only_email_users, [:uid, :provider], unique: true
+    # add_index :only_email_users, :reset_password_token, :unique => true
     # add_index :only_email_users, :confirmation_token,   :unique => true
     # add_index :only_email_users, :unlock_token,         :unique => true
   end

data/test/dummy/db/migrate/20190924101113_devise_jwt_auth_create_confirmable_users.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 class DeviseJwtAuthCreateConfirmableUsers < ActiveRecord::Migration[5.2]
   def change
-    
     create_table(:confirmable_users) do |t|
       ## Required
-      t.string :provider, :null => false, :default => "email"
-      t.string :uid, :null => false, :default => ""
+      t.string :provider, null: false, default: 'email'
+      t.string :uid, null: false, default: ''
 
       ## Database authenticatable
-      t.string :encrypted_password, :null => false, :default => ""
+      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
+      t.boolean  :allow_password_change, default: false
 
       ## Rememberable
       t.datetime :remember_created_at