work on user settings

2018-06-04 15:58:59 -04:00
parent 79949b4aa6
commit d9a95ffc18
22 changed files with 266 additions and 232 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -22,7 +22,11 @@ class User < ApplicationRecord
    
    # Generates a user from omniauth.
    def from_omniauth(auth)
-      user = find_or_initialize_by(uid: auth['uid'], provider: auth['provider'])
+      user = find_or_initialize_by(
+        social_uid: auth['uid'],
+        provider: auth['provider']
+      )
+
      user.name = send("#{auth['provider']}_name", auth)
      user.username = send("#{auth['provider']}_username", auth)
      user.email = send("#{auth['provider']}_email", auth)