fix http response parser (#401)

veritrans · Dec 10, 2018 · 000aa1a · 000aa1a
1 parent 5224ba0
commit 000aa1a
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 55 deletions.
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransNetworkOperation.m b/MidtransCoreKit/MidtransCoreKit/MidtransNetworkOperation.m
@@ -131,45 +131,52 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
         [object setObject:[_responseData SNPvalidateUTF8] forKey:kMTNetworkOperationResponse];
     [[NSNotificationCenter defaultCenter] postNotificationName:MTNetworkingDidFinishRequest object:object];
 
-    if (responseObject[MIDTRANS_CORE_STATUS_CODE]) {
-        NSInteger code = [responseObject[MIDTRANS_CORE_STATUS_CODE] integerValue];
-        if (code/100 == 2) {
-            if (self.callback) self.callback(responseObject, nil);
-        }
-        else if (code == 400) {
-            id statusMessage = responseObject[@"status_message"];
-            id validationMessage = responseObject[@"validation_messages"];
-
-            NSMutableDictionary *userInfo = [NSMutableDictionary new];
-            if (statusMessage) {
-                userInfo[NSLocalizedDescriptionKey] = statusMessage;
+    if ([responseObject isKindOfClass:[NSArray class]] || [responseObject isKindOfClass:[NSMutableArray class]]) {
+        if (self.callback) self.callback(responseObject, nil);
+
+    } else {
+        if (responseObject[MIDTRANS_CORE_STATUS_CODE]) {
+            NSInteger code = [responseObject[MIDTRANS_CORE_STATUS_CODE] integerValue];
+            if (code/100 == 2) {
+                if (self.callback) self.callback(responseObject, nil);
             }
-
-            if (validationMessage) {
-                userInfo[NSLocalizedFailureReasonErrorKey] = validationMessage;
+            else if (code == 400) {
+                id statusMessage = responseObject[@"status_message"];
+                id validationMessage = responseObject[@"validation_messages"];
+
+                NSMutableDictionary *userInfo = [NSMutableDictionary new];
+                if (statusMessage) {
+                    userInfo[NSLocalizedDescriptionKey] = statusMessage;
+                }
+
+                if (validationMessage) {
+                    userInfo[NSLocalizedFailureReasonErrorKey] = validationMessage;
+                }
+
+                NSError *error = [NSError errorWithDomain:MIDTRANS_ERROR_DOMAIN
+                                                     code:code
+                                                 userInfo:userInfo];
+                if (self.callback) self.callback(nil, error);
+            }
+            else {
+                id statusMessage = responseObject[@"status_message"];
+                NSMutableDictionary *userInfo = [NSMutableDictionary new];
+                if (statusMessage) {
+                    userInfo[NSLocalizedDescriptionKey] = statusMessage;
+                }
+
+                NSError *error = [NSError errorWithDomain:MIDTRANS_ERROR_DOMAIN
+                                                     code:code
+                                                 userInfo:userInfo];
+                if (self.callback) self.callback(nil, error);
             }
-
-            NSError *error = [NSError errorWithDomain:MIDTRANS_ERROR_DOMAIN
-                                                 code:code
-                                             userInfo:userInfo];
-            if (self.callback) self.callback(nil, error);
         }
         else {
-            id statusMessage = responseObject[@"status_message"];
-            NSMutableDictionary *userInfo = [NSMutableDictionary new];
-            if (statusMessage) {
-                userInfo[NSLocalizedDescriptionKey] = statusMessage;
-            }
-
-            NSError *error = [NSError errorWithDomain:MIDTRANS_ERROR_DOMAIN
-                                                 code:code
-                                             userInfo:userInfo];
-            if (self.callback) self.callback(nil, error);
+            if (self.callback) self.callback(responseObject, nil);
         }
     }
-    else {
-        if (self.callback) self.callback(responseObject, nil);
-    }
+
+
 
     [self finish];
 }

diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m
@@ -60,29 +60,28 @@ - (void)viewDidLoad {
     self.progressHUD = [JGProgressHUD progressHUDWithStyle:JGProgressHUDStyleDark];
     self.progressHUD.textLabel.text = @"Loading...";
 
-//    NSString *clientkey;
-//    NSString *merchantServer;
-//    CC_CONFIG.paymentType = [[MDOptionManager shared].ccTypeOption.value integerValue];
-//    switch (CC_CONFIG.paymentType) {
-//        case MTCreditCardPaymentTypeOneclick:
-//            clientkey = @"VT-client-E4f1bsi1LpL1p5cF";
-//            merchantServer = @"https://rakawm-snap.herokuapp.com";
-//            CC_CONFIG.tokenStorageEnabled = NO;
-//            break;
-//        default:
-//            clientkey = @"SB-Mid-client-txZHOj6jPP0_G8En";
-//            merchantServer = @"https://dev-mobile-store.herokuapp.com/";
-//            CC_CONFIG.tokenStorageEnabled = YES;
-//            break;
-//    }
-//    [CONFIG setClientKey:clientkey
-//             environment:MidtransServerEnvironmentSandbox
-//       merchantServerURL:merchantServer];
-
-    [CONFIG setClientKey:@"VT-client-yrHf-c8Sxr-ck8tx"
-             environment:MidtransServerEnvironmentProduction
-       merchantServerURL:@"https://midtrans-mobile-snap.herokuapp.com"];
+    NSString *clientkey;
+    NSString *merchantServer;
+    CC_CONFIG.paymentType = [[MDOptionManager shared].ccTypeOption.value integerValue];
+    switch (CC_CONFIG.paymentType) {
+        case MTCreditCardPaymentTypeOneclick:
+            clientkey = @"VT-client-E4f1bsi1LpL1p5cF";
+            merchantServer = @"https://rakawm-snap.herokuapp.com";
+            CC_CONFIG.tokenStorageEnabled = NO;
+            break;
+        default:
+            clientkey = @"SB-Mid-client-txZHOj6jPP0_G8En";
+            merchantServer = @"https://dev-mobile-store.herokuapp.com/";
+            CC_CONFIG.tokenStorageEnabled = YES;
+            break;
+    }
+    [CONFIG setClientKey:clientkey
+             environment:MidtransServerEnvironmentSandbox
+       merchantServerURL:merchantServer];
 
+//    [CONFIG setClientKey:@"VT-client-yrHf-c8Sxr-ck8tx"
+//             environment:MidtransServerEnvironmentProduction
+//       merchantServerURL:@"https://midtrans-mobile-snap.herokuapp.com"];
 
     //forced to use token storage
     UICONFIG.hideStatusPage = NO;