lib/generators/happy_seed/omniauth/templates/app/models/identity.rb in happy_seed-0.0.19 vs lib/generators/happy_seed/omniauth/templates/app/models/identity.rb in happy_seed-0.0.21

- old
+ new

@@ -1,19 +1,23 @@ class Identity < ActiveRecord::Base - belongs_to :user + belongs_to :user, required: false validates_presence_of :uid, :provider - validates_uniqueness_of :uid, :scope => :provider + validates_uniqueness_of :uid, scope: :provider def self.find_for_oauth(auth) identity = find_by(provider: auth.provider, uid: auth.uid) identity = create(uid: auth.uid, provider: auth.provider) if identity.nil? - identity.accesstoken = auth.credentials.token - identity.name = auth.info.name - identity.email = auth.info.email - identity.nickname = auth.info.nickname - identity.image = auth.info.image - identity.phone = auth.info.phone - identity.urls = (auth.info.urls || "").to_json + if auth.credentials + identity.accesstoken = auth.credentials.token + end + if auth.info + identity.name = auth.info.name + identity.email = auth.info.email + identity.nickname = auth.info.nickname + identity.image = auth.info.image + identity.phone = auth.info.phone + identity.urls = (auth.info.urls || "").to_json + end identity.save identity end end