End of train commit

2013-11-04 10:01:01 +01:00
parent 48bc5a7af6
commit 30ff19bdb4
5 changed files with 57 additions and 2 deletions
@@ -28,14 +28,15 @@ class User

  def self.find_for_facebook_oauth(auth_data, user)
    user = database.view(self.by_facebook(key: [auth_data.provider, auth_data.uid], limit: 1)).first
+
    user || create(
      provider: auth_data.provider,
      uid: auth_data.uid,
      name: auth_data.info.nickname,
      email: auth_data.info.email,
      password: Devise.friendly_token[0,20],
-      oauth_token: user.oauth_token = auth.credentials.token,
-      oauth_expires_at: Time.at(auth_data.credentials.expires_at),
+      oauth_token:  auth_data.credentials.token,
+      oauth_expires_at: auth_data.credentials.expires ? Time.at(auth_data.credentials.expires_at) : nil,
      auth_data: auth_data
    )
  end