Merge remote-tracking branch 'origin/master' into fix-tvos-watchos

Author: abnegate

.travis.yml

@@ -29,9 +29,9 @@ env:
   - SDK=DartStable
   - SDK=Deno1171
   - SDK=FlutterStable
+  - SDK=FlutterBeta
   - SDK=Go112
   - SDK=Go118
-#  - SDK=FlutterBeta
   - SDK=KotlinJava8
   - SDK=KotlinJava11
   - SDK=KotlinJava17

CONTRIBUTING.md

@@ -8,11 +8,11 @@
 
 **WORK IN PROGRESS - NOT READY FOR GENERAL USAGE**
 
-[Appwrite](https://appwrite.io) SDK generator is a PHP library for auto generating SDK libraries for multiple languages and platforms.
+[Appwrite](https://appwrite.io) SDK generator is a PHP library for auto-generating SDK libraries for multiple languages and platforms.
 
 The SDK Generator uses predefined language settings as [Twig templates](https://twig.symfony.com/) to generate codebases based on different API specs.
 
-Currently, the only spec supported is Swagger 2.0, but we intend to add support for more specifications in the near future. This generator is still lacking support for any definition/models specs.
+Currently, the only spec supported is Swagger 2.0, but we intend to add support for more specifications in the near future. This generator is still lacking support for any definition/model specs.
 
 ## Getting Started
 
@@ -134,7 +134,7 @@ $sdk->generate(__DIR__ . '/examples/php'); // Generate source code
 
 ## Contributing
 
-All code contributions - including those of people having commit access - must go through a pull request and approved by a core developer before being merged. This is to ensure proper review of all the code.
+All code contributions, including those by people with commit access, must go through a pull request and be approved by a core developer before being merged. This is to ensure proper review of all the code.
 
 We truly ❤️ pull requests! If you wish to help, you can learn more about how you can contribute to this project in the [contribution guide](CONTRIBUTING.md).
 

README.md

@@ -62,6 +62,13 @@ class {{ service.name | caseUcfirst }} : Service {
         {%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
             "{{ parameter.name }}" to {{ parameter.name | caseCamel }},
         {%~ endfor %}
+        {%~ if method.auth | length > 0 %}
+        {%~ for node in method.auth %}
+        {%~ for key,header in node | keys %}
+            "{{ header | caseLower }}" to client.config["{{ header | caseLower }}"],
+        {%~ endfor %}
+        {%~ endfor %}
+        {%~ endif %}
         )
         {%~ if method.type == 'webAuth' %}
         val query = mutableListOf<String>()
@@ -121,11 +128,11 @@ class {{ service.name | caseUcfirst }} : Service {
         )
         {%~ if method.responseModel %}
         val converter: (Any) -> {{ method | returnType(spec, sdk.namespace | caseDot) | raw }} = {
-        {% if method.responseModel == 'any' %}
+        {%~ if method.responseModel == 'any' %}
             it
-        {% else %}
-        {{sdk.namespace | caseDot}}.models.{{ method.responseModel | caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
-        {% endif %}
+        {%~ else %}
+            {{sdk.namespace | caseDot}}.models.{{ method.responseModel | caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
+        {%~ endif %}
         }
         {%~ endif %}
         {%~ if 'multipart/form-data' in method.consumes %}

templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig

@@ -133,18 +133,18 @@ class ClientIO extends ClientBase with ClientMixin {
   Future init() async {
     if(_initProgress) return;
     _initProgress = true;
-    // if web skip cookie implementation and origin header as those are automatically handled by browsers
     final Directory cookieDir = await _getCookiePath();
     _cookieJar = PersistCookieJar(storage: FileStorage(cookieDir.path));
     _interceptors.add(CookieManager(_cookieJar));
-    PackageInfo packageInfo = await PackageInfo.fromPlatform();
-    addHeader('Origin',
-        'appwrite-${Platform.operatingSystem}://${packageInfo.packageName}');
 
-    //creating custom user agent
-    DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
     var device = '';
     try {
+      PackageInfo packageInfo = await PackageInfo.fromPlatform();
+      addHeader('Origin',
+          'appwrite-${Platform.operatingSystem}://${packageInfo.packageName}');
+
+      //creating custom user agent
+      DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
       if (Platform.isAndroid) {
         final andinfo = await deviceInfoPlugin.androidInfo;
         device =
@@ -167,12 +167,14 @@ class ClientIO extends ClientBase with ClientMixin {
         final macinfo = await deviceInfoPlugin.macOsInfo;
         device = '(Macintosh; ${macinfo.model})';
       }
+      addHeader(
+          'user-agent', '${packageInfo.packageName}/${packageInfo.version} $device');
     } catch (e) {
       debugPrint('Error getting device info: $e');
       device = Platform.operatingSystem;
+      addHeader(
+          'user-agent', '$device');
     }
-    addHeader(
-        'user-agent', '${packageInfo.packageName}/${packageInfo.version} $device');
 
     _initialized = true;
     _initProgress = false;

templates/flutter/lib/src/client_io.dart.twig

@@ -23,15 +23,15 @@ class CookieManager extends Interceptor {
       }
       return request;
     }).catchError((e, stackTrace) {
-      // throw AppwriteException(e.message);
+      return request;
     });
     return request;
   }
 
   @override
   FutureOr<http.Response> onResponse(http.Response response) {
     _saveCookies(response).then((_) => response).catchError((e, stackTrace) {
-      // throw AppwriteException(e.message);
+      return response;
     });
     return response;
   }

templates/flutter/lib/src/cookie_manager.dart.twig

@@ -76,6 +76,24 @@ mixin RealtimeMixin {
             }
             break;
         }
+      }, onDone: () {
+        for (var list in _channels.values) {
+          for (var stream in list) {
+            stream.close();
+          }
+        }
+        _channels.clear();
+        _closeConnection();
+      }, onError: (err, stack) {
+        for (var list in _channels.values) {
+          for (var stream in list) {
+            stream.sink.addError(err, stack);
+          }
+        }
+        if (_websok?.closeCode != null && _websok?.closeCode != 1008) {
+          debugPrint("Reconnecting in one second.");
+          Future.delayed(Duration(seconds: 1), _createSocket);
+        }
       });
     } catch (e) {
       if (e is {{spec.title | caseUcfirst}}Exception) {

templates/flutter/lib/src/realtime_mixin.dart.twig

@@ -16,11 +16,12 @@ dependencies:
   flutter_web_auth_2: ^2.0.2
   http: ^0.13.5
   package_info_plus: ^3.0.2
-  path_provider: ^2.0.11
+  path_provider: ^2.0.12
   web_socket_channel: ^2.2.0
   universal_html: ^2.0.8
 
 dev_dependencies:
+  path_provider_platform_interface: ^2.0.5
   flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter

templates/flutter/pubspec.yaml.twig

@@ -69,11 +69,11 @@ class {{ service.name | caseUcfirst }} : Service {
         )
         {%~ if method.responseModel %}
         val converter: (Any) -> {{ method | returnType(spec, sdk.namespace | caseDot) | raw }} = {
-        {% if method.responseModel == 'any' %}
+        {%~ if method.responseModel == 'any' %}
             it
-        {% else %}
-        {{sdk.namespace | caseDot}}.models.{{ method.responseModel | caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
-        {% endif %}
+        {%~ else %}
+            {{ sdk.namespace | caseDot }}.models.{{ method.responseModel | caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
+        {%~ endif %}
         }
         {%~ endif %}
         {%~ if 'multipart/form-data' in method.consumes %}

templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig

@@ -10,8 +10,16 @@
         {%- else -%} let
         {%- endif %} params: [String: Any?] = [
         {%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
-            "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last %},{% endif %}
+            "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or method.auth | length > 0 %},{% endif %}
 
         {%~ endfor %}
+        {%~ if method.auth | length > 0 %}
+        {%~ for node in method.auth %}
+        {%~ for key,header in node | keys %}
+            "{{ header | caseLower }}": client.config["{{ header | caseLower }}"]{% if not loop.last %},{% endif %}
+
+        {%~ endfor %}
+        {%~ endfor %}
+        {%~ endif %}
         ]
         {%~ endif %}