devise_token_auth 0.1.37.beta4 → 0.1.37

data/test/controllers/devise_token_auth/omniauth_callbacks_controller_test.rb

@@ -17,7 +17,6 @@ class OmniauthTest < ActionDispatch::IntegrationTest
   end
 
   describe 'success callback' do
-
     setup do
       OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new({
         :provider => 'facebook',
@@ -125,13 +124,11 @@ class OmniauthTest < ActionDispatch::IntegrationTest
     end
 
     describe "oauth registration attr" do
-
       after do
         User.any_instance.unstub(:new_record?)
       end
 
       describe 'with new user' do
-
         before do
           User.any_instance.expects(:new_record?).returns(true).at_least_once
         end
@@ -148,7 +145,6 @@ class OmniauthTest < ActionDispatch::IntegrationTest
       end
 
       describe 'with existing user' do
-
         before do
           User.any_instance.expects(:new_record?).returns(false).at_least_once
         end
@@ -191,7 +187,6 @@ class OmniauthTest < ActionDispatch::IntegrationTest
     end
 
     describe 'with omniauth_window_type=inAppBrowser' do
-
       test 'response contains all expected data' do
         get_success(omniauth_window_type: 'inAppBrowser')
         assert_expected_data_in_new_window
@@ -200,7 +195,6 @@ class OmniauthTest < ActionDispatch::IntegrationTest
     end
 
     describe 'with omniauth_window_type=newWindow' do
-
       test 'response contains all expected data' do
         get_success(omniauth_window_type: 'newWindow')
         assert_expected_data_in_new_window
@@ -216,7 +210,6 @@ class OmniauthTest < ActionDispatch::IntegrationTest
     end
 
     describe 'with omniauth_window_type=sameWindow' do
-
       test 'redirects to auth_origin_url with all expected query params' do
         get_via_redirect '/auth/facebook', {
           auth_origin_url: '/auth_origin',
@@ -247,14 +240,9 @@ class OmniauthTest < ActionDispatch::IntegrationTest
       assert_equal 200, response.status
       @resource = assigns(:resource)
     end
-
-
-
   end
 
   describe 'failure callback' do
-
-
     setup do
       OmniAuth.config.mock_auth[:facebook] = :invalid_credentials
       OmniAuth.config.on_failure = Proc.new { |env|
@@ -280,7 +268,6 @@ class OmniauthTest < ActionDispatch::IntegrationTest
       assert_equal 200, response.status
       assert_select "body", "invalid_credentials"
     end
-
   end
 
   describe 'User with only :database_authenticatable and :registerable included' do

data/test/controllers/devise_token_auth/token_validations_controller_test.rb

@@ -63,4 +63,29 @@ class DeviseTokenAuth::TokenValidationsControllerTest < ActionDispatch::Integrat
     end
 
   end
+
+  describe 'using namespaces with unused resource' do
+
+    before do
+      @resource = scoped_users(:confirmed_email_user)
+      @resource.skip_confirmation!
+      @resource.save!
+
+      @auth_headers = @resource.create_new_auth_token
+
+      @token     = @auth_headers['access-token']
+      @client_id = @auth_headers['client']
+      @expiry    = @auth_headers['expiry']
+
+      # ensure that request is not treated as batch request
+      age_token(@resource, @client_id)
+    end
+
+    test "should be successful" do
+      get '/api_v2/auth/validate_token', {}, @auth_headers
+      assert_equal 200, response.status
+    end
+
+  end
+
 end

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

@@ -6,10 +6,11 @@ class ApplicationController < ActionController::Base
   protected
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:sign_up) << :operating_thetan
-    devise_parameter_sanitizer.for(:sign_up) << :favorite_color
-    devise_parameter_sanitizer.for(:account_update) << :operating_thetan
-    devise_parameter_sanitizer.for(:account_update) << :favorite_color
-    devise_parameter_sanitizer.for(:account_update) << :current_password
+    permitted_parameters = devise_parameter_sanitizer.instance_values['permitted']
+    permitted_parameters[:sign_up] << :operating_thetan
+    permitted_parameters[:sign_up] << :favorite_color
+    permitted_parameters[:account_update] << :operating_thetan
+    permitted_parameters[:account_update] << :favorite_color
+    permitted_parameters[:account_update] << :current_password
   end
 end

data/test/dummy/{tmp/generators/app/models/user.rb → app/models/scoped_user.rb}

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

data/test/dummy/config/routes.rb

@@ -41,6 +41,19 @@ Rails.application.routes.draw do
     end
   end
 
+  # test namespacing with not created devise mapping
+  namespace :api_v2, defaults: { format: :json } do
+    mount_devise_token_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"
+      }
+  end
+
   # this route will authorize visitors using the User class
   get 'demo/members_only', to: 'demo_user#members_only'
 

data/test/dummy/{tmp/generators/db/migrate/20151027080542_devise_token_auth_create_users.rb → db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb}

@@ -1,8 +1,10 @@
-class DeviseTokenAuthCreateUsers < ActiveRecord::Migration
+include MigrationDatabaseHelper
+
+class DeviseTokenAuthCreateScopedUsers < ActiveRecord::Migration
   def change
-    create_table(:users) do |t|
+    create_table(:scoped_users) do |t|
       ## Required
-      t.string :provider, :null => false, :default => "email"
+      t.string :provider, :null => false
       t.string :uid, :null => false, :default => ""
 
       ## Database authenticatable
@@ -40,15 +42,19 @@ class DeviseTokenAuthCreateUsers < ActiveRecord::Migration
       t.string :email
 
       ## Tokens
-      t.text :tokens
+      if json_supported_database?
+        t.json :tokens
+      else
+        t.text :tokens
+      end
 
       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
+    add_index :scoped_users, :email
+    add_index :scoped_users, [:uid, :provider],     :unique => true
+    add_index :scoped_users, :reset_password_token, :unique => true
+    # add_index :scoped_users, :confirmation_token,   :unique => true
+    # add_index :scoped_users, :unlock_token,         :unique => true
   end
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150708104536) do
+ActiveRecord::Schema.define(version: 20160103235141) do
 
   create_table "evil_users", force: :cascade do |t|
     t.string   "email"
@@ -122,6 +122,35 @@ ActiveRecord::Schema.define(version: 20150708104536) do
   add_index "only_email_users", ["email"], name: "index_only_email_users_on_email"
   add_index "only_email_users", ["uid", "provider"], name: "index_only_email_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.datetime "remember_created_at"
+    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"
+    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"
+  end
+
+  add_index "scoped_users", ["email"], name: "index_scoped_users_on_email"
+  add_index "scoped_users", ["reset_password_token"], name: "index_scoped_users_on_reset_password_token", unique: true
+  add_index "scoped_users", ["uid", "provider"], name: "index_scoped_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

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

@@ -0,0 +1,5 @@
+<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

@@ -0,0 +1,8 @@
+<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>

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.37.beta4
+  version: 0.1.37
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +119,8 @@ files:
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
 - config/locales/ru.yml
+- config/locales/zh-HK.yml
+- config/locales/zh-TW.yml
 - lib/devise_token_auth.rb
 - lib/devise_token_auth/controllers/helpers.rb
 - lib/devise_token_auth/controllers/url_helpers.rb
@@ -171,6 +179,7 @@ files:
 - test/dummy/app/models/mang.rb
 - test/dummy/app/models/nice_user.rb
 - test/dummy/app/models/only_email_user.rb
+- test/dummy/app/models/scoped_user.rb
 - test/dummy/app/models/unconfirmable_user.rb
 - test/dummy/app/models/unregisterable_user.rb
 - test/dummy/app/models/user.rb
@@ -206,11 +215,11 @@ files:
 - test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb
 - test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb
 - test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb
+- 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/models/user.rb
-- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20151027080542_devise_token_auth_create_users.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/integration/navigation_test.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
@@ -233,12 +242,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Token based authentication for rails. Uses Devise + OmniAuth.
@@ -286,6 +295,7 @@ test_files:
 - test/dummy/app/models/mang.rb
 - test/dummy/app/models/nice_user.rb
 - test/dummy/app/models/only_email_user.rb
+- test/dummy/app/models/scoped_user.rb
 - test/dummy/app/models/unconfirmable_user.rb
 - test/dummy/app/models/unregisterable_user.rb
 - test/dummy/app/models/user.rb
@@ -321,12 +331,12 @@ test_files:
 - test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb
 - test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb
 - test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb
+- 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/README.rdoc
-- test/dummy/tmp/generators/app/models/user.rb
-- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20151027080542_devise_token_auth_create_users.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/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/config/initializers/devise_token_auth.rb

@@ -1,28 +0,0 @@
-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
-
-  # 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 defult 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
-end