修正 Omniauth 登陆的错误;

Author: huacnlee

app/controllers/users_controller.rb

@@ -50,7 +50,7 @@ def auth_unbind
       return
     end
 
-    current_user.authorizations.destroy_all(provider: provider)
+    current_user.authorizations.where(provider: provider).delete_all
     redirect_to edit_user_registration_path, flash: { warring: t('users.unbind_success', provider: provider.titleize) }
   end
 

app/models/authorization.rb

@@ -1,4 +1,5 @@
 class Authorization < ActiveRecord::Base
+  belongs_to :user
   validates :uid, :provider, presence: true
   validates :uid, uniqueness: { scope: :provider }
 end

app/models/user/omniauth_callbacks.rb

@@ -5,13 +5,13 @@ module OmniauthCallbacks
         uid = response['uid'].to_s
         data = response['info']
 
-        if (user = User.where('authorizations.provider' => provider, 'authorizations.uid' => uid).first)
+        if (user = Authorization.find_by(provider: provider, uid: uid).try(:user))
           user
         else
           user = User.new_from_provider_data(provider, uid, data)
 
           if user.save(validate: false)
-            user.authorizations << Authorization.new(provider: provider, uid: uid)
+            Authorization.find_or_create_by(provider: provider, uid: uid, user_id: user.id)
             return user
           else
             Rails.logger.warn("User.create_from_hash 失败，#{user.errors.inspect}")