devise_token_auth 0.1.37 → 0.1.38

data/test/controllers/devise_token_auth/sessions_controller_test.rb

@@ -91,6 +91,21 @@ class DeviseTokenAuth::SessionsControllerTest < ActionController::TestCase
         end
       end
 
+      describe 'header sign_in is supported' do
+        before do
+          request.headers.merge!(
+            'email' => @existing_user.email,
+            'password' => 'secret123')
+
+          xhr :head, :create
+          @data = JSON.parse(response.body)
+        end
+
+        test 'user can sign in using header request' do
+          assert_equal 200, response.status
+        end
+      end
+
       describe 'alt auth keys' do
         before do
           xhr :post, :create, {

data/test/controllers/overrides/passwords_controller_test.rb

@@ -42,7 +42,7 @@ class Overrides::PasswordsControllerTest < ActionDispatch::IntegrationTest
       @override_proof = @qs["override_proof"]
     end
 
-    test 'respones should have success redirect status' do
+    test 'response should have success redirect status' do
       assert_equal 302, response.status
     end
 

data/test/dummy/app/controllers/custom/confirmations_controller.rb

@@ -2,7 +2,7 @@ class Custom::ConfirmationsController < DeviseTokenAuth::ConfirmationsController
 
   def show
     super do |resource|
-      @show_block_called = true
+      @show_block_called = true unless resource.nil?
     end
   end
 

data/test/dummy/app/controllers/custom/omniauth_callbacks_controller.rb

@@ -2,7 +2,7 @@ class Custom::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCallbacksCo
 
   def omniauth_success
     super do |resource|
-      @omniauth_success_block_called = true
+      @omniauth_success_block_called = true unless resource.nil?
     end
   end
 

data/test/dummy/app/controllers/custom/passwords_controller.rb

@@ -2,19 +2,19 @@ class Custom::PasswordsController < DeviseTokenAuth::PasswordsController
 
   def create
     super do |resource|
-      @create_block_called = true
+      @create_block_called = true unless resource.nil?
     end
   end
 
   def edit
     super do |resource|
-      @edit_block_called = true
+      @edit_block_called = true unless resource.nil?
     end
   end
 
   def update
     super do |resource|
-      @update_block_called = true
+      @update_block_called = true unless resource.nil?
     end
   end
 

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

@@ -8,13 +8,13 @@ class Custom::RegistrationsController < DeviseTokenAuth::RegistrationsController
 
   def update
     super do |resource|
-      @update_block_called = true
+      @update_block_called = true unless resource.nil?
     end
   end
 
   def destroy
     super do |resource|
-      @destroy_block_called = true
+      @destroy_block_called = true unless resource.nil?
     end
   end
 

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

@@ -2,13 +2,13 @@ class Custom::SessionsController < DeviseTokenAuth::SessionsController
 
   def create
     super do |resource|
-      @create_block_called = true
+      @create_block_called = true unless resource.nil?
     end
   end
 
   def destroy
     super do |resource|
-      @destroy_block_called = true
+      @destroy_block_called = true unless resource.nil?
     end
   end
 

data/test/dummy/app/controllers/custom/token_validations_controller.rb

@@ -2,7 +2,7 @@ class Custom::TokenValidationsController < DeviseTokenAuth::TokenValidationsCont
 
   def validate_token
     super do |resource|
-      @validate_token_block_called = true
+      @validate_token_block_called = true unless resource.nil?
     end
   end
 

data/test/dummy/app/controllers/demo_user_controller.rb

@@ -9,4 +9,17 @@ class DemoUserController < ApplicationController
       }
     }, status: 200
   end
+
+  def members_only_remove_token
+    u = User.find(current_user.id)
+    u.tokens = {}
+    u.save!
+
+    render json: {
+      data: {
+        message: "Welcome #{current_user.name}",
+        user: current_user
+      }
+    }, status: 200
+  end
 end

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

@@ -14,7 +14,7 @@ module Overrides
           render json: {
             status: 'error',
             errors: @resource.errors
-          }, status: 403
+          }, status: 422
         end
       else
         render json: {

data/test/dummy/config/application.rb

@@ -20,5 +20,7 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.autoload_paths << Rails.root.join('lib')
+
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end

data/test/dummy/config/routes.rb

@@ -56,6 +56,8 @@ Rails.application.routes.draw do
 
   # this route will authorize visitors using the User class
   get 'demo/members_only', to: 'demo_user#members_only'
+  get 'demo/members_only_remove_token', to: 'demo_user#members_only_remove_token'
+
 
   # routes within this block will authorize visitors using the Mang class
   get 'demo/members_only_mang', to: 'demo_mang#members_only'

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

@@ -0,0 +1,7 @@
+class User < ActiveRecord::Base
+  # Include default devise modules.
+  devise :database_authenticatable, :registerable,
+          :recoverable, :rememberable, :trackable, :validatable,
+          :confirmable, :omniauthable
+  include DeviseTokenAuth::Concerns::User
+end

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

@@ -0,0 +1,48 @@
+DeviseTokenAuth.setup do |config|
+  # 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
+  # each request.
+  # config.change_headers_on_each_request = true
+
+  # By default, users will need to re-authenticate after 2 weeks. This setting
+  # determines how long tokens will remain valid after they are issued.
+  # config.token_lifespan = 2.weeks
+
+  # Sets the max number of concurrent devices per user, which is 10 by default.
+  # After this limit is reached, the oldest tokens will be removed.
+  # config.max_number_of_devices = 10
+
+  # Sometimes it's necessary to make several requests to the API at the same
+  # time. In this case, each request in the batch will need to share the same
+  # auth token. This setting determines how far apart the requests can be while
+  # still using the same auth token.
+  # config.batch_request_buffer_throttle = 5.seconds
+
+  # This route will be the prefix for all oauth2 redirect callbacks. For
+  # example, using the default '/omniauth', the github oauth2 provider will
+  # redirect successful authentications to '/omniauth/github/callback'
+  # config.omniauth_prefix = "/omniauth"
+
+  # By default sending current password is not needed for the password update.
+  # Uncomment to enforce current_password param to be checked before all
+  # attribute updates. Set it to :password if you want it to be checked only if
+  # password is updated.
+  # config.check_current_password_before_update = :attributes
+
+  # By default we will use callbacks for single omniauth.
+  # It depends on fields like email, provider and uid.
+  # config.default_callbacks = true
+
+  # Makes it possible to change the headers names
+  # config.headers_names = {:'access-token' => 'access-token',
+  #                        :'client' => 'client',
+  #                        :'expiry' => 'expiry',
+  #                        :'uid' => 'uid',
+  #                        :'token-type' => 'token-type' }
+
+  # By default, only Bearer Token authentication is implemented out of the box.
+  # If, however, you wish to integrate with legacy Devise authentication, you can
+  # do so by enabling this flag. NOTE: This feature is highly experimental!
+  # config.enable_standard_devise_support = false
+end

data/test/dummy/tmp/generators/db/migrate/20160711201448_devise_token_auth_create_users.rb

@@ -0,0 +1,54 @@
+class DeviseTokenAuthCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
+      ## Required
+      t.string :provider, :null => false, :default => "email"
+      t.string :uid, :null => false, :default => ""
+
+      ## Database authenticatable
+      t.string :encrypted_password, :null => false, :default => ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## 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
+
+      ## User Info
+      t.string :name
+      t.string :nickname
+      t.string :image
+      t.string :email
+
+      ## Tokens
+      t.text :tokens
+
+      t.timestamps
+    end
+
+    add_index :users, :email
+    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/lib/devise_token_auth/url_test.rb

@@ -1,28 +1,24 @@
 require 'test_helper'
 
 class DeviseTokenAuth::UrlTest < ActiveSupport::TestCase
-	describe "DeviseTokenAuth::Url#generate" do
-	  test 'URI fragment should appear at the end of URL' do
-	    params = {client_id: 123}
-	    url = 'http://example.com#fragment'
-	    assert_equal DeviseTokenAuth::Url.send(:generate, url, params), "http://example.com?client_id=123#fragment"
-	  end
+  describe "DeviseTokenAuth::Url#generate" do
+    test 'URI fragment should appear at the end of URL' do
+      params = {client_id: 123}
+      url = 'http://example.com#fragment'
+      assert_equal DeviseTokenAuth::Url.send(:generate, url, params), "http://example.com?client_id=123#fragment"
+    end
 
-	  describe 'with existing query params' do
-	  	test 'should preserve existing query params' do
-	      url = 'http://example.com?a=1'
-	      assert_equal DeviseTokenAuth::Url.send(:generate, url), "http://example.com?a=1"
-	    end
+    describe 'with existing query params' do
+      test 'should preserve existing query params' do
+        url = 'http://example.com?a=1'
+        assert_equal DeviseTokenAuth::Url.send(:generate, url), "http://example.com?a=1"
+      end
 
-	    test 'should marge existing query params with new ones' do
-	      params = {client_id: 123}
-	      url = 'http://example.com?a=1'
-	      assert_equal DeviseTokenAuth::Url.send(:generate, url, params), "http://example.com?a=1&client_id=123"
-	    end
-
-
-	  end
-
-
-	end
-end
+      test 'should marge existing query params with new ones' do
+        params = {client_id: 123}
+        url = 'http://example.com?a=1'
+        assert_equal DeviseTokenAuth::Url.send(:generate, url, params), "http://example.com?a=1&client_id=123"
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -55,7 +55,7 @@ class ActiveSupport::TestCase
 end
 
 class ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
     @routes = Dummy::Application.routes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,9 +31,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.2
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +41,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.2
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - app/controllers/devise_token_auth/sessions_controller.rb
 - app/controllers/devise_token_auth/token_validations_controller.rb
 - app/models/devise_token_auth/concerns/user.rb
+- app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb
 - app/validators/email_validator.rb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
@@ -115,6 +116,8 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/ja.yml
+- config/locales/nl.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
@@ -218,8 +221,9 @@ files:
 - test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/migration_database_helper.rb
-- test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb
-- test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb
+- test/dummy/tmp/generators/app/models/user.rb
+- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
+- test/dummy/tmp/generators/db/migrate/20160711201448_devise_token_auth_create_users.rb
 - test/integration/navigation_test.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
@@ -247,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Token based authentication for rails. Uses Devise + OmniAuth.
@@ -335,8 +339,9 @@ test_files:
 - test/dummy/db/schema.rb
 - test/dummy/lib/migration_database_helper.rb
 - test/dummy/README.rdoc
-- test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb
-- test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb
+- test/dummy/tmp/generators/app/models/user.rb
+- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
+- test/dummy/tmp/generators/db/migrate/20160711201448_devise_token_auth_create_users.rb
 - test/integration/navigation_test.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb

data/test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +0,0 @@
-<p><%= t(:welcome).capitalize + ' ' + @email %>!</p>
-
-<p><%= t '.confirm_link_msg' %> </p>
-
-<p><%= link_to t('.confirm_account_link'), confirmation_url(@resource, {confirmation_token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url']}).html_safe %></p>

data/test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,8 +0,0 @@
-<p><%= t(:hello).capitalize %> <%= @resource.email %>!</p>
-
-<p><%= t '.request_reset_link_msg' %></p>
-
-<p><%= link_to t('.password_change_link'), edit_password_url(@resource, reset_password_token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url'].to_s).html_safe %></p>
-
-<p><%= t '.ignore_mail_msg' %></p>
-<p><%= t '.no_changes_msg' %></p>