Soft errors for User consistency checks _checkSaveParametersWithCurrentUser

Author: flovilmart

Parse/Parse/Internal/Object/PFObjectPrivate.h

@@ -207,7 +207,7 @@
 ///--------------------------------------
 #pragma mark - Validations
 ///--------------------------------------
-- (void)_checkSaveParametersWithCurrentUser:(PFUser *)currentUser;
+- (BOOL)_checkSaveParametersWithCurrentUser:(PFUser *)currentUser error:(NSError **)error;
 /**
  Checks if Parse class name could be used to initialize a given instance of PFObject or it's subclass.
  */

Parse/Parse/PFObject.m

@@ -461,8 +461,10 @@ + (BFTask *)_deepSaveAsyncChildrenOfObject:(id)object withCurrentUser:(PFUser *)
                             PFRESTCommand *command = nil;
                             @synchronized ([object lock]) {
                                 [object _objectWillSave];
-                                [object _checkSaveParametersWithCurrentUser:currentUser];
                                 NSError *error;
+                                if (![object _checkSaveParametersWithCurrentUser:currentUser error:&error] && error) {
+                                    return error;
+                                }
                                 command = [object _constructSaveCommandForChanges:[object unsavedChanges]
                                                                      sessionToken:sessionToken
                                                                     objectEncoder:[PFPointerObjectEncoder objectEncoder]
@@ -716,7 +718,7 @@ - (BOOL)isDataAvailableForKey:(NSString *)key {
 ///--------------------------------------
 
 // Validations that are done on save. For now, there is nothing.
-- (void)_checkSaveParametersWithCurrentUser:(PFUser *)currentUser {
+- (void)_checkSaveParametersWithCurrentUser:(PFUser *)currentUser error:(NSError **) error {
     return;
 }
 
@@ -1091,18 +1093,21 @@ - (BFTask *)_enqueueSaveEventuallyWithChildren:(BOOL)saveChildren {
                     PFOperationSet *changes = [self unsavedChanges];
                     changes.saveEventually = YES;
                     [self startSave];
-                    [self _checkSaveParametersWithCurrentUser:currentUser];
                     NSError *error;
-                    PFRESTCommand *command = [self _constructSaveCommandForChanges:changes
-                                                                      sessionToken:sessionToken
-                                                                     objectEncoder:[PFPointerOrLocalIdObjectEncoder objectEncoder]
-                                                                             error:&error];
-                    if (!command && error) {
+                    if (![self _checkSaveParametersWithCurrentUser:currentUser error:&error] && error) {
                         saveTask = [BFTask taskWithError:error];
-                    } else {
-                        // Enqueue the eventually operation!
-                        saveTask = [[Parse _currentManager].eventuallyQueue enqueueCommandInBackground:command withObject:self];
-                        [self _enqueueSaveEventuallyOperationAsync:changes];
+                    } else  {
+                        PFRESTCommand *command = [self _constructSaveCommandForChanges:changes
+                                                                          sessionToken:sessionToken
+                                                                         objectEncoder:[PFPointerOrLocalIdObjectEncoder objectEncoder]
+                                                                                 error:&error];
+                        if (!command && error) {
+                            saveTask = [BFTask taskWithError:error];
+                        } else {
+                            // Enqueue the eventually operation!
+                            saveTask = [[Parse _currentManager].eventuallyQueue enqueueCommandInBackground:command withObject:self];
+                            [self _enqueueSaveEventuallyOperationAsync:changes];
+                        }
                     }
                 }
                 saveTask = [saveTask continueWithBlock:^id(BFTask *task) {
@@ -1410,8 +1415,10 @@ - (BFTask *)saveAsync:(BFTask *)toAwait {
                     return childrenTask;
                 }
                 return [[childrenTask continueWithSuccessBlock:^id(BFTask *task) {
-                    [self _checkSaveParametersWithCurrentUser:currentUser];
                     NSError *error;
+                    if (![self _checkSaveParametersWithCurrentUser:currentUser error:&error] && error) {
+                        return error;
+                    }
                     PFRESTCommand *command = [self _constructSaveCommandForChanges:changes
                                                                       sessionToken:sessionToken
                                                                      objectEncoder:[PFPointerObjectEncoder objectEncoder]

Parse/Parse/PFUser.m

@@ -134,15 +134,20 @@ + (void)_assertValidInstanceClassName:(NSString *)className {
 }
 
 // Checks the properties on the object before saving.
-- (void)_checkSaveParametersWithCurrentUser:(PFUser *)currentUser {
+- (BOOL)_checkSaveParametersWithCurrentUser:(PFUser *)currentUser error:(NSError **)error {
     @synchronized([self lock]) {
-        PFConsistencyAssert(self.objectId || self._lazy,
+        PFConsistencyError(error,
+                           self.objectId || self._lazy,
+                           NO,
                             @"User cannot be saved unless they are already signed up. Call signUp first.");
 
-        PFConsistencyAssert([self _isAuthenticatedWithCurrentUser:currentUser] ||
-                            [self.objectId isEqualToString:currentUser.objectId],
-                            @"User cannot be saved unless they have been authenticated via logIn or signUp", nil);
+        PFConsistencyError(error,
+                           [self _isAuthenticatedWithCurrentUser:currentUser] ||
+                           [self.objectId isEqualToString:currentUser.objectId],
+                           NO,
+                           @"User cannot be saved unless they have been authenticated via logIn or signUp");
     }
+    return YES;
 }
 
 // Checks the properties on the object before signUp.