evernote-thrift 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0969bf81984d4c4495c7599f1043634910c021
-  data.tar.gz: 120ff70c706e9d0a5c83b556dcfc8dc03d66df52
+  metadata.gz: feb94d8e754637b7efb9471f6cf38e01d8a2b7b7
+  data.tar.gz: 33150db7f660e2f751e99ea868f037a74c236daf
 SHA512:
-  metadata.gz: acee3fbbfe3465616ebffe180102a5c4e2ec737e7c94f43e6e2528a20b1b887fe6a4c7eab812a522f901a57596e68967ea4190d684d1fad284da23678c97f3c6
-  data.tar.gz: 103d6245cd420196fd2539f5678bd15aade74ec4b3efb56c93a366efc47e318614c919eef113b5fc0e47357a0402f98da0a72a843c4d1d29fbb16fe67a504e20
+  metadata.gz: bb79928749155fdf34e6cc15747266b37919cfa1e0648cc0afb9a21c5824917b16530204bea2894e1c396d97589f970ff53efd1721fa4a8cc2c051c046160833
+  data.tar.gz: 754058300c556abcf8cc828cc572f706b7a9f636f1150ff5f7ffd848e8fa3b817f5d2ec6726ff7bfb8d7e0612f661544eb7ec1f72d7bd267307aefc4ce0c1257

data/README.md

@@ -3,7 +3,7 @@
 Evernote SDK for Ruby
 =====================
 
-Evernote API version 1.24
+Evernote API version 1.25
 
 Overview
 --------

data/lib/Evernote/EDAM/note_store.rb

@@ -1081,6 +1081,24 @@ module Evernote
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'updateSharedNotebook failed: unknown result')
           end
 
+          def setSharedNotebookRecipientSettings(authenticationToken, sharedNotebookId, recipientSettings)
+            send_setSharedNotebookRecipientSettings(authenticationToken, sharedNotebookId, recipientSettings)
+            return recv_setSharedNotebookRecipientSettings()
+          end
+
+          def send_setSharedNotebookRecipientSettings(authenticationToken, sharedNotebookId, recipientSettings)
+            send_message('setSharedNotebookRecipientSettings', SetSharedNotebookRecipientSettings_args, :authenticationToken => authenticationToken, :sharedNotebookId => sharedNotebookId, :recipientSettings => recipientSettings)
+          end
+
+          def recv_setSharedNotebookRecipientSettings()
+            result = receive_message(SetSharedNotebookRecipientSettings_result)
+            return result.success unless result.success.nil?
+            raise result.userException unless result.userException.nil?
+            raise result.notFoundException unless result.notFoundException.nil?
+            raise result.systemException unless result.systemException.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'setSharedNotebookRecipientSettings failed: unknown result')
+          end
+
           def sendMessageToSharedNotebookMembers(authenticationToken, notebookGuid, messageText, recipients)
             send_sendMessageToSharedNotebookMembers(authenticationToken, notebookGuid, messageText, recipients)
             return recv_sendMessageToSharedNotebookMembers()
@@ -1295,13 +1313,13 @@ module Evernote
             return
           end
 
-          def authenticateToSharedNote(guid, noteKey)
-            send_authenticateToSharedNote(guid, noteKey)
+          def authenticateToSharedNote(guid, noteKey, authenticationToken)
+            send_authenticateToSharedNote(guid, noteKey, authenticationToken)
             return recv_authenticateToSharedNote()
           end
 
-          def send_authenticateToSharedNote(guid, noteKey)
-            send_message('authenticateToSharedNote', AuthenticateToSharedNote_args, :guid => guid, :noteKey => noteKey)
+          def send_authenticateToSharedNote(guid, noteKey, authenticationToken)
+            send_message('authenticateToSharedNote', AuthenticateToSharedNote_args, :guid => guid, :noteKey => noteKey, :authenticationToken => authenticationToken)
           end
 
           def recv_authenticateToSharedNote()
@@ -2212,6 +2230,21 @@ module Evernote
             write_result(result, oprot, 'updateSharedNotebook', seqid)
           end
 
+          def process_setSharedNotebookRecipientSettings(seqid, iprot, oprot)
+            args = read_args(iprot, SetSharedNotebookRecipientSettings_args)
+            result = SetSharedNotebookRecipientSettings_result.new()
+            begin
+              result.success = @handler.setSharedNotebookRecipientSettings(args.authenticationToken, args.sharedNotebookId, args.recipientSettings)
+            rescue ::Evernote::EDAM::Error::EDAMUserException => userException
+              result.userException = userException
+            rescue ::Evernote::EDAM::Error::EDAMNotFoundException => notFoundException
+              result.notFoundException = notFoundException
+            rescue ::Evernote::EDAM::Error::EDAMSystemException => systemException
+              result.systemException = systemException
+            end
+            write_result(result, oprot, 'setSharedNotebookRecipientSettings', seqid)
+          end
+
           def process_sendMessageToSharedNotebookMembers(seqid, iprot, oprot)
             args = read_args(iprot, SendMessageToSharedNotebookMembers_args)
             result = SendMessageToSharedNotebookMembers_result.new()
@@ -2396,7 +2429,7 @@ module Evernote
             args = read_args(iprot, AuthenticateToSharedNote_args)
             result = AuthenticateToSharedNote_result.new()
             begin
-              result.success = @handler.authenticateToSharedNote(args.guid, args.noteKey)
+              result.success = @handler.authenticateToSharedNote(args.guid, args.noteKey, args.authenticationToken)
             rescue ::Evernote::EDAM::Error::EDAMUserException => userException
               result.userException = userException
             rescue ::Evernote::EDAM::Error::EDAMNotFoundException => notFoundException
@@ -4870,6 +4903,48 @@ module Evernote
           ::Thrift::Struct.generate_accessors self
         end
 
+        class SetSharedNotebookRecipientSettings_args
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          AUTHENTICATIONTOKEN = 1
+          SHAREDNOTEBOOKID = 2
+          RECIPIENTSETTINGS = 3
+
+          FIELDS = {
+            AUTHENTICATIONTOKEN => {:type => ::Thrift::Types::STRING, :name => 'authenticationToken'},
+            SHAREDNOTEBOOKID => {:type => ::Thrift::Types::I64, :name => 'sharedNotebookId'},
+            RECIPIENTSETTINGS => {:type => ::Thrift::Types::STRUCT, :name => 'recipientSettings', :class => ::Evernote::EDAM::Type::SharedNotebookRecipientSettings}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
+        class SetSharedNotebookRecipientSettings_result
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          SUCCESS = 0
+          USEREXCEPTION = 1
+          NOTFOUNDEXCEPTION = 2
+          SYSTEMEXCEPTION = 3
+
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'},
+            USEREXCEPTION => {:type => ::Thrift::Types::STRUCT, :name => 'userException', :class => ::Evernote::EDAM::Error::EDAMUserException},
+            NOTFOUNDEXCEPTION => {:type => ::Thrift::Types::STRUCT, :name => 'notFoundException', :class => ::Evernote::EDAM::Error::EDAMNotFoundException},
+            SYSTEMEXCEPTION => {:type => ::Thrift::Types::STRUCT, :name => 'systemException', :class => ::Evernote::EDAM::Error::EDAMSystemException}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
         class SendMessageToSharedNotebookMembers_args
           include ::Thrift::Struct, ::Thrift::Struct_Union
           AUTHENTICATIONTOKEN = 1
@@ -5348,10 +5423,12 @@ module Evernote
           include ::Thrift::Struct, ::Thrift::Struct_Union
           GUID = 1
           NOTEKEY = 2
+          AUTHENTICATIONTOKEN = 3
 
           FIELDS = {
             GUID => {:type => ::Thrift::Types::STRING, :name => 'guid'},
-            NOTEKEY => {:type => ::Thrift::Types::STRING, :name => 'noteKey'}
+            NOTEKEY => {:type => ::Thrift::Types::STRING, :name => 'noteKey'},
+            AUTHENTICATIONTOKEN => {:type => ::Thrift::Types::STRING, :name => 'authenticationToken'}
           }
 
           def struct_fields; FIELDS; end

data/lib/Evernote/EDAM/note_store_types.rb

@@ -926,7 +926,7 @@ module Evernote
 # entities.
 # 
 # You must specify either <em>noteGuid</em> or <em>plainText</em>, but
-# not both. <em>filter</em> is optional.
+# not both. <em>filter</em> and <em>referenceUri</em> are optional.
 # 
 # <dl>
 # <dt>noteGuid</dt>
@@ -945,17 +945,24 @@ module Evernote
 #     Please note that some of the parameters may be ignored, such as
 #     <em>order</em> and <em>ascending</em>.
 # </dd>
+# 
+# <dt>referenceUri</dt>
+# <dd>A URI string specifying a reference entity, around which "relatedness"
+#     should be based. This can be an URL pointing to a web page, for example.
+# </dd>
 # </dl>
       class RelatedQuery
         include ::Thrift::Struct, ::Thrift::Struct_Union
         NOTEGUID = 1
         PLAINTEXT = 2
         FILTER = 3
+        REFERENCEURI = 4
 
         FIELDS = {
           NOTEGUID => {:type => ::Thrift::Types::STRING, :name => 'noteGuid', :optional => true},
           PLAINTEXT => {:type => ::Thrift::Types::STRING, :name => 'plainText', :optional => true},
-          FILTER => {:type => ::Thrift::Types::STRUCT, :name => 'filter', :class => ::Evernote::EDAM::NoteStore::NoteFilter, :optional => true}
+          FILTER => {:type => ::Thrift::Types::STRUCT, :name => 'filter', :class => ::Evernote::EDAM::NoteStore::NoteFilter, :optional => true},
+          REFERENCEURI => {:type => ::Thrift::Types::STRING, :name => 'referenceUri', :optional => true}
         }
 
         def struct_fields; FIELDS; end

data/lib/Evernote/EDAM/types_types.rb

@@ -1292,8 +1292,8 @@ module Evernote
 # the client MUST treat the note as read-only. In this case, the
 # client MAY modify the note's notebook and tags via the
 # Note.notebookGuid and Note.tagGuids fields.  The client MAY also
-# modify the pinProminence field as well as the reminderTime and
-# reminderDismissTime fields.
+# modify the reminderOrder field as well as the reminderTime and
+# reminderDoneTime fields.
 # <p>Applications should set contentClass only when they are creating notes
 # that contain structured information that needs to be maintained in order
 # for the user to be able to use the note within that application.
@@ -1323,6 +1323,9 @@ module Evernote
 # Syntax regex for name (key): EDAM_APPLICATIONDATA_NAME_REGEX
 # </dd>
 # 
+# <dt>creatorId</dt>
+# <dd>The numeric user ID of the user who originally created the note.</dd>
+# 
 # <dt>lastEditedBy</dt>
 # <dd>An indication of who made the last change to the note.  If you are
 # accessing the note via a shared notebook to which you have modification
@@ -1334,6 +1337,9 @@ module Evernote
 # it will be left unset.  This field is read-only by clients.  The server
 # will ignore all values set by clients into this field.</dd>
 # 
+# <dt>lastEditorId</dt>
+# <dd>The numeric user ID of the user described in lastEditedBy.</dd>
+# 
 # <dt>classifications</dt>
 # <dd>A map of classifications applied to the note by clients or by the
 # Evernote service. The key is the string name of the classification type,
@@ -1359,6 +1365,8 @@ module Evernote
         APPLICATIONDATA = 23
         LASTEDITEDBY = 24
         CLASSIFICATIONS = 26
+        CREATORID = 27
+        LASTEDITORID = 28
 
         FIELDS = {
           SUBJECTDATE => {:type => ::Thrift::Types::I64, :name => 'subjectDate', :optional => true},
@@ -1377,7 +1385,9 @@ module Evernote
           CONTENTCLASS => {:type => ::Thrift::Types::STRING, :name => 'contentClass', :optional => true},
           APPLICATIONDATA => {:type => ::Thrift::Types::STRUCT, :name => 'applicationData', :class => ::Evernote::EDAM::Type::LazyMap, :optional => true},
           LASTEDITEDBY => {:type => ::Thrift::Types::STRING, :name => 'lastEditedBy', :optional => true},
-          CLASSIFICATIONS => {:type => ::Thrift::Types::MAP, :name => 'classifications', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true}
+          CLASSIFICATIONS => {:type => ::Thrift::Types::MAP, :name => 'classifications', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}, :optional => true},
+          CREATORID => {:type => ::Thrift::Types::I32, :name => 'creatorId', :optional => true},
+          LASTEDITORID => {:type => ::Thrift::Types::I32, :name => 'lastEditorId', :optional => true}
         }
 
         def struct_fields; FIELDS; end
@@ -1790,6 +1800,50 @@ module Evernote
         ::Thrift::Struct.generate_accessors self
       end
 
+      # Settings meant for the recipient of a shared notebook, such as
+# for indicating which types of notifications the recipient wishes
+# for reminders, etc.
+# 
+# The reminderNotifyEmail and reminderNotifyInApp fields have a
+# 3-state read value but a 2-state write value.  On read, it is
+# possible to observe "unset", true, or false.  The initial state is
+# "unset".  When you choose to set a value, you may set it to either
+# true or false, but you cannot unset the value.  Once one of these
+# members has a true/false value, it will always have a true/false
+# value.
+# 
+# <dl>
+# <dt>reminderNotifyEmail</dt>
+# <dd>Indicates that the user wishes to receive daily e-mail notifications
+#     for reminders associated with the shared notebook.  This may be
+#     true only for business notebooks that belong to the business of
+#     which the user is a member.  You may only set this value on a
+#     notebook in your business.</dd>
+# <dt>reminderNotifyInApp</dt>
+# <dd>Indicates that the user wishes to receive notifications for
+#     reminders by applications that support providing such
+#     notifications.  The exact nature of the notification is defined
+#     by the individual applications.</dd>
+# </dl>
+# 
+      class SharedNotebookRecipientSettings
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        REMINDERNOTIFYEMAIL = 1
+        REMINDERNOTIFYINAPP = 2
+
+        FIELDS = {
+          REMINDERNOTIFYEMAIL => {:type => ::Thrift::Types::BOOL, :name => 'reminderNotifyEmail', :optional => true},
+          REMINDERNOTIFYINAPP => {:type => ::Thrift::Types::BOOL, :name => 'reminderNotifyInApp', :optional => true}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
       # Shared notebooks represent a relationship between a notebook and a single
 # share invitation recipient.
 # <dl>
@@ -1843,6 +1897,12 @@ module Evernote
 #     an authorization token.  This setting expires after the first use
 #     of authenticateToSharedNotebook(...) with a valid authentication
 #     token.</dd>
+# 
+# <dt>recipientSettings</dt>
+# <dd>Settings intended for use only by the recipient of this shared
+#     notebook.  You should skip setting this value unless you want
+#     to change the value contained inside the structure, and only if
+#     you are the recipient.</dd>
 # </dl>
       class SharedNotebook
         include ::Thrift::Struct, ::Thrift::Struct_Union
@@ -1858,6 +1918,7 @@ module Evernote
         USERNAME = 9
         PRIVILEGE = 11
         ALLOWPREVIEW = 12
+        RECIPIENTSETTINGS = 13
 
         FIELDS = {
           ID => {:type => ::Thrift::Types::I64, :name => 'id', :optional => true},
@@ -1871,7 +1932,8 @@ module Evernote
           SHAREKEY => {:type => ::Thrift::Types::STRING, :name => 'shareKey', :optional => true},
           USERNAME => {:type => ::Thrift::Types::STRING, :name => 'username', :optional => true},
           PRIVILEGE => {:type => ::Thrift::Types::I32, :name => 'privilege', :optional => true, :enum_class => ::Evernote::EDAM::Type::SharedNotebookPrivilegeLevel},
-          ALLOWPREVIEW => {:type => ::Thrift::Types::BOOL, :name => 'allowPreview', :optional => true}
+          ALLOWPREVIEW => {:type => ::Thrift::Types::BOOL, :name => 'allowPreview', :optional => true},
+          RECIPIENTSETTINGS => {:type => ::Thrift::Types::STRUCT, :name => 'recipientSettings', :class => ::Evernote::EDAM::Type::SharedNotebookRecipientSettings, :optional => true}
         }
 
         def struct_fields; FIELDS; end

data/lib/Evernote/EDAM/user_store.rb

@@ -44,13 +44,13 @@ module Evernote
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'getBootstrapInfo failed: unknown result')
           end
 
-          def authenticate(username, password, consumerKey, consumerSecret)
-            send_authenticate(username, password, consumerKey, consumerSecret)
+          def authenticate(username, password, consumerKey, consumerSecret, supportsTwoFactor)
+            send_authenticate(username, password, consumerKey, consumerSecret, supportsTwoFactor)
             return recv_authenticate()
           end
 
-          def send_authenticate(username, password, consumerKey, consumerSecret)
-            send_message('authenticate', Authenticate_args, :username => username, :password => password, :consumerKey => consumerKey, :consumerSecret => consumerSecret)
+          def send_authenticate(username, password, consumerKey, consumerSecret, supportsTwoFactor)
+            send_message('authenticate', Authenticate_args, :username => username, :password => password, :consumerKey => consumerKey, :consumerSecret => consumerSecret, :supportsTwoFactor => supportsTwoFactor)
           end
 
           def recv_authenticate()
@@ -61,13 +61,13 @@ module Evernote
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'authenticate failed: unknown result')
           end
 
-          def authenticateLongSession(username, password, consumerKey, consumerSecret, deviceIdentifier, deviceDescription)
-            send_authenticateLongSession(username, password, consumerKey, consumerSecret, deviceIdentifier, deviceDescription)
+          def authenticateLongSession(username, password, consumerKey, consumerSecret, deviceIdentifier, deviceDescription, supportsTwoFactor)
+            send_authenticateLongSession(username, password, consumerKey, consumerSecret, deviceIdentifier, deviceDescription, supportsTwoFactor)
             return recv_authenticateLongSession()
           end
 
-          def send_authenticateLongSession(username, password, consumerKey, consumerSecret, deviceIdentifier, deviceDescription)
-            send_message('authenticateLongSession', AuthenticateLongSession_args, :username => username, :password => password, :consumerKey => consumerKey, :consumerSecret => consumerSecret, :deviceIdentifier => deviceIdentifier, :deviceDescription => deviceDescription)
+          def send_authenticateLongSession(username, password, consumerKey, consumerSecret, deviceIdentifier, deviceDescription, supportsTwoFactor)
+            send_message('authenticateLongSession', AuthenticateLongSession_args, :username => username, :password => password, :consumerKey => consumerKey, :consumerSecret => consumerSecret, :deviceIdentifier => deviceIdentifier, :deviceDescription => deviceDescription, :supportsTwoFactor => supportsTwoFactor)
           end
 
           def recv_authenticateLongSession()
@@ -78,6 +78,23 @@ module Evernote
             raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'authenticateLongSession failed: unknown result')
           end
 
+          def completeTwoFactorAuthentication(authenticationToken, oneTimeCode, deviceIdentifier, deviceDescription)
+            send_completeTwoFactorAuthentication(authenticationToken, oneTimeCode, deviceIdentifier, deviceDescription)
+            return recv_completeTwoFactorAuthentication()
+          end
+
+          def send_completeTwoFactorAuthentication(authenticationToken, oneTimeCode, deviceIdentifier, deviceDescription)
+            send_message('completeTwoFactorAuthentication', CompleteTwoFactorAuthentication_args, :authenticationToken => authenticationToken, :oneTimeCode => oneTimeCode, :deviceIdentifier => deviceIdentifier, :deviceDescription => deviceDescription)
+          end
+
+          def recv_completeTwoFactorAuthentication()
+            result = receive_message(CompleteTwoFactorAuthentication_result)
+            return result.success unless result.success.nil?
+            raise result.userException unless result.userException.nil?
+            raise result.systemException unless result.systemException.nil?
+            raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'completeTwoFactorAuthentication failed: unknown result')
+          end
+
           def revokeLongSession(authenticationToken)
             send_revokeLongSession(authenticationToken)
             recv_revokeLongSession()
@@ -220,7 +237,7 @@ module Evernote
             args = read_args(iprot, Authenticate_args)
             result = Authenticate_result.new()
             begin
-              result.success = @handler.authenticate(args.username, args.password, args.consumerKey, args.consumerSecret)
+              result.success = @handler.authenticate(args.username, args.password, args.consumerKey, args.consumerSecret, args.supportsTwoFactor)
             rescue ::Evernote::EDAM::Error::EDAMUserException => userException
               result.userException = userException
             rescue ::Evernote::EDAM::Error::EDAMSystemException => systemException
@@ -233,7 +250,7 @@ module Evernote
             args = read_args(iprot, AuthenticateLongSession_args)
             result = AuthenticateLongSession_result.new()
             begin
-              result.success = @handler.authenticateLongSession(args.username, args.password, args.consumerKey, args.consumerSecret, args.deviceIdentifier, args.deviceDescription)
+              result.success = @handler.authenticateLongSession(args.username, args.password, args.consumerKey, args.consumerSecret, args.deviceIdentifier, args.deviceDescription, args.supportsTwoFactor)
             rescue ::Evernote::EDAM::Error::EDAMUserException => userException
               result.userException = userException
             rescue ::Evernote::EDAM::Error::EDAMSystemException => systemException
@@ -242,6 +259,19 @@ module Evernote
             write_result(result, oprot, 'authenticateLongSession', seqid)
           end
 
+          def process_completeTwoFactorAuthentication(seqid, iprot, oprot)
+            args = read_args(iprot, CompleteTwoFactorAuthentication_args)
+            result = CompleteTwoFactorAuthentication_result.new()
+            begin
+              result.success = @handler.completeTwoFactorAuthentication(args.authenticationToken, args.oneTimeCode, args.deviceIdentifier, args.deviceDescription)
+            rescue ::Evernote::EDAM::Error::EDAMUserException => userException
+              result.userException = userException
+            rescue ::Evernote::EDAM::Error::EDAMSystemException => systemException
+              result.systemException = systemException
+            end
+            write_result(result, oprot, 'completeTwoFactorAuthentication', seqid)
+          end
+
           def process_revokeLongSession(seqid, iprot, oprot)
             args = read_args(iprot, RevokeLongSession_args)
             result = RevokeLongSession_result.new()
@@ -348,7 +378,7 @@ module Evernote
           FIELDS = {
             CLIENTNAME => {:type => ::Thrift::Types::STRING, :name => 'clientName'},
             EDAMVERSIONMAJOR => {:type => ::Thrift::Types::I16, :name => 'edamVersionMajor', :default => 1},
-            EDAMVERSIONMINOR => {:type => ::Thrift::Types::I16, :name => 'edamVersionMinor', :default => 24}
+            EDAMVERSIONMINOR => {:type => ::Thrift::Types::I16, :name => 'edamVersionMinor', :default => 25}
           }
 
           def struct_fields; FIELDS; end
@@ -413,12 +443,14 @@ module Evernote
           PASSWORD = 2
           CONSUMERKEY = 3
           CONSUMERSECRET = 4
+          SUPPORTSTWOFACTOR = 5
 
           FIELDS = {
             USERNAME => {:type => ::Thrift::Types::STRING, :name => 'username'},
             PASSWORD => {:type => ::Thrift::Types::STRING, :name => 'password'},
             CONSUMERKEY => {:type => ::Thrift::Types::STRING, :name => 'consumerKey'},
-            CONSUMERSECRET => {:type => ::Thrift::Types::STRING, :name => 'consumerSecret'}
+            CONSUMERSECRET => {:type => ::Thrift::Types::STRING, :name => 'consumerSecret'},
+            SUPPORTSTWOFACTOR => {:type => ::Thrift::Types::BOOL, :name => 'supportsTwoFactor'}
           }
 
           def struct_fields; FIELDS; end
@@ -457,6 +489,7 @@ module Evernote
           CONSUMERSECRET = 4
           DEVICEIDENTIFIER = 5
           DEVICEDESCRIPTION = 6
+          SUPPORTSTWOFACTOR = 7
 
           FIELDS = {
             USERNAME => {:type => ::Thrift::Types::STRING, :name => 'username'},
@@ -464,7 +497,8 @@ module Evernote
             CONSUMERKEY => {:type => ::Thrift::Types::STRING, :name => 'consumerKey'},
             CONSUMERSECRET => {:type => ::Thrift::Types::STRING, :name => 'consumerSecret'},
             DEVICEIDENTIFIER => {:type => ::Thrift::Types::STRING, :name => 'deviceIdentifier'},
-            DEVICEDESCRIPTION => {:type => ::Thrift::Types::STRING, :name => 'deviceDescription'}
+            DEVICEDESCRIPTION => {:type => ::Thrift::Types::STRING, :name => 'deviceDescription'},
+            SUPPORTSTWOFACTOR => {:type => ::Thrift::Types::BOOL, :name => 'supportsTwoFactor'}
           }
 
           def struct_fields; FIELDS; end
@@ -495,6 +529,48 @@ module Evernote
           ::Thrift::Struct.generate_accessors self
         end
 
+        class CompleteTwoFactorAuthentication_args
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          AUTHENTICATIONTOKEN = 1
+          ONETIMECODE = 2
+          DEVICEIDENTIFIER = 3
+          DEVICEDESCRIPTION = 4
+
+          FIELDS = {
+            AUTHENTICATIONTOKEN => {:type => ::Thrift::Types::STRING, :name => 'authenticationToken'},
+            ONETIMECODE => {:type => ::Thrift::Types::STRING, :name => 'oneTimeCode'},
+            DEVICEIDENTIFIER => {:type => ::Thrift::Types::STRING, :name => 'deviceIdentifier'},
+            DEVICEDESCRIPTION => {:type => ::Thrift::Types::STRING, :name => 'deviceDescription'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
+        class CompleteTwoFactorAuthentication_result
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          SUCCESS = 0
+          USEREXCEPTION = 1
+          SYSTEMEXCEPTION = 2
+
+          FIELDS = {
+            SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Evernote::EDAM::UserStore::AuthenticationResult},
+            USEREXCEPTION => {:type => ::Thrift::Types::STRUCT, :name => 'userException', :class => ::Evernote::EDAM::Error::EDAMUserException},
+            SYSTEMEXCEPTION => {:type => ::Thrift::Types::STRUCT, :name => 'systemException', :class => ::Evernote::EDAM::Error::EDAMSystemException}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
         class RevokeLongSession_args
           include ::Thrift::Struct, ::Thrift::Struct_Union
           AUTHENTICATIONTOKEN = 1

data/lib/Evernote/EDAM/user_store_constants.rb

@@ -12,7 +12,7 @@ module Evernote
     module UserStore
       EDAM_VERSION_MAJOR = 1
 
-      EDAM_VERSION_MINOR = 24
+      EDAM_VERSION_MINOR = 25
 
     end
   end

data/lib/Evernote/EDAM/user_store_types.rb

@@ -126,6 +126,23 @@ module Evernote
 #    end of this string to construct the full URL, as documented on our
 #    developer web site.
 #    </dd>
+#  <dt>secondFactorRequired:</dt>
+#    <dd>
+#    If set to true, this field indicates that the user has enabled two-factor
+#    authentication and must enter their second factor in order to complete
+#    authentication. In this case the value of authenticationResult will be
+#    a short-lived authentication token that may only be used to make a
+#    subsequent call to completeTwoFactorAuthentication.
+#    </dd>
+#  <dt>secondFactorDeliveryHint:</dt>
+#    <dd>
+#    When secondFactorRequired is set to true, this field may contain a string
+#    describing the second factor delivery method that the user has configured.
+#    This will typically be an obfuscated mobile device number, such as
+#    "(xxx) xxx-x095". This string can be displayed to the user to remind them
+#    how to obtain the required second factor.
+#    TODO do we need to differentiate between SMS and voice delivery?
+#    </dd>
 #  </dl>
       class AuthenticationResult
         include ::Thrift::Struct, ::Thrift::Struct_Union
@@ -136,6 +153,8 @@ module Evernote
         PUBLICUSERINFO = 5
         NOTESTOREURL = 6
         WEBAPIURLPREFIX = 7
+        SECONDFACTORREQUIRED = 8
+        SECONDFACTORDELIVERYHINT = 9
 
         FIELDS = {
           CURRENTTIME => {:type => ::Thrift::Types::I64, :name => 'currentTime'},
@@ -144,7 +163,9 @@ module Evernote
           USER => {:type => ::Thrift::Types::STRUCT, :name => 'user', :class => ::Evernote::EDAM::Type::User, :optional => true},
           PUBLICUSERINFO => {:type => ::Thrift::Types::STRUCT, :name => 'publicUserInfo', :class => ::Evernote::EDAM::UserStore::PublicUserInfo, :optional => true},
           NOTESTOREURL => {:type => ::Thrift::Types::STRING, :name => 'noteStoreUrl', :optional => true},
-          WEBAPIURLPREFIX => {:type => ::Thrift::Types::STRING, :name => 'webApiUrlPrefix', :optional => true}
+          WEBAPIURLPREFIX => {:type => ::Thrift::Types::STRING, :name => 'webApiUrlPrefix', :optional => true},
+          SECONDFACTORREQUIRED => {:type => ::Thrift::Types::BOOL, :name => 'secondFactorRequired', :optional => true},
+          SECONDFACTORDELIVERYHINT => {:type => ::Thrift::Types::STRING, :name => 'secondFactorDeliveryHint', :optional => true}
         }
 
         def struct_fields; FIELDS; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evernote-thrift
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Evernote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec