Check the presence of service in twitter_oauth_token & twitter_oauth_token_secret.

Akinori MUSHA 10 ans auparavant
Parent
Commettre
0aca3a074d
1 fichiers modifiés avec 2 ajouts et 3 suppressions
  1. 2 3
      app/concerns/twitter_concern.rb

+ 2 - 3
app/concerns/twitter_concern.rb

@@ -13,7 +13,6 @@ module TwitterConcern
13 13
   def validate_twitter_options
14 14
     unless twitter_consumer_key.present? &&
15 15
       twitter_consumer_secret.present? &&
16
-      service &&
17 16
       twitter_oauth_token.present? &&
18 17
       twitter_oauth_token_secret.present?
19 18
       errors.add(:base, "Twitter consumer_key, consumer_secret, oauth_token, and oauth_token_secret are required to authenticate with the Twitter API.  You can provide these as options to this Agent, or as Credentials with the same names, but starting with 'twitter_'.")
@@ -29,11 +28,11 @@ module TwitterConcern
29 28
   end
30 29
 
31 30
   def twitter_oauth_token
32
-    service.token
31
+    service && service.token
33 32
   end
34 33
 
35 34
   def twitter_oauth_token_secret
36
-    service.secret
35
+    service && service.secret
37 36
   end
38 37
 
39 38
   def twitter