chore(api): API Pigeon update (aws-amplify#1813)

HuiSF · Nov 10, 2022 · b03dade · b03dade
1 parent d5aadb7
commit b03dade
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 27 deletions.
diff --git a/packages/api/amplify_api/lib/src/native_api_plugin.dart b/packages/api/amplify_api/lib/src/native_api_plugin.dart
@@ -12,7 +12,7 @@
 // express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 //
-// Autogenerated from Pigeon (v3.1.5), do not edit directly.
+// Autogenerated from Pigeon (v3.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name
 // @dart = 2.12

diff --git a/packages/api/amplify_api/pigeons/native_api_plugin.dart b/packages/api/amplify_api/pigeons/native_api_plugin.dart
@@ -39,5 +39,6 @@ import 'package:pigeon/pigeon.dart';
 
 @HostApi()
 abstract class NativeApiBridge {
+  @async
   void addPlugin(List<String> authProvidersList);
 }
diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pubspec.yaml
@@ -23,12 +23,6 @@ dependencies:
   meta: ^1.7.0
   plugin_platform_interface: ^2.0.0
 
-dependency_overrides:
-  # TODO(dnys1): Remove when pigeon is bumped
-  # https://github.com/flutter/flutter/issues/105090
-  analyzer: ^3.0.0
-
-
 dev_dependencies:
   amplify_lints: 
     path: ../../amplify_lints
@@ -38,7 +32,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mocktail: ^0.3.0
-  pigeon: ^3.1.5
+  pigeon: ^3.1.6
 
 # The following section is specific to Flutter.
 flutter:

diff --git a/...plify_api_android/android/src/main/kotlin/com/amazonaws/amplify/amplify_api/AmplifyApi.kt b/...plify_api_android/android/src/main/kotlin/com/amazonaws/amplify/amplify_api/AmplifyApi.kt
@@ -159,7 +159,10 @@ class AmplifyApi : FlutterPlugin, MethodCallHandler, NativeApiPluginBindings.Nat
         )
     }
 
-    override fun addPlugin(authProvidersList: MutableList<String>) {
+    override fun addPlugin(
+        authProvidersList: MutableList<String>,
+        result: NativeApiPluginBindings.Result<Void>
+    ) {
         try {
             val authProviders = authProvidersList.map { AuthorizationType.valueOf(it) }
             if (flutterAuthProviders == null) {
@@ -173,8 +176,10 @@ class AmplifyApi : FlutterPlugin, MethodCallHandler, NativeApiPluginBindings.Nat
                     .build()
             )
             logger.info("Added API plugin")
+            result.success(null)
         } catch (e: Exception) {
             logger.error(e.message)
+            result.error(e)
         }
     }
 }
diff --git a/...id/android/src/main/kotlin/com/amazonaws/amplify/amplify_api/NativeApiPluginBindings.java b/...id/android/src/main/kotlin/com/amazonaws/amplify/amplify_api/NativeApiPluginBindings.java
@@ -12,7 +12,7 @@
 // express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 //  
-// Autogenerated from Pigeon (v3.1.5), do not edit directly.
+// Autogenerated from Pigeon (v3.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.amazonaws.amplify.amplify_api;
@@ -35,14 +35,19 @@
 /** Generated class from Pigeon. */
 @SuppressWarnings({"unused", "unchecked", "CodeBlock2Expr", "RedundantSuppression"})
 public class NativeApiPluginBindings {
+
+  public interface Result<T> {
+    void success(T result);
+    void error(Throwable error);
+  }
   private static class NativeApiBridgeCodec extends StandardMessageCodec {
     public static final NativeApiBridgeCodec INSTANCE = new NativeApiBridgeCodec();
     private NativeApiBridgeCodec() {}
   }
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface NativeApiBridge {
-    void addPlugin(@NonNull List<String> authProvidersList);
+    void addPlugin(@NonNull List<String> authProvidersList, Result<Void> result);
 
     /** The codec used by NativeApiBridge. */
     static MessageCodec<Object> getCodec() {
@@ -63,13 +68,23 @@ static void setup(BinaryMessenger binaryMessenger, NativeApiBridge api) {
               if (authProvidersListArg == null) {
                 throw new NullPointerException("authProvidersListArg unexpectedly null.");
               }
-              api.addPlugin(authProvidersListArg);
-              wrapped.put("result", null);
+              Result<Void> resultCallback = new Result<Void>() {
+                public void success(Void result) {
+                  wrapped.put("result", null);
+                  reply.reply(wrapped);
+                }
+                public void error(Throwable error) {
+                  wrapped.put("error", wrapError(error));
+                  reply.reply(wrapped);
+                }
+              };
+
+              api.addPlugin(authProvidersListArg, resultCallback);
             }
             catch (Error | RuntimeException exception) {
               wrapped.put("error", wrapError(exception));
+              reply.reply(wrapped);
             }
-            reply.reply(wrapped);
           });
         } else {
           channel.setMessageHandler(null);

diff --git a/packages/api/amplify_api_ios/ios/Classes/NativeApiPlugin.h b/packages/api/amplify_api_ios/ios/Classes/NativeApiPlugin.h
@@ -12,7 +12,7 @@
 // express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 //  
-// Autogenerated from Pigeon (v3.1.5), do not edit directly.
+// Autogenerated from Pigeon (v3.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 #import <Foundation/Foundation.h>
 @protocol FlutterBinaryMessenger;
@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 NSObject<FlutterMessageCodec> *NativeApiBridgeGetCodec(void);
 
 @protocol NativeApiBridge
-- (void)addPluginAuthProvidersList:(NSArray<NSString *> *)authProvidersList error:(FlutterError *_Nullable *_Nonnull)error;
+- (void)addPluginAuthProvidersList:(NSArray<NSString *> *)authProvidersList completion:(void(^)(FlutterError *_Nullable))completion;
 @end
 
 extern void NativeApiBridgeSetup(id<FlutterBinaryMessenger> binaryMessenger, NSObject<NativeApiBridge> *_Nullable api);

diff --git a/packages/api/amplify_api_ios/ios/Classes/NativeApiPlugin.m b/packages/api/amplify_api_ios/ios/Classes/NativeApiPlugin.m
@@ -12,7 +12,7 @@
 // express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 //  
-// Autogenerated from Pigeon (v3.1.5), do not edit directly.
+// Autogenerated from Pigeon (v3.2.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 #import "NativeApiPlugin.h"
 #import <Flutter/Flutter.h>
@@ -86,13 +86,13 @@ void NativeApiBridgeSetup(id<FlutterBinaryMessenger> binaryMessenger, NSObject<N
         binaryMessenger:binaryMessenger
         codec:NativeApiBridgeGetCodec()        ];
     if (api) {
-      NSCAssert([api respondsToSelector:@selector(addPluginAuthProvidersList:error:)], @"NativeApiBridge api (%@) doesn't respond to @selector(addPluginAuthProvidersList:error:)", api);
+      NSCAssert([api respondsToSelector:@selector(addPluginAuthProvidersList:completion:)], @"NativeApiBridge api (%@) doesn't respond to @selector(addPluginAuthProvidersList:completion:)", api);
       [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
         NSArray *args = message;
         NSArray<NSString *> *arg_authProvidersList = GetNullableObjectAtIndex(args, 0);
-        FlutterError *error;
-        [api addPluginAuthProvidersList:arg_authProvidersList error:&error];
-        callback(wrapResult(nil, error));
+        [api addPluginAuthProvidersList:arg_authProvidersList completion:^(FlutterError *_Nullable error) {
+          callback(wrapResult(nil, error));
+        }];
       }];
     }
     else {

diff --git a/packages/api/amplify_api_ios/ios/Classes/SwiftAmplifyApiPlugin.swift b/packages/api/amplify_api_ios/ios/Classes/SwiftAmplifyApiPlugin.swift
@@ -70,7 +70,7 @@ public class SwiftAmplifyApiPlugin: NSObject, FlutterPlugin, NativeApiBridge {
         }
     }
 
-    public func addPluginAuthProvidersList(_ authProvidersList: [String], error: AutoreleasingUnsafeMutablePointer<FlutterError?>) {
+    public func addPluginAuthProvidersList(_ authProvidersList: [String]) async -> FlutterError? {
         do {
             let authProviders = authProvidersList.compactMap {
                 AWSAuthorizationType(rawValue: $0)
@@ -79,8 +79,9 @@ public class SwiftAmplifyApiPlugin: NSObject, FlutterPlugin, NativeApiBridge {
                 plugin: AWSAPIPlugin(
                     sessionFactory: FlutterURLSessionBehaviorFactory(),
                     apiAuthProviderFactory: FlutterAuthProviders(authProviders)))
+            return nil
         } catch let apiError as APIError {
-            error.pointee = FlutterError(
+            return FlutterError(
                 code: "APIException",
                 message: apiError.localizedDescription,
                 details: [
@@ -94,7 +95,7 @@ public class SwiftAmplifyApiPlugin: NSObject, FlutterPlugin, NativeApiBridge {
             if case .amplifyAlreadyConfigured = configError {
                 errorCode = "AmplifyAlreadyConfiguredException"
             }
-            error.pointee = FlutterError(
+            return FlutterError(
                 code: errorCode,
                 message: configError.localizedDescription,
                 details: [
@@ -104,7 +105,7 @@ public class SwiftAmplifyApiPlugin: NSObject, FlutterPlugin, NativeApiBridge {
                 ]
             )
         } catch let e {
-            error.pointee = FlutterError(
+            return FlutterError(
                 code: "UNKNOWN",
                 message: e.localizedDescription,
                 details: nil

diff --git a/packages/api/amplify_api_ios/ios/amplify_api_ios.podspec b/packages/api/amplify_api_ios/ios/amplify_api_ios.podspec
@@ -18,8 +18,10 @@ The API module for Amplify Flutter.
   s.dependency 'Amplify', '1.23.0'
   s.dependency 'AmplifyPlugins/AWSAPIPlugin', '1.23.0'
   s.dependency 'amplify_flutter_ios'
-  s.platform = :ios, '11.0'
-  s.swift_version = '5.0'
+
+  # These are needed to support async/await with pigeon
+  s.platform = :ios, '13.0'
+  s.swift_version = '5.5'
 
   # Use a custom module map with a manually written umbrella header.
   #