fix(AWSLocation): Fixing clock skew retries (#5491)

aws-amplify · Jan 10, 2025 · 95a2a45 · 95a2a45
1 parent e00fa50
commit 95a2a45
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/integ-test.yml b/.github/workflows/integ-test.yml
@@ -47,6 +47,7 @@ jobs:
           - AWSKinesisVideoSignaling
           - AWSLambda
           - AWSLex
+          - AWSLocation
           - AWSPinpoint
           - AWSPolly
           - AWSRekognition

diff --git a/AWSLocation/AWSLocationService.m b/AWSLocation/AWSLocationService.m
@@ -62,27 +62,34 @@ - (id)responseObjectForResponse:(NSHTTPURLResponse *)response
                                                     data:data
                                                    error:error];
     if (!*error && [responseObject isKindOfClass:[NSDictionary class]]) {
-    	NSString *errorTypeString = [[response allHeaderFields] objectForKey:@"x-amzn-ErrorType"];
+        if (!error) {
+            return responseObject;
+        }
+
+        NSString *errorTypeString = [[response allHeaderFields] objectForKey:@"x-amzn-ErrorType"];
         NSString *errorTypeHeader = [[errorTypeString componentsSeparatedByString:@":"] firstObject];
 
         if ([errorTypeString length] > 0 && errorTypeHeader) {
-            if (errorCodeDictionary[errorTypeHeader]) {
-                if (error) {
-                    NSDictionary *userInfo = @{NSLocalizedDescriptionKey : [responseObject objectForKey:@"message"]?[responseObject objectForKey:@"message"]:[NSNull null], NSLocalizedFailureReasonErrorKey: errorTypeString};
-                    *error = [NSError errorWithDomain:AWSLocationErrorDomain
-                                                 code:[[errorCodeDictionary objectForKey:errorTypeHeader] integerValue]
-                                             userInfo:userInfo];
-                }
-                return responseObject;
-            } else if (errorTypeHeader) {
-                if (error) {
-                    NSDictionary *userInfo = @{NSLocalizedDescriptionKey : [responseObject objectForKey:@"message"]?[responseObject objectForKey:@"message"]:[NSNull null], NSLocalizedFailureReasonErrorKey: errorTypeString};
-                    *error = [NSError errorWithDomain:AWSLocationErrorDomain
-                                                 code:AWSLocationErrorUnknown
-                                             userInfo:userInfo];
-                }
-                return responseObject;
+            NSString *errorDomain = nil;
+            NSNumber *errorCode = nil;
+
+            if (errorCodeDictionary[errorTypeHeader]) { // First, check if it's a Location error
+                errorDomain = AWSLocationErrorDomain;
+                errorCode = errorCodeDictionary[errorTypeHeader];
+            } else if ([[AWSService errorCodeDictionary] objectForKey:errorTypeHeader]) { // Then, check if it's a Service error
+                errorDomain = AWSServiceErrorDomain;
+                errorCode = [[AWSService errorCodeDictionary] objectForKey:errorTypeHeader];
+            } else { // Finally, fallback to an unknown location error
+                errorDomain = AWSLocationErrorDomain;
+                errorCode = [[NSNumber alloc] initWithInt:AWSLocationErrorUnknown];
             }
+
+            NSDictionary *userInfo = @{NSLocalizedDescriptionKey : [responseObject objectForKey:@"message"]?[responseObject objectForKey:@"message"]:[NSNull null], NSLocalizedFailureReasonErrorKey: errorTypeString};
+            *error = [NSError errorWithDomain:errorDomain
+                                         code:[errorCode integerValue]
+                                     userInfo:userInfo];
+
+            return responseObject;
         }
     }
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## Unreleased
 
--Features for next release
+### Bug Fixes
+- **AWSLocation** 
+  - Fixing clock skew retries (#5491)
 
 ## 2.39.0