Merge pull request #173 from olgadanylova/master

BackendlessUserAdapter fixed to handle errors correctly

Author: ksv510

SDK/backendlessAPI/Classes/Persistence/PersistenceAdapter/BackendlessUserAdapter.m

@@ -30,23 +30,28 @@
 @implementation BackendlessUserAdapter
 
 -(id)adapt:(id)type {
-    V3Message *v3 = (V3Message *)[type defaultAdapt];
-    if (v3.isError) {
-        ErrMessage *result = (ErrMessage *)v3;
-        return [Fault fault:result.faultString detail:result.faultDetail faultCode:result.faultCode];
-    }
     NSMutableDictionary *typeProperties = ((AnonymousObject *)[type getCacheKey]).properties;
-    id body = [typeProperties valueForKey:@"body"];
-    if ([body isKindOfClass:[NamedObject class]]) {
-        return [self adaptToBackendlessUser:body];
+    if ([typeProperties valueForKey:@"faultCode"] ||
+        [typeProperties valueForKey:@"faultDetail"] ||
+        [typeProperties valueForKey:@"faultString"]) {
+        Fault *fault = [[Fault alloc] initWithMessage:[[typeProperties valueForKey:@"faultString"] defaultAdapt]
+                                               detail:[[typeProperties valueForKey:@"faultDetail"] defaultAdapt]
+                                            faultCode:[[typeProperties valueForKey:@"faultCode"] defaultAdapt]];
+        return fault;
     }
-    else if ([body isKindOfClass:[ArrayType class]]) {
-        NSMutableArray *result = [NSMutableArray new];
-        NSArray *bodyObjects = [body getArray];
-        for (NamedObject *bodyObject in bodyObjects) {
-            [result addObject:[self adaptToBackendlessUser:bodyObject]];
+    else {
+        id body = [typeProperties valueForKey:@"body"];
+        if ([body isKindOfClass:[NamedObject class]]) {
+            return [self adaptToBackendlessUser:body];
+        }
+        else if ([body isKindOfClass:[ArrayType class]]) {
+            NSMutableArray *result = [NSMutableArray new];
+            NSArray *bodyObjects = [body getArray];
+            for (NamedObject *bodyObject in bodyObjects) {
+                [result addObject:[self adaptToBackendlessUser:bodyObject]];
+            }
+            return result;
         }
-        return result;
     }
     return nil;
 }
@@ -55,7 +60,7 @@ -(BackendlessUser *)adaptToBackendlessUser:(NamedObject *)body {
     BackendlessUser *user = [BackendlessUser new];
     NSMutableDictionary *bodyProperties = ((AnonymousObject *)[body getCacheKey]).properties;
     for (NSString *key in [bodyProperties allKeys]) {
-            [user setProperty:key object:[[bodyProperties valueForKey:key] defaultAdapt]];
+        [user setProperty:key object:[[bodyProperties valueForKey:key] defaultAdapt]];
     }
     return user;
 }

SDK/backendlessAPI/Classes/weborb/Reader/AnonymousObject.m

@@ -111,7 +111,7 @@ -(id)setFieldsDirect:(id)obj cache:(ReaderReferenceCache *)referenceCache {
                 }
             }
         }
-        
+    
         // BackendlessUser adaptation (for relations)
         if ([propValue isKindOfClass:[ArrayType class]]) {
             NSMutableArray *newPropValueArray = [NSMutableArray new];