Skip to content

Commit

Permalink
change error messages in validate_evernote_options
Browse files Browse the repository at this point in the history
  • Loading branch information
bencornelis committed Sep 20, 2015
1 parent 21f89e5 commit cecce25
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ WUNDERLIST_OAUTH_SECRET=

EVERNOTE_OAUTH_KEY=
EVERNOTE_OAUTH_SECRET=
# Set to true in development, false in production
USE_EVERNOTE_SANDBOX=true

#############################
Expand Down
6 changes: 1 addition & 5 deletions app/concerns/evernote_concern.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def validate_evernote_options
unless evernote_consumer_key.present? &&
evernote_consumer_secret.present? &&
evernote_oauth_token.present?
errors.add(:base, "Evernote consumer_key, consumer_secret, oauth_token, and oauth_token_secret are required to authenticate with the Evernote API. You can provide these as options to this Agent, or as Credentials with the same names, but starting with 'evernote_'.")
errors.add(:base, "Evernote ENV variables and a Service are required")
end
end

Expand All @@ -45,8 +45,4 @@ def evernote_consumer_secret
def evernote_oauth_token
service && service.token
end

def evernote_oauth_token_secret
service && service.secret
end
end

0 comments on commit cecce25

Please sign in to comment.