chore(): updated native code error handling

aws-amplify · Feb 3, 2025 · 859793c · 859793c
1 parent a7489f0
commit 859793c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/...ndroid/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/NativeAuthPluginWrapper.kt b/...ndroid/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/NativeAuthPluginWrapper.kt
@@ -126,6 +126,8 @@ class NativeAuthPluginWrapper(
                         userPoolTokens
                     )
                     onSuccess.accept(authSession)
+                } else {
+                    AuthSessionResult.failure(couldNotFetchException)
                 }
             }
         }

diff --git a/packages/amplify_datastore/ios/Classes/CognitoPlugin.swift b/packages/amplify_datastore/ios/Classes/CognitoPlugin.swift
@@ -35,7 +35,7 @@ public class CognitoPlugin: AuthCategoryPlugin {
                             let returning = NativeAWSAuthCognitoSession(from: session)
                             continuation.resume(returning: returning)
                         case .failure(let error):
-                            break //NoOp
+                            continuation.resume(throwing: error)
                     }            
                 }
             }

diff --git a/packages/amplify_datastore/ios/Classes/FlutterApiPlugin.swift b/packages/amplify_datastore/ios/Classes/FlutterApiPlugin.swift
@@ -31,7 +31,12 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation
                 if !reachabilityUpdate.isOnline {
                     DispatchQueue.main.async {
                         self.nativeApiPlugin.deviceOffline { result in
-                            //NoOp
+                            switch result {
+                                case .success(let session):
+                                    break //NoOp
+                                case .failure(let error):
+                                    throw error
+                            }      
                         }
                    }
                 }
@@ -97,7 +102,12 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation
             if let subscriptionId {
                 DispatchQueue.main.async {
                     self.nativeApiPlugin.unsubscribe(subscriptionId: subscriptionId) { result in
-                        //NoOp
+                        switch result {
+                            case .success(let session):
+                                break //NoOp
+                            case .failure(let error):
+                                throw error
+                        }  
                     }
                 }
             }
@@ -163,7 +173,7 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation
                     case .success(let response):
                          subscriptionId = response.subscriptionId
                     case .failure(let error): 
-                        break //NoOp
+                        throw error
                 }
             }
         }
@@ -230,7 +240,7 @@ public class FlutterApiPlugin: APICategoryPlugin, AWSAPIAuthInformation
                         case .success(let response):
                             continuation.resume(returning: response)
                         case .failure(let error): 
-                            break //NoOp
+                            throw error
                     }
                 }
             }

diff --git a/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift b/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift
@@ -234,7 +234,12 @@ public class SwiftAmplifyDataStorePlugin: NSObject, FlutterPlugin, NativeAmplify
             onStop(flutterResult: result)
             DispatchQueue.main.async {
                 self.nativeApiPlugin.onStop { result in
-                    //NoOp
+                    switch result {
+                        case .success(let session):
+                            break //NoOp
+                        case .failure(let error):
+                            throw error
+                    }   
                 }
             }
         default:

diff --git a/packages/amplify_datastore/ios/Classes/auth/FlutterAuthProviders.swift b/packages/amplify_datastore/ios/Classes/auth/FlutterAuthProviders.swift
@@ -47,7 +47,13 @@ class FlutterAuthProviders: APIAuthProviderFactory {
                                     ))
                             }
                         case .failure(let error): 
-                            break //NoOp
+                            token = .failure(APIError.operationError(
+                                    "Unable to retrieve token for \(type)",
+                                    """
+                                    Make sure you register your auth providers in the addPlugin call and \
+                                    that getLatestAuthToken returns a value.
+                                    """
+                                    ))
                     }
                 }
             }