Consistency errors

.circleci/config.yml

@@ -64,7 +64,7 @@ jobs:
       - run: *prepare
       - run: |
             xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
-            bundle exec rake test:deployment
+            bundle exec rake package:release
   jazzy:
     <<: *defaults
     steps:

.travis.yml

@@ -20,6 +20,8 @@ jobs:
       - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-2
       - bundle exec rake test:deployment
       - ./Scripts/jazzy.sh
+      - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
+      - bundle exec rake package:release
       deploy:
         - provider: releases
           api_key:

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Parse-SDK-iOS-OSX Chnagelog
+
+### master
+
+* Fixes NSInternalInconsistencyException handling starting Bolts 1.9.0 by emitting soft NSErrors
+* Fixes issue affecting public getter/setters in PFACL's in Swift (#1083)
+* Prevent deadlocks when saving objects with cicrular references (#916)
+* Prevent deadlocks when running fetchAll with circluar references (#1184)
+* Adds NSNotification when an invalid session token is encountered
+

Gemfile

@@ -7,4 +7,3 @@ gem 'xcpretty'
 gem 'xcodeproj'
 gem 'cocoapods'
 gem 'jazzy', '~> 0.9.0'
-

Parse.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Parse'
-  s.version          = '1.16.0'
+  s.version          = '1.17.0-alpha.5'
   s.license          =  { :type => 'BSD', :file => 'LICENSE' }
   s.homepage         = 'http://parseplatform.org/'
   s.summary          = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

Parse/Parse.xcodeproj/project.pbxproj

@@ -6826,6 +6826,9 @@
 						LastSwiftMigration = 0900;
 						TestTargetID = 4AE33A0A1F5451AD0088DCA0;
 					};
+					81C09F501AF97A490043B49C = {
+						LastSwiftMigration = 0920;
+					};
 					81C3821B19CCA89E0066284A = {
 						CreatedOnToolsVersion = 6.0.1;
 						LastSwiftMigration = 0830;
@@ -8588,13 +8591,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F55ABB5A1B4F39DA00A0ECD5 /* ParseUnitTests-macOS.xcconfig */;
 			buildSettings = {
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
 		81C09F851AF97A490043B49C /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F55ABB5A1B4F39DA00A0ECD5 /* ParseUnitTests-macOS.xcconfig */;
 			buildSettings = {
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Parse/Parse/Internal/ACL/PFACLPrivate.h

@@ -20,7 +20,7 @@
 /*
  Gets the encoded format for an ACL.
  */
-- (NSDictionary *)encodeIntoDictionary;
+- (NSDictionary *)encodeIntoDictionary:(NSError **)error;
 
 /*
  Creates a new ACL object from an existing dictionary.

Parse/Parse/Internal/Analytics/Controller/PFAnalyticsController.m

@@ -77,7 +77,11 @@ + (instancetype)controllerWithDataSource:(id<PFEventuallyQueueProvider>)dataSour
     @weakify(self);
     return [[BFTask taskFromExecutor:[BFExecutor defaultPriorityBackgroundExecutor] withBlock:^id{
         @strongify(self);
-        NSDictionary *encodedDimensions = [[PFNoObjectEncoder objectEncoder] encodeObject:dimensions];
+        NSError *error;
+        NSDictionary *encodedDimensions = [[PFNoObjectEncoder objectEncoder] encodeObject:dimensions error:&error];
+        if (encodedDimensions == nil) {
+            return [BFTask taskWithError:error];
+        }
         PFRESTCommand *command = [PFRESTAnalyticsCommand trackEventCommandWithEventName:name
                                                                              dimensions:encodedDimensions
                                                                            sessionToken:sessionToken];

Parse/Parse/Internal/CloudCode/PFCloudCodeController.m

@@ -47,10 +47,14 @@ - (BFTask *)callCloudCodeFunctionAsync:(NSString *)functionName
     @weakify(self);
     return [[[BFTask taskFromExecutor:[BFExecutor defaultPriorityBackgroundExecutor] withBlock:^id{
         @strongify(self);
-        NSDictionary *encodedParameters = [[PFNoObjectEncoder objectEncoder] encodeObject:parameters];
+        NSError *error;
+        NSDictionary *encodedParameters = [[PFNoObjectEncoder objectEncoder] encodeObject:parameters error:&error];
+        PFPreconditionReturnFailedTask(encodedParameters, error);
         PFRESTCloudCommand *command = [PFRESTCloudCommand commandForFunction:functionName
                                                               withParameters:encodedParameters
-                                                                sessionToken:sessionToken];
+                                                                sessionToken:sessionToken
+                                                                       error:&error];
+        PFPreconditionReturnFailedTask(command, error);
         return [self.dataSource.commandRunner runCommandAsync:command withOptions:PFCommandRunningOptionRetryIfFailed];
     }] continueWithSuccessBlock:^id(BFTask *task) {
         return ((PFCommandResult *)(task.result)).result[@"result"];

Parse/Parse/Internal/Commands/CommandRunner/URLRequestConstructor/PFCommandURLRequestConstructor.m

@@ -71,7 +71,9 @@ + (instancetype)constructorWithDataSource:(id<PFInstallationIdentifierStoreProvi
             } else {
                 parameters = command.parameters;
             }
-            requestParameters = [[PFPointerObjectEncoder objectEncoder] encodeObject:parameters];
+            NSError *error = nil;
+            requestParameters = [[PFPointerObjectEncoder objectEncoder] encodeObject:parameters error:&error];
+            PFPreconditionReturnFailedTask(requestParameters, error);
         }
 
         return [PFHTTPURLRequestConstructor urlRequestWithURL:url

Parse/Parse/Internal/Commands/CommandRunner/URLSession/PFURLSessionCommandRunner.m

@@ -147,7 +147,9 @@ - (void)dealloc {
                                    withOptions:(PFCommandRunningOptions)options
                              cancellationToken:(BFCancellationToken *)cancellationToken {
     return [self _performCommandRunningBlock:^id {
-        [command resolveLocalIds];
+        NSError *error;
+        BOOL success = [command resolveLocalIds:&error];
+        PFPreconditionReturnFailedTask(success, error);
         return [[self.requestConstructor getDataURLRequestAsyncForCommand:command] continueWithSuccessBlock:^id(BFTask <NSURLRequest *>*task) {
             return [_session performDataURLRequestAsync:task.result forCommand:command cancellationToken:cancellationToken];
         }];
@@ -168,7 +170,9 @@ - (void)dealloc {
     return [self _performCommandRunningBlock:^id {
         @strongify(self);
 
-        [command resolveLocalIds];
+        NSError *error;
+        BOOL success = [command resolveLocalIds:&error];
+        PFPreconditionReturnFailedTask(success, error);
         return [[self.requestConstructor getFileUploadURLRequestAsyncForCommand:command
                                                                 withContentType:contentType
                                                           contentSourceFilePath:sourceFilePath] continueWithSuccessBlock:^id(BFTask<NSURLRequest *> *task) {

Parse/Parse/Internal/Commands/PFRESTAnalyticsCommand.m

@@ -51,11 +51,12 @@ + (instancetype)_trackEventCommandWithEventName:(NSString *)eventName
     if (!dictionary[@"at"]) {
         dictionary[@"at"] = [NSDate date];
     }
-
+    // TODO: flovilmart do not swallow error here
     return [self commandWithHTTPPath:httpPath
                           httpMethod:PFHTTPRequestMethodPOST
                           parameters:dictionary
-                        sessionToken:sessionToken];
+                        sessionToken:sessionToken
+                               error:nil];
 }
 
 @end

Parse/Parse/Internal/Commands/PFRESTCloudCommand.h

@@ -15,7 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)commandForFunction:(NSString *)function
                     withParameters:(nullable NSDictionary *)parameters
-                      sessionToken:(nullable NSString *)sessionToken;
+                      sessionToken:(nullable NSString *)sessionToken
+                             error:(NSError **)error;
 
 @end
 

Parse/Parse/Internal/Commands/PFRESTCloudCommand.m

@@ -16,12 +16,14 @@ @implementation PFRESTCloudCommand
 
 + (instancetype)commandForFunction:(NSString *)function
                     withParameters:(NSDictionary *)parameters
-                      sessionToken:(NSString *)sessionToken {
+                      sessionToken:(NSString *)sessionToken
+                             error:(NSError **)error {
     NSString *path = [NSString stringWithFormat:@"functions/%@", function];
     return [self commandWithHTTPPath:path
                           httpMethod:PFHTTPRequestMethodPOST
                           parameters:parameters
-                        sessionToken:sessionToken];
+                        sessionToken:sessionToken
+                               error:error];
 }
 
 @end

Parse/Parse/Internal/Commands/PFRESTCommand.h

@@ -32,13 +32,15 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)commandWithHTTPPath:(NSString *)path
                          httpMethod:(NSString *)httpMethod
                          parameters:(nullable NSDictionary *)parameters
-                       sessionToken:(nullable NSString *)sessionToken;
+                       sessionToken:(nullable NSString *)sessionToken
+                              error:(NSError **)error;
 
 + (instancetype)commandWithHTTPPath:(NSString *)path
                          httpMethod:(NSString *)httpMethod
                          parameters:(nullable NSDictionary *)parameters
                    operationSetUUID:(nullable NSString *)operationSetIdentifier
-                       sessionToken:(nullable NSString *)sessionToken;
+                       sessionToken:(nullable NSString *)sessionToken
+                              error:(NSError **)error;
 
 @end
 

Parse/Parse/Internal/Commands/PFRESTCommand.m

@@ -43,19 +43,22 @@ @implementation PFRESTCommand
 + (instancetype)commandWithHTTPPath:(NSString *)path
                          httpMethod:(NSString *)httpMethod
                          parameters:(NSDictionary *)parameters
-                       sessionToken:(NSString *)sessionToken {
+                       sessionToken:(NSString *)sessionToken
+                              error:(NSError **) error {
     return [self commandWithHTTPPath:path
                           httpMethod:httpMethod
                           parameters:parameters
                     operationSetUUID:nil
-                        sessionToken:sessionToken];
+                        sessionToken:sessionToken
+                               error:error];
 }
 
 + (instancetype)commandWithHTTPPath:(NSString *)path
                          httpMethod:(NSString *)httpMethod
                          parameters:(NSDictionary *)parameters
                    operationSetUUID:(NSString *)operationSetIdentifier
-                       sessionToken:(NSString *)sessionToken {
+                       sessionToken:(NSString *)sessionToken
+                              error:(NSError **)error {
     PFRESTCommand *command = [[self alloc] init];
     command.httpPath = path;
     command.httpMethod = httpMethod;
@@ -105,12 +108,13 @@ + (instancetype)commandFromDictionaryRepresentation:(NSDictionary *)dictionary {
     PFRESTCommand *command = [self commandWithHTTPPath:dictionary[PFRESTCommandHTTPPathEncodingKey]
                                             httpMethod:dictionary[PFRESTCommandHTTPMethodEncodingKey]
                                             parameters:dictionary[PFRESTCommandParametersEncodingKey]
-                                          sessionToken:dictionary[PFRESTCommandSessionTokenEncodingKey]];
+                                          sessionToken:dictionary[PFRESTCommandSessionTokenEncodingKey]
+                                                 error:nil];
     command.localId = dictionary[PFRESTCommandLocalIdEncodingKey];
     return command;
 }
 
-- (NSDictionary *)dictionaryRepresentation {
+- (NSDictionary *)dictionaryRepresentation:(NSError **)error {
     NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
     if (self.httpPath) {
         dictionary[PFRESTCommandHTTPPathEncodingKey] = self.httpPath;
@@ -119,7 +123,10 @@ - (NSDictionary *)dictionaryRepresentation {
         dictionary[PFRESTCommandHTTPMethodEncodingKey] = self.httpMethod;
     }
     if (self.parameters) {
-        NSDictionary *parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:self.parameters];
+        NSDictionary *parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:self.parameters error:error];
+        if (!parameters) {
+            return nil;
+        }
         dictionary[PFRESTCommandParametersEncodingKey] = parameters;
     }
     if (self.sessionToken) {
@@ -135,6 +142,7 @@ + (BOOL)isValidDictionaryRepresentation:(NSDictionary *)dictionary {
     return dictionary[PFRESTCommandHTTPPathEncodingKey] != nil;
 }
 
+
 #pragma mark Local Identifiers
 
 /**
@@ -166,66 +174,91 @@ - (void)maybeChangeServerOperation {
     }
 }
 
-+ (BOOL)forEachLocalIdIn:(id)object doBlock:(BOOL(^)(PFObject *pointer))block {
-    __block BOOL modified = NO;
++ (BOOL)forEachLocalIdIn:(id)object
+                 doBlock:(BOOL(^)(PFObject *pointer, BOOL *modified, NSError **error))block
+                modified:(BOOL *)modified error:(NSError **)error {
 
     // If this is a Pointer with a local id, try to resolve it.
     if ([object isKindOfClass:[PFObject class]] && !((PFObject *)object).objectId) {
-        return block(object);
+        __block BOOL blockModified = NO;
+        BOOL success = block(object, &blockModified, error);
+        if (blockModified) {
+            *modified = YES;
+        }
+        return success;
     }
 
     if ([object isKindOfClass:[NSDictionary class]]) {
+        __block NSError *localError;
+        __block BOOL hasFailed = NO;
         [object enumerateKeysAndObjectsUsingBlock:^(NSString *key, id obj, BOOL *stop) {
-            if ([[self class] forEachLocalIdIn:obj doBlock:block]) {
-                modified = YES;
+            if (![[self class] forEachLocalIdIn:obj doBlock:block modified:modified error:&localError]) {
+                *stop = YES;
+                hasFailed = YES;
             }
         }];
+        if (hasFailed && error) {
+            *error = localError;
+            return NO;
+        }
     } else if ([object isKindOfClass:[NSArray class]]) {
         for (id value in object) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
-                modified = YES;
+            if (![[self class] forEachLocalIdIn:value doBlock:block modified:modified error:error]) {
+                return NO;
             }
         }
     } else if ([object isKindOfClass:[PFAddOperation class]]) {
         for (id value in ((PFAddOperation *)object).objects) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
-                modified = YES;
+            if (![[self class] forEachLocalIdIn:value doBlock:block modified:modified  error:error]) {
+                return NO;
             }
         }
     } else if ([object isKindOfClass:[PFAddUniqueOperation class]]) {
         for (id value in ((PFAddUniqueOperation *)object).objects) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
-                modified = YES;
+            if (![[self class] forEachLocalIdIn:value doBlock:block modified:modified error:error]) {
+                return NO;
             }
         }
     } else if ([object isKindOfClass:[PFRemoveOperation class]]) {
         for (id value in ((PFRemoveOperation *)object).objects) {
-            if ([[self class] forEachLocalIdIn:value doBlock:block]) {
-                modified = YES;
+            if (![[self class] forEachLocalIdIn:value doBlock:block modified:modified error:error]) {
+                return NO;
             }
         }
     }
-
-    return modified;
+    return YES;
 }
 
-- (void)forEachLocalId:(BOOL(^)(PFObject *pointer))block {
+- (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer, BOOL *modified, NSError **error))block error:(NSError **)error {
     NSDictionary *data = [[PFDecoder objectDecoder] decodeObject:self.parameters];
     if (!data) {
-        return;
+        return YES;
     }
-
-    if ([[self class] forEachLocalIdIn:data doBlock:block]) {
-        self.parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:data];
+    BOOL modified = NO;
+    if ([[self class] forEachLocalIdIn:data doBlock:block modified:&modified error:error]) {
+        self.parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:data error:error];
+        if (self.parameters && !(error && *error)) {
+            return YES;
+        }
     }
+    return NO;
 }
 
-- (void)resolveLocalIds {
-    [self forEachLocalId:^(PFObject *pointer) {
-        [pointer resolveLocalId];
-        return YES;
-    }];
+- (BOOL)resolveLocalIds:(NSError * __autoreleasing *)error {
+    BOOL paramEncodingSucceeded = [self forEachLocalId:^(PFObject *pointer, BOOL *modified, NSError **blockError) {
+        NSError *localError;
+        BOOL success = [pointer resolveLocalId:&localError];
+        *modified = YES;
+        if (!success && localError) {
+            *blockError = localError;
+        }
+        return success;
+    } error: error];
+    if (!paramEncodingSucceeded && *error) {
+        return NO;
+    }
     [self maybeChangeServerOperation];
+    return YES;
 }
 
 @end

Parse/Parse/Internal/Commands/PFRESTConfigCommand.m

@@ -18,7 +18,8 @@ + (instancetype)configFetchCommandWithSessionToken:(NSString *)sessionToken {
     return [self commandWithHTTPPath:@"config"
                           httpMethod:PFHTTPRequestMethodGET
                           parameters:nil
-                        sessionToken:sessionToken];
+                        sessionToken:sessionToken
+                               error:nil];
 }
 
 + (instancetype)configUpdateCommandWithConfigParameters:(NSDictionary *)parameters
@@ -27,7 +28,8 @@ + (instancetype)configUpdateCommandWithConfigParameters:(NSDictionary *)paramete
     return [self commandWithHTTPPath:@"config"
                           httpMethod:PFHTTPRequestMethodPUT
                           parameters:commandParameters
-                        sessionToken:sessionToken];
+                        sessionToken:sessionToken
+                               error:nil];
 }
 
 @end