트위터 로그인 리팩토링

Author: minhyeok92

app/controllers/users/omniauth_callbacks_controller.rb

@@ -3,7 +3,6 @@ def facebook
     @user = User.find_for_oauth2(request.env["omniauth.auth"])
 
     if @user.persisted? and @user.uid != nil
-      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Facebook"
       sign_in_and_redirect @user, :event => :authentication
     elsif @user.persisted? and @user.uid == nil
       session["devise.facebook_data"] = request.env["omniauth.auth"]
@@ -15,23 +14,22 @@ def google_oauth2
     @user = User.find_for_oauth2(request.env["omniauth.auth"])
 
     if @user.persisted? and @user.uid != nil
-      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Google"
       sign_in_and_redirect @user, :event => :authentication
     elsif @user.persisted? and @user.uid == nil
       session["devise.google_data"] = request.env["omniauth.auth"]
       redirect_to users_merge_path(@user.id, 'google_data')
     end
   end
 
-    def twitter
+  def twitter
     @user = User.find_for_twitter_oauth(request.env["omniauth.auth"])
-    time = [@user.created_at, @user.updated_at]
 
-    if @user.persisted? and time[0] != time[1]
-      sign_in_and_redirect @user, :event => :authentication
-      set_flash_message(:notice, :success, :kind => "Twitter") if is_navigational_format?
+    if @user.nil?
+      @user = User.new
+      session["devise.twitter_data"] = request.env["omniauth.auth"]
+      render sign_up_from_twitter_path
     else
-      redirect_to sign_up_from_twitter_path(@user.id)
+      sign_in_and_redirect @user, :event => :authentication      
     end
   end
 end

app/controllers/users_controller.rb

@@ -5,8 +5,6 @@ def show
   end
 
   def merge
-
-
     @user = User.find(params[:id])
     @provider = params[:provider]
 
@@ -20,13 +18,19 @@ def merge
   end
 
   def sign_up_from_twitter
-    @user = User.find(params[:id])
+  end
 
-    if request.post?
-      params = request.params[:user]
-      @user.update_from_twitter(@user.id, params[:email])
+  def sign_up_from_twitter_callback
+    auth = session["devise.twitter_data"]
 
-      redirect_to root_path
-    end
+    @user = User.new(provider:auth["provider"],
+        uid:auth["uid"],
+        nickname: auth["extra"]["raw_info"]["screen_name"],
+        password: Devise.friendly_token[0,20])
+
+    @user.email = params[:user]["email"]
+
+    @user.save!
+    sign_in_and_redirect @user, :event => :authentication
   end
 end

app/models/user.rb

@@ -63,15 +63,6 @@ def self.find_for_oauth2(access_token)
 
   def self.find_for_twitter_oauth(auth)
     user = User.where(:uid => auth.uid, :provider => auth.provider).first
-
-    unless user
-      user = User.create!(provider:auth.provider,
-        uid:auth.uid,
-        email: "temp." + Devise.friendly_token[0,7] + "@todo.nut",
-        nickname: auth.extra.raw_info.screen_name,
-        password:Devise.friendly_token[0,20])
-    end
-    user
   end
 
   def merge(id, provider, uid)

app/views/users/sign_up_from_twitter.html.erb

@@ -1,6 +1,7 @@
 <h1>새 이메일을 입력하세요 - Twitter</h1>
+
 <div class="form-container">
-  <%= form_for @user, url: {action: "sign_up_from_twitter"},  method: "post", :role => 'form' do |f|%>
+  <%= form_for @user, url: {action: "sign_up_from_twitter_callback", controller: "/users"},  method: "post", :role => 'form' do |f|%>
 
 
   <div class="form-group">

config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
-  get 'users/sign_up_from_twitter/:id', to: 'users#sign_up_from_twitter', as: 'sign_up_from_twitter'
-  post 'users/sign_up_from_twitter/:id', to: 'users#sign_up_from_twitter', as: 'sign_up_from_twitter_update'
+  get 'users/sign_up_from_twitter', to: 'users#sign_up_from_twitter', as: 'sign_up_from_twitter'
+  post 'users/sign_up_from_twitter_callback', to: 'users#sign_up_from_twitter_callback', as: 'sign_up_from_twitter_callback'
 
   get '/users/merge/:id/:provider(/:callback)', to: 'users#merge', as: 'users_merge'