feat(api): Subscription Reconnection

packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,6 +5,8 @@
 import FlutterMacOS
 import Foundation
 
+import connectivity_plus_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
 }

packages/amplify/amplify_flutter/example/windows/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
 }

packages/amplify/amplify_flutter/example/windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

packages/amplify/amplify_flutter/lib/src/hybrid_impl.dart

@@ -34,8 +34,10 @@ class AmplifyHybridImpl extends AmplifyClassImpl {
     );
     await Future.wait(
       [
+        ...API.plugins,
         ...Auth.plugins,
-      ].map((p) => p.configure(config: amplifyConfig)),
+      ].map((p) => p.configure(
+          config: amplifyConfig, authProviderRepo: authProviderRepo)),
       eagerError: true,
     );
     await _methodChannelAmplify.configurePlatform(config);

packages/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,6 +5,8 @@
 import FlutterMacOS
 import Foundation
 
+import connectivity_plus_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
 }

packages/amplify_authenticator/example/windows/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
 }

packages/amplify_authenticator/example/windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

packages/amplify_core/lib/amplify_core.dart

@@ -74,6 +74,9 @@ export 'src/types/api/api_types.dart';
 /// Auth
 export 'src/types/auth/auth_types.dart';
 
+/// Auth providers
+export 'src/types/common/amplify_auth_provider.dart';
+
 /// Datastore
 export 'src/types/datastore/datastore_types.dart' hide DateTimeParse;
 

packages/amplify_core/lib/src/amplify_class_impl.dart

@@ -24,6 +24,11 @@ import 'package:meta/meta.dart';
 /// {@endtemplate}
 @internal
 class AmplifyClassImpl extends AmplifyClass {
+  /// Share AmplifyAuthProviders with plugins.
+  @protected
+  final AmplifyAuthProviderRepository authProviderRepo =
+      AmplifyAuthProviderRepository();
+
   /// {@macro amplify_flutter.amplify_class_impl}
   AmplifyClassImpl() : super.protected();
 
@@ -57,7 +62,8 @@ class AmplifyClassImpl extends AmplifyClass {
         ...Auth.plugins,
         ...DataStore.plugins,
         ...Storage.plugins,
-      ].map((p) => p.configure(config: amplifyConfig)),
+      ].map((p) => p.configure(
+          config: amplifyConfig, authProviderRepo: authProviderRepo)),
       eagerError: true,
     );
   }

packages/amplify_core/lib/src/category/amplify_api_category.dart

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -21,17 +21,13 @@ class APICategory extends AmplifyCategory<APIPluginInterface> {
   Category get category => Category.api;
 
   // ====== GraphQL =======
-  GraphQLOperation<T> query<T>({required GraphQLRequest<T> request}) {
-    return plugins.length == 1
-        ? plugins[0].query(request: request)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<GraphQLResponse<T>> query<T>(
+          {required GraphQLRequest<T> request}) =>
+      defaultPlugin.query(request: request);
 
-  GraphQLOperation<T> mutate<T>({required GraphQLRequest<T> request}) {
-    return plugins.length == 1
-        ? plugins[0].mutate(request: request)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<GraphQLResponse<T>> mutate<T>(
+          {required GraphQLRequest<T> request}) =>
+      defaultPlugin.mutate(request: request);
 
   /// Subscribes to the given [request] and returns the stream of response events.
   /// An optional [onEstablished] callback can be used to be alerted when the
@@ -42,52 +38,88 @@ class APICategory extends AmplifyCategory<APIPluginInterface> {
   Stream<GraphQLResponse<T>> subscribe<T>(
     GraphQLRequest<T> request, {
     void Function()? onEstablished,
-  }) {
-    return plugins.length == 1
-        ? plugins[0].subscribe(request, onEstablished: onEstablished)
-        : throw _pluginNotAddedException('Api');
-  }
+  }) =>
+      defaultPlugin.subscribe(request, onEstablished: onEstablished);
 
   // ====== RestAPI ======
-  void cancelRequest(String cancelToken) {
-    return plugins.length == 1
-        ? plugins[0].cancelRequest(cancelToken)
-        : throw _pluginNotAddedException('Api');
-  }
 
-  RestOperation get({required RestOptions restOptions}) {
-    return plugins.length == 1
-        ? plugins[0].get(restOptions: restOptions)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<AWSStreamedHttpResponse> delete(
+    String path, {
+    Map<String, String>? headers,
+    HttpPayload? body,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) =>
+      defaultPlugin.delete(
+        path,
+        headers: headers,
+        body: body,
+        apiName: apiName,
+      );
 
-  RestOperation put({required RestOptions restOptions}) {
-    return plugins.length == 1
-        ? plugins[0].put(restOptions: restOptions)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<AWSStreamedHttpResponse> get(
+    String path, {
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) =>
+      defaultPlugin.get(
+        path,
+        headers: headers,
+        apiName: apiName,
+      );
 
-  RestOperation post({required RestOptions restOptions}) {
-    return plugins.length == 1
-        ? plugins[0].post(restOptions: restOptions)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<AWSStreamedHttpResponse> head(
+    String path, {
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) =>
+      defaultPlugin.head(
+        path,
+        headers: headers,
+        apiName: apiName,
+      );
 
-  RestOperation delete({required RestOptions restOptions}) {
-    return plugins.length == 1
-        ? plugins[0].delete(restOptions: restOptions)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<AWSStreamedHttpResponse> patch(
+    String path, {
+    Map<String, String>? headers,
+    HttpPayload? body,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) =>
+      defaultPlugin.patch(
+        path,
+        headers: headers,
+        body: body,
+        apiName: apiName,
+      );
 
-  RestOperation head({required RestOptions restOptions}) {
-    return plugins.length == 1
-        ? plugins[0].head(restOptions: restOptions)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<AWSStreamedHttpResponse> post(
+    String path, {
+    Map<String, String>? headers,
+    HttpPayload? body,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) =>
+      defaultPlugin.post(
+        path,
+        headers: headers,
+        body: body,
+        apiName: apiName,
+      );
 
-  RestOperation patch({required RestOptions restOptions}) {
-    return plugins.length == 1
-        ? plugins[0].patch(restOptions: restOptions)
-        : throw _pluginNotAddedException('Api');
-  }
+  CancelableOperation<AWSStreamedHttpResponse> put(
+    String path, {
+    Map<String, String>? headers,
+    HttpPayload? body,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) =>
+      defaultPlugin.put(
+        path,
+        headers: headers,
+        body: body,
+        apiName: apiName,
+      );
 }

packages/amplify_core/lib/src/category/amplify_categories.dart

@@ -18,6 +18,7 @@ library amplify_interface;
 import 'dart:async';
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:async/async.dart';
 import 'package:collection/collection.dart';
 import 'package:meta/meta.dart';
 

packages/amplify_core/lib/src/hub/hub_channel.dart

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -28,4 +28,7 @@ enum HubChannel<HubEventPayload, E extends HubEvent<HubEventPayload>> {
 
   /// Events of the DataStore category.
   DataStore<DataStoreHubEventPayload, DataStoreHubEvent>(),
+
+  /// Events of the API category
+  Api<ApiHubEventPayload, ApiHubEvent>();
 }

packages/amplify_core/lib/src/plugin/amplify_api_plugin_interface.dart

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
  */
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:async/async.dart';
 import 'package:meta/meta.dart';
 
 abstract class APIPluginInterface extends AmplifyPluginInterface {
@@ -25,11 +26,13 @@ abstract class APIPluginInterface extends AmplifyPluginInterface {
   ModelProviderInterface? get modelProvider => throw UnimplementedError();
 
   // ====== GraphQL =======
-  GraphQLOperation<T> query<T>({required GraphQLRequest<T> request}) {
+  CancelableOperation<GraphQLResponse<T>> query<T>(
+      {required GraphQLRequest<T> request}) {
     throw UnimplementedError('query() has not been implemented.');
   }
 
-  GraphQLOperation<T> mutate<T>({required GraphQLRequest<T> request}) {
+  CancelableOperation<GraphQLResponse<T>> mutate<T>(
+      {required GraphQLRequest<T> request}) {
     throw UnimplementedError('mutate() has not been implemented.');
   }
 
@@ -50,31 +53,64 @@ abstract class APIPluginInterface extends AmplifyPluginInterface {
   void registerAuthProvider(APIAuthProvider authProvider);
 
   // ====== RestAPI ======
-  void cancelRequest(String cancelToken) {
-    throw UnimplementedError('cancelRequest has not been implemented.');
-  }
-
-  RestOperation get({required RestOptions restOptions}) {
-    throw UnimplementedError('get has not been implemented.');
+  CancelableOperation<AWSStreamedHttpResponse> delete(
+    String path, {
+    HttpPayload? body,
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) {
+    throw UnimplementedError('delete() has not been implemented');
   }
 
-  RestOperation put({required RestOptions restOptions}) {
-    throw UnimplementedError('put has not been implemented.');
+  /// Uses Amplify configuration to authorize request to [path] and returns
+  /// [CancelableOperation] which resolves to standard HTTP
+  /// [Response](https://pub.dev/documentation/http/latest/http/Response-class.html).
+  CancelableOperation<AWSStreamedHttpResponse> get(
+    String path, {
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) {
+    throw UnimplementedError('get() has not been implemented');
   }
 
-  RestOperation post({required RestOptions restOptions}) {
-    throw UnimplementedError('post has not been implemented.');
+  CancelableOperation<AWSStreamedHttpResponse> head(
+    String path, {
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) {
+    throw UnimplementedError('head() has not been implemented');
   }
 
-  RestOperation delete({required RestOptions restOptions}) {
-    throw UnimplementedError('delete has not been implemented.');
+  CancelableOperation<AWSStreamedHttpResponse> patch(
+    String path, {
+    HttpPayload? body,
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) {
+    throw UnimplementedError('patch() has not been implemented');
   }
 
-  RestOperation head({required RestOptions restOptions}) {
-    throw UnimplementedError('head has not been implemented.');
+  CancelableOperation<AWSStreamedHttpResponse> post(
+    String path, {
+    HttpPayload? body,
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) {
+    throw UnimplementedError('post() has not been implemented');
   }
 
-  RestOperation patch({required RestOptions restOptions}) {
-    throw UnimplementedError('patch has not been implemented.');
+  CancelableOperation<AWSStreamedHttpResponse> put(
+    String path, {
+    HttpPayload? body,
+    Map<String, String>? headers,
+    Map<String, String>? queryParameters,
+    String? apiName,
+  }) {
+    throw UnimplementedError('put() has not been implemented');
   }
 }