unique social registration

app/controllers/users/omniauth_callbacks_controller.rb

@@ -10,7 +10,11 @@ def facebook
   def vkontakte
     current_user = User.oauth_find_or_create(:vkontakte, request.env['omniauth.auth'])
     sign_in current_user
-    redirect_to current_user.skills.blank? ? interests_path : user_path(current_user)
+    if current_user.email.ends_with?('@vk.com')
+      redirect_to user_update_email_path(current_user)
+    else
+      redirect_to current_user.skills.blank? ? interests_path : user_path(current_user)
+    end
   end
 
   def failure

app/controllers/users_controller.rb

@@ -25,4 +25,8 @@ def map_interest
     end
     respond_with 1
   end
+
+  def update_email
+
+  end
 end

app/models/user.rb

@@ -51,28 +51,30 @@ def upcoming_student_lessons
   end
 
   def self.oauth_find_or_create(provider, auth)
-    # TODO
-    # Make sure the authorization is unique
     begin
       UserRegistration.where(provider: provider.to_s.downcase, provider_user_id: auth.uid).first.user
     rescue
-      user = User.create(
-        email: provider == :vkontakte ? "#{auth.uid}@vk.com" : auth.info.email,
-        first_name: auth.info.first_name,
-        last_name: auth.info.last_name,
-        sex: provider == :vkontakte ? VKONTAKTE_SEX_ASSOCIATIONS[auth.extra.raw_info.sex.to_i] : auth.extra.raw_info.gender,
-        password: 'fake_password',
-        password_confirmation: 'fake_password',
-        send_emails: true
-      )
-      user.user_registrations.create(
-        provider: provider.to_s.downcase,
-        provider_user_id: auth.uid,
-        hash_token: auth.credentials.token,
-        provider_url: auth.info.urls[provider.downcase.to_s.titleize]
-      )
-      user.image_attachment = ImageAttachment.create(image: ImageAttachment.image_from_url(auth.info.image, auth.uid))
-      user
+      begin
+        User.find_by_email(provider == :vkontakte ? "#{auth.uid}@vk.com" : auth.info.email) or raise
+      rescue
+        user = User.create(
+          email: provider == :vkontakte ? "#{auth.uid}@vk.com" : auth.info.email,
+          first_name: auth.info.first_name,
+          last_name: auth.info.last_name,
+          sex: provider == :vkontakte ? VKONTAKTE_SEX_ASSOCIATIONS[auth.extra.raw_info.sex.to_i] : auth.extra.raw_info.gender,
+          password: 'fake_password',
+          password_confirmation: 'fake_password',
+          send_emails: true
+        )
+        user.user_registrations.create(
+          provider: provider.to_s.downcase,
+          provider_user_id: auth.uid,
+          hash_token: auth.credentials.token,
+          provider_url: auth.info.urls[provider.downcase.to_s.titleize]
+        )
+        user.image_attachment = ImageAttachment.create(image: ImageAttachment.image_from_url(auth.info.image, auth.uid))
+        user
+      end
     end
   end
 

config/routes.rb

@@ -5,6 +5,7 @@
 
   resources :users, only: %w(show edit update) do
     get "map_interest/:sub_interest_id", to: :map_interest, as: :map_interest
+    get "update-email", to: :update_email, as: :update_email
   end
   resources :lessons, only: %w(show edit update create new index) do
     get "new-course", on: :collection, to: :new_course, as: :new_course