OAuth 로그인 시엔 패스워드를 DB에 저장하지 않는다

Author: minhyeok92

app/controllers/users/omniauth_callbacks_controller.rb

@@ -2,9 +2,12 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def facebook
     @user = User.find_for_oauth2(request.env["omniauth.auth"])
 
+    session["omniauth"] = request.env["omniauth.auth"]
+    
     if @user.nil?
-      session["omniauth"] = request.env["omniauth.auth"]
-      redirect_to users_merge_path
+      render users_nickname_new_path
+    elsif @user == "duplicated"
+      redirect_to users_merge_path   
     else
       sign_in_and_redirect @user, :event => :authentication
     end
@@ -14,10 +17,10 @@ def google_oauth2
     @user = User.find_for_oauth2(request.env["omniauth.auth"])
 
     session["omniauth"] = request.env["omniauth.auth"]
-    
+
     if @user.nil?
       render users_nickname_new_path
-    elsif @user == "dup"
+    elsif @user == "duplicated"
       redirect_to users_merge_path   
     else
       sign_in_and_redirect @user, :event => :authentication

app/controllers/users_controller.rb

@@ -29,7 +29,6 @@ def nickname_new_callback
     @user = User.create!(provider:auth["provider"],
       uid: auth["uid"],
       email: auth["info"]["email"],
-      password: Devise.friendly_token[0,20],
       nickname: params[:nickname])
     sign_in_and_redirect @user, :event => :authentication
   end
@@ -46,8 +45,7 @@ def sign_up_from_twitter_callback
 
       @user = User.new(provider:auth["provider"],
           uid:auth["uid"],
-          nickname: auth["extra"]["raw_info"]["screen_name"],
-          password: Devise.friendly_token[0,20])
+          nickname: auth["extra"]["raw_info"]["screen_name"])
 
       @user.email = params[:user]["email"]
 

app/models/user.rb

@@ -51,9 +51,9 @@ def self.find_for_oauth2(access_token)
 
     unless user
       if User.where(email: data["email"]).first
-        "dup"
+        user = "duplicated"
       else
-        nil
+        user = nil
       end
     end
     user
@@ -77,6 +77,10 @@ def update_from_twitter(id, email)
     user.save!
   end
 
-
+  def password_required?
+    if provider.nil?
+      super
+    end    
+  end
 
 end