devise_token_auth 0.1.30.beta3 → 0.1.30.beta4

data/app/models/devise_token_auth/concerns/user.rb

@@ -11,6 +11,7 @@ module DeviseTokenAuth::Concerns::User
     serialize :tokens, JSON
 
     validates_presence_of :email, if: Proc.new { |u| u.provider == 'email' }
+    validates_presence_of :uid
 
     # only validate unique emails among email registration users
     validate :unique_email_user, on: :create

data/app/views/devise_token_auth/omniauth_success.html.erb

@@ -1,4 +1,4 @@
-<% @user.as_json.each do |attr, val| %>
+<% @resource.as_json.each do |attr, val| %>
   "<%= attr %>": "<%= val %>",
 <% end %>
 

data/lib/devise_token_auth/version.rb

@@ -1,3 +1,3 @@
 module DeviseTokenAuth
-  VERSION = "0.1.30.beta3"
+  VERSION = "0.1.30.beta4"
 end

data/lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb.erb

@@ -1,8 +1,11 @@
 class DeviseTokenAuthCreate<%= user_class.pluralize %> < ActiveRecord::Migration
   def change
     create_table(:<%= user_class.pluralize.underscore %>) do |t|
+      ## Required
+      t.string :provider, :null => false
+      t.string :uid, :null => false, :default => ""
+
       ## Database authenticatable
-      t.string :email
       t.string :encrypted_password, :null => false, :default => ""
 
       ## Recoverable
@@ -34,10 +37,7 @@ class DeviseTokenAuthCreate<%= user_class.pluralize %> < ActiveRecord::Migration
       t.string :name
       t.string :nickname
       t.string :image
-
-      ## unique oauth id
-      t.string :provider
-      t.string :uid, :null => false, :default => ""
+      t.string :email
 
       ## Tokens
       t.text :tokens
@@ -46,7 +46,7 @@ class DeviseTokenAuthCreate<%= user_class.pluralize %> < ActiveRecord::Migration
     end
 
     add_index :<%= user_class.pluralize.underscore %>, :email
-    add_index :<%= user_class.pluralize.underscore %>, :uid,                  :unique => true
+    add_index :<%= user_class.pluralize.underscore %>, [:uid, :provider],     :unique => true
     add_index :<%= user_class.pluralize.underscore %>, :reset_password_token, :unique => true
     # add_index :<%= user_class.pluralize.underscore %>, :confirmation_token,   :unique => true
     # add_index :<%= user_class.pluralize.underscore %>, :unlock_token,         :unique => true

data/test/controllers/demo_group_controller_test.rb

@@ -11,15 +11,15 @@ class DemoGroupControllerTest < ActionDispatch::IntegrationTest
     describe "Token access" do
       before do
         # user
-        @user = users(:confirmed_email_user)
-        @user.skip_confirmation!
-        @user.save!
+        @resource = users(:confirmed_email_user)
+        @resource.skip_confirmation!
+        @resource.save!
 
-        @user_auth_headers = @user.create_new_auth_token
+        @resource_auth_headers = @resource.create_new_auth_token
 
-        @user_token     = @user_auth_headers['access-token']
-        @user_client_id = @user_auth_headers['client']
-        @user_expiry    = @user_auth_headers['expiry']
+        @resource_token     = @resource_auth_headers['access-token']
+        @resource_client_id = @resource_auth_headers['client']
+        @resource_expiry    = @resource_auth_headers['expiry']
 
         # mang
         @mang = mangs(:confirmed_email_user)
@@ -36,9 +36,9 @@ class DemoGroupControllerTest < ActionDispatch::IntegrationTest
       describe 'user access' do
         before do
           # ensure that request is not treated as batch request
-          age_token(@user, @user_client_id)
+          age_token(@resource, @resource_client_id)
 
-          get '/demo/members_only_group', {}, @user_auth_headers
+          get '/demo/members_only_group', {}, @resource_auth_headers
 
           @resp_token       = response.headers['access-token']
           @resp_client_id   = response.headers['client']
@@ -52,7 +52,7 @@ class DemoGroupControllerTest < ActionDispatch::IntegrationTest
 
         describe 'devise mappings' do
           it 'should define current_user' do
-            assert_equal @user, @controller.current_user
+            assert_equal @resource, @controller.current_user
           end
 
           it 'should define user_signed_in?' do
@@ -60,19 +60,19 @@ class DemoGroupControllerTest < ActionDispatch::IntegrationTest
           end
 
           it 'should not define current_mang' do
-            refute_equal @user, @controller.current_mang
+            refute_equal @resource, @controller.current_mang
           end
 
           it 'should define current_member' do
-            assert_equal @user, @controller.current_member
+            assert_equal @resource, @controller.current_member
           end
 
           it 'should define current_members' do
-            assert @controller.current_members.include? @user
+            assert @controller.current_members.include? @resource
           end
 
           it 'should define member_signed_in?' do
-            assert @controller.current_members.include? @user
+            assert @controller.current_members.include? @resource
           end
         end
       end

data/test/controllers/demo_mang_controller_test.rb

@@ -10,11 +10,11 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
   describe DemoMangController do
     describe "Token access" do
       before do
-        @user = mangs(:confirmed_email_user)
-        @user.skip_confirmation!
-        @user.save!
+        @resource = mangs(:confirmed_email_user)
+        @resource.skip_confirmation!
+        @resource.save!
 
-        @auth_headers = @user.create_new_auth_token
+        @auth_headers = @resource.create_new_auth_token
 
         @token     = @auth_headers['access-token']
         @client_id = @auth_headers['client']
@@ -24,7 +24,7 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
       describe 'successful request' do
         before do
           # ensure that request is not treated as batch request
-          age_token(@user, @client_id)
+          age_token(@resource, @client_id)
 
           get '/demo/members_only_mang', {}, @auth_headers
 
@@ -36,7 +36,7 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
 
         describe 'devise mappings' do
           it 'should define current_mang' do
-            assert_equal @user, @controller.current_mang
+            assert_equal @resource, @controller.current_mang
           end
 
           it 'should define mang_signed_in?' do
@@ -44,7 +44,7 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
           end
 
           it 'should not define current_user' do
-            refute_equal @user, @controller.current_user
+            refute_equal @resource, @controller.current_user
           end
         end
 
@@ -61,7 +61,7 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
         end
 
         it "should return the user's uid in the auth header" do
-          assert_equal @user.uid, @resp_uid
+          assert_equal @resource.uid, @resp_uid
         end
 
         it 'should not treat this request as a batch request' do
@@ -70,9 +70,9 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
 
         describe 'subsequent requests' do
           before do
-            @user.reload
+            @resource.reload
             # ensure that request is not treated as batch request
-            age_token(@user, @client_id)
+            age_token(@resource, @client_id)
 
             get '/demo/members_only_mang', {}, @auth_headers.merge({'access-token' => @resp_token})
           end
@@ -104,24 +104,24 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
       describe 'disable change_headers_on_each_request' do
         before do
           DeviseTokenAuth.change_headers_on_each_request = false
-          @user.reload
-          age_token(@user, @client_id)
+          @resource.reload
+          age_token(@resource, @client_id)
 
           get '/demo/members_only_mang', {}, @auth_headers
 
           @first_is_batch_request = assigns(:is_batch_request)
-          @first_user = assigns(:user).dup
+          @first_user = assigns(:resource).dup
           @first_access_token = response.headers['access-token']
           @first_response_status = response.status
 
-          @user.reload
-          age_token(@user, @client_id)
+          @resource.reload
+          age_token(@resource, @client_id)
 
           # use expired auth header
           get '/demo/members_only_mang', {}, @auth_headers
 
           @second_is_batch_request = assigns(:is_batch_request)
-          @second_user = assigns(:user).dup
+          @second_user = assigns(:resource).dup
           @second_access_token = response.headers['access-token']
           @second_response_status = response.status
         end
@@ -163,19 +163,19 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
       describe 'batch requests' do
         describe 'success' do
           before do
-            age_token(@user, @client_id)
+            age_token(@resource, @client_id)
             #request.headers.merge!(@auth_headers)
 
             get '/demo/members_only_mang', {}, @auth_headers
 
             @first_is_batch_request = assigns(:is_batch_request)
-            @first_user = assigns(:user)
+            @first_user = assigns(:resource)
             @first_access_token = response.headers['access-token']
 
             get '/demo/members_only_mang', {}, @auth_headers
 
             @second_is_batch_request = assigns(:is_batch_request)
-            @second_user = assigns(:user)
+            @second_user = assigns(:resource)
             @second_access_token = response.headers['access-token']
           end
 
@@ -202,24 +202,24 @@ class DemoMangControllerTest < ActionDispatch::IntegrationTest
 
         describe 'time out' do
           before do
-            @user.reload
-            age_token(@user, @client_id)
+            @resource.reload
+            age_token(@resource, @client_id)
 
             get '/demo/members_only_mang', {}, @auth_headers
 
             @first_is_batch_request = assigns(:is_batch_request)
-            @first_user = assigns(:user).dup
+            @first_user = assigns(:resource).dup
             @first_access_token = response.headers['access-token']
             @first_response_status = response.status
 
-            @user.reload
-            age_token(@user, @client_id)
+            @resource.reload
+            age_token(@resource, @client_id)
 
             # use expired auth header
             get '/demo/members_only_mang', {}, @auth_headers
 
             @second_is_batch_request = assigns(:is_batch_request)
-            @second_user = assigns(:user)
+            @second_user = assigns(:resource)
             @second_access_token = response.headers['access-token']
             @second_response_status = response.status
           end

data/test/controllers/demo_user_controller_test.rb

@@ -10,11 +10,11 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
   describe DemoUserController do
     describe "Token access" do
       before do
-        @user = users(:confirmed_email_user)
-        @user.skip_confirmation!
-        @user.save!
+        @resource = users(:confirmed_email_user)
+        @resource.skip_confirmation!
+        @resource.save!
 
-        @auth_headers = @user.create_new_auth_token
+        @auth_headers = @resource.create_new_auth_token
 
         @token     = @auth_headers['access-token']
         @client_id = @auth_headers['client']
@@ -24,7 +24,7 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
       describe 'successful request' do
         before do
           # ensure that request is not treated as batch request
-          age_token(@user, @client_id)
+          age_token(@resource, @client_id)
 
           get '/demo/members_only', {}, @auth_headers
 
@@ -36,7 +36,7 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
 
         describe 'devise mappings' do
           it 'should define current_user' do
-            assert_equal @user, @controller.current_user
+            assert_equal @resource, @controller.current_user
           end
 
           it 'should define user_signed_in?' do
@@ -44,7 +44,7 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
           end
 
           it 'should not define current_mang' do
-            refute_equal @user, @controller.current_mang
+            refute_equal @resource, @controller.current_mang
           end
         end
 
@@ -61,7 +61,7 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
         end
 
         it "should return the user's uid in the auth header" do
-          assert_equal @user.uid, @resp_uid
+          assert_equal @resource.uid, @resp_uid
         end
 
         it 'should not treat this request as a batch request' do
@@ -70,9 +70,9 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
 
         describe 'subsequent requests' do
           before do
-            @user.reload
+            @resource.reload
             # ensure that request is not treated as batch request
-            age_token(@user, @client_id)
+            age_token(@resource, @client_id)
 
             get '/demo/members_only', {}, @auth_headers.merge({'access-token' => @resp_token})
           end
@@ -104,24 +104,24 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
       describe 'disable change_headers_on_each_request' do
         before do
           DeviseTokenAuth.change_headers_on_each_request = false
-          @user.reload
-          age_token(@user, @client_id)
+          @resource.reload
+          age_token(@resource, @client_id)
 
           get '/demo/members_only', {}, @auth_headers
 
           @first_is_batch_request = assigns(:is_batch_request)
-          @first_user = assigns(:user).dup
+          @first_user = assigns(:resource).dup
           @first_access_token = response.headers['access-token']
           @first_response_status = response.status
 
-          @user.reload
-          age_token(@user, @client_id)
+          @resource.reload
+          age_token(@resource, @client_id)
 
           # use expired auth header
           get '/demo/members_only', {}, @auth_headers
 
           @second_is_batch_request = assigns(:is_batch_request)
-          @second_user = assigns(:user).dup
+          @second_user = assigns(:resource).dup
           @second_access_token = response.headers['access-token']
           @second_response_status = response.status
         end
@@ -163,19 +163,19 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
       describe 'batch requests' do
         describe 'success' do
           before do
-            age_token(@user, @client_id)
+            age_token(@resource, @client_id)
             #request.headers.merge!(@auth_headers)
 
             get '/demo/members_only', {}, @auth_headers
 
             @first_is_batch_request = assigns(:is_batch_request)
-            @first_user = assigns(:user)
+            @first_user = assigns(:resource)
             @first_access_token = response.headers['access-token']
 
             get '/demo/members_only', {}, @auth_headers
 
             @second_is_batch_request = assigns(:is_batch_request)
-            @second_user = assigns(:user)
+            @second_user = assigns(:resource)
             @second_access_token = response.headers['access-token']
           end
 
@@ -202,24 +202,24 @@ class DemoUserControllerTest < ActionDispatch::IntegrationTest
 
         describe 'time out' do
           before do
-            @user.reload
-            age_token(@user, @client_id)
+            @resource.reload
+            age_token(@resource, @client_id)
 
             get '/demo/members_only', {}, @auth_headers
 
             @first_is_batch_request = assigns(:is_batch_request)
-            @first_user = assigns(:user).dup
+            @first_user = assigns(:resource).dup
             @first_access_token = response.headers['access-token']
             @first_response_status = response.status
 
-            @user.reload
-            age_token(@user, @client_id)
+            @resource.reload
+            age_token(@resource, @client_id)
 
             # use expired auth header
             get '/demo/members_only', {}, @auth_headers
 
             @second_is_batch_request = assigns(:is_batch_request)
-            @second_user = assigns(:user)
+            @second_user = assigns(:resource)
             @second_access_token = response.headers['access-token']
             @second_response_status = response.status
           end

data/test/controllers/devise_token_auth/confirmations_controller_test.rb

@@ -35,11 +35,11 @@ class DeviseTokenAuth::ConfirmationsControllerTest < ActionController::TestCase
       describe "success" do
         before do
           xhr :get, :show, {confirmation_token: @token, redirect_url: @redirect_url}
-          @user = assigns(:user)
+          @resource = assigns(:resource)
         end
 
         test "user should now be confirmed" do
-          assert @user.confirmed?
+          assert @resource.confirmed?
         end
 
         test "should redirect to success url" do
@@ -52,8 +52,8 @@ class DeviseTokenAuth::ConfirmationsControllerTest < ActionController::TestCase
           assert_raises(ActionController::RoutingError) {
             xhr :get, :show, {confirmation_token: "bogus"}
           }
-          @user = assigns(:user)
-          refute @user.confirmed?
+          @resource = assigns(:resource)
+          refute @resource.confirmed?
         end
       end
     end
@@ -95,11 +95,11 @@ class DeviseTokenAuth::ConfirmationsControllerTest < ActionController::TestCase
         before do
           @redirect_url = Faker::Internet.url
           xhr :get, :show, {confirmation_token: @token, redirect_url: @redirect_url}
-          @user = assigns(:user)
+          @resource = assigns(:resource)
         end
 
         test "user should now be confirmed" do
-          assert @user.confirmed?
+          assert @resource.confirmed?
         end
       end
     end