불필요한 주석 삭제

Author: minhyeok92

app/controllers/users/omniauth_callbacks_controller.rb

@@ -53,21 +53,6 @@ def google_oauth2
     end
   end
 
-  # def twitter
-  #   @user = User.find_for_twitter_oauth(request.env["omniauth.auth"], current_user)
-
-  #   if @user.persisted? and @user.uid != nil
-  #     sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
-  #     set_flash_message(:notice, :success, :kind => "Twitter") if is_navigational_format?
-  #   elsif @user.persisted? and @user.uid == nil
-  #     session["devise.twitter_data"] = request.env["omniauth.auth"]
-  #     redirect_to users_merge_path(@user.id, 'twitter_data')
-  #   else
-  #     session["devise.twitter_data"] = request.env["omniauth.auth"]
-  #     redirect_to new_user_registration_url
-  #   end
-  # end
-
     def twitter
     @user = User.find_for_twitter_oauth(request.env["omniauth.auth"], current_user)
 
@@ -77,9 +62,6 @@ def twitter
       set_flash_message(:notice, :success, :kind => "Twitter") if is_navigational_format?
     # 계정이 없다 = 새로운 이메일을 입력받아서 회원가입 시킨다
     elsif @user.email == "temp@todo.nut"
-      # session["devise.twitter_data"] = request.env["omniauth.auth"]
-      # render :text => @user.inspect
-
       redirect_to sign_up_from_twitter_path(@user.id)
     end
   end

app/controllers/users_controller.rb

@@ -20,8 +20,6 @@ def merge
   end
 
   def sign_up_from_twitter
-    # render :text => session["devise.twitter_data"]
-
     @user = User.find(params[:id])
 
     if request.post?
@@ -30,12 +28,5 @@ def sign_up_from_twitter
 
       redirect_to root_path
     end
-
-    # if params[:callback] == 'callback'
-    #   provider_session = session["devise.twitter_data"]
-
-    #   @user.merge(params[:id], provider_session["provider"], provider_session["uid"])
-    #   redirect_to root_path
-    # end
   end
 end

config/routes.rb

@@ -2,12 +2,6 @@
   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/merge(/:email)'
-
-  # resources :users do
-  #   resources :
-  # end
-
   get '/users/merge/:id/:provider(/:callback)', to: 'users#merge', as: 'users_merge'
 
   devise_for :users, :controllers => {
@@ -16,9 +10,7 @@
     :sessions => "users/sessions"
   }
 
-  #get '/users/(/:nickname)/edit', to: 'users/registrations#edit', as: 'edit_user'
   get '/users/(/:nickname)', to: 'users#show', as: 'show_user'
-  #resources :users, only: [:show]
 
   resources :projects do
     resources :todos do