Merge remote-tracking branch 'origin/master' into feat-android-updates

abnegate · abnegate · commit 1e44565a1462 · 2023-02-13T16:27:15.000+13:00
# Conflicts:
#	templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig
diff --git a/.travis.yml b/.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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.md b/README.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).
 
diff --git a/src/SDK/Language/Swift.php b/src/SDK/Language/Swift.php
@@ -176,8 +176,8 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/Codable+JSON.swift',
-                'template'      => 'swift/Sources/Extensions/Codable+JSON.swift.twig',
+                'destination'   => '/Sources/JSONCodable/Codable+JSON.swift',
+                'template'      => 'swift/Sources/JSONCodable/Codable+JSON.swift.twig',
             ],
             [
                 'scope'         => 'default',
diff --git a/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig b/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig
@@ -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>()
diff --git a/templates/flutter/lib/src/client_io.dart.twig b/templates/flutter/lib/src/client_io.dart.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;
diff --git a/templates/flutter/lib/src/cookie_manager.dart.twig b/templates/flutter/lib/src/cookie_manager.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;
   }
diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.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
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig
@@ -72,7 +72,7 @@ class {{ service.name | caseUcfirst }} : Service {
         {%~ 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 %})
+            {{ sdk.namespace | caseDot }}.models.{{ method.responseModel | caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel | hasGenericType(spec) %}, nestedType{% endif %})
         {%~ endif %}
         }
         {%~ endif %}
diff --git a/templates/swift/Package.swift.twig b/templates/swift/Package.swift.twig
@@ -13,7 +13,7 @@ let package = Package(
     products: [
         .library(
             name: "{{spec.title | caseUcfirst}}",
-            targets: ["{{spec.title | caseUcfirst}}", "{{spec.title | caseUcfirst}}Models"]
+            targets: ["{{spec.title | caseUcfirst}}", "{{spec.title | caseUcfirst}}Models", "JSONCodable"]
         ),
     ],
     dependencies: [
@@ -26,11 +26,18 @@ let package = Package(
             dependencies: [
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .product(name: "NIOWebSocket", package: "swift-nio"),
-                "{{spec.title | caseUcfirst}}Models"
+                "{{spec.title | caseUcfirst}}Models",
+                "JSONCodable"
             ]
         ),
         .target(
-            name: "{{spec.title | caseUcfirst}}Models"
+            name: "{{spec.title | caseUcfirst}}Models",
+            dependencies: [
+                "JSONCodable"
+            ]
+        ),
+        .target(
+            name: "JSONCodable"
         ),
         .testTarget(
             name: "{{spec.title | caseUcfirst}}Tests",
diff --git a/templates/swift/Sources/JSONCodable/Codable+JSON.swift.twig b/templates/swift/Sources/JSONCodable/Codable+JSON.swift.twig
@@ -6,13 +6,13 @@ let jsonDecoder = JSONDecoder()
 // MARK: - Conversions
 
 extension Encodable {
-    func toJson() throws -> String {
+    public func toJson() throws -> String {
         return String(data: try jsonEncoder.encode(self), encoding: .utf8)!
     }
 }
 
 extension String {
-    func fromJson<T : Decodable>(to model: T.Type) throws -> T {
+    public func fromJson<T : Decodable>(to model: T.Type) throws -> T {
         return try jsonDecoder.decode(model, from: self.data(using: .utf8)!)
     }
 }
@@ -22,7 +22,7 @@ protocol JsonConvert : Encodable {
 }
 
 extension JsonConvert {
-    func jsonCast<T : Decodable>(to model: T.Type) throws -> T {
+    public func jsonCast<T : Decodable>(to model: T.Type) throws -> T {
         let string = try (self as Encodable).toJson()
         return try string.fromJson(to: model)
     }
diff --git a/templates/swift/Sources/Models/Model.swift.twig b/templates/swift/Sources/Models/Model.swift.twig
@@ -1,4 +1,5 @@
 import Foundation
+import JSONCodable
 
 /// {{ definition.description }}
 {% if definition.properties | length == 0 and not definition.additionalProperties %}
diff --git a/templates/swift/Sources/Services/Service.swift.twig b/templates/swift/Sources/Services/Service.swift.twig
@@ -1,6 +1,7 @@
 import AsyncHTTPClient
 import Foundation
 import NIO
+import JSONCodable
 import {{spec.title | caseUcfirst}}Models
 
 /// {{ service.description }}
@@ -25,7 +26,7 @@ open class {{ service.name | caseUcfirst }}: Service {
     {%~ endif %}
     open func {{ method.name | caseCamel }}{% if method.responseModel | hasGenericType(spec) %}<T>{% endif %}(
         {%~ for parameter in method.parameters.all %}
-        {{ parameter.name | caseCamel | escapeKeyword }}: {% if parameter.type == "object" %}T{% else %}{{ parameter | typeName | raw }}{% endif %}{% if not parameter.required %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes or method.responseModel | hasGenericType(spec) %},{% endif %}
+        {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter | typeName | raw }}{% if not parameter.required %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes or method.responseModel | hasGenericType(spec) %},{% endif %}
 
         {%~ endfor %}
         {%~ if method.responseModel | hasGenericType(spec) %}
@@ -100,8 +101,7 @@ open class {{ service.name | caseUcfirst }}: Service {
     ) async throws -> {{ method | returnType(spec, '[String: AnyCodable]') | raw }} {
         return try await {{ method.name | caseCamel }}(
             {%~ for parameter in method.parameters.all %}
-            {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last %},{% endif %}
-
+            {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.name | caseCamel | escapeKeyword }},
             {%~ endfor %}
             nestedType: [String: AnyCodable].self
             {%~ if 'multipart/form-data' in method.consumes %}
diff --git a/templates/swift/base/params.twig b/templates/swift/base/params.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 %}
diff --git a/tests/languages/flutter/tests.dart b/tests/languages/flutter/tests.dart
@@ -1,9 +1,22 @@
 import 'package:flutter/material.dart';
+import 'package:path_provider_platform_interface/path_provider_platform_interface.dart';
+
 import '../lib/packageName.dart';
+import '../lib/client_io.dart';
 import '../lib/models.dart';
+import 'dart:io';
+
+class FakePathProvider extends PathProviderPlatform {
+  @override
+  Future<String?> getApplicationDocumentsPath() async {
+    return '.';
+  }
+}
+
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  PathProviderPlatform.instance = FakePathProvider();
   Client client = Client();
   Foo foo = Foo(client);
   Bar bar = Bar(client);

Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,8 @@ public function getFiles(): array`
`176`	`176`	`],`
`177`	`177`	`[`
`178`	`178`	`'scope' => 'default',`
`179`		`- 'destination' => '/Sources/{{ spec.title \| caseUcfirst}}/Extensions/Codable+JSON.swift',`
`180`		`- 'template' => 'swift/Sources/Extensions/Codable+JSON.swift.twig',`
	`179`	`+ 'destination' => '/Sources/JSONCodable/Codable+JSON.swift',`
	`180`	`+ 'template' => 'swift/Sources/JSONCodable/Codable+JSON.swift.twig',`
`181`	`181`	`],`
`182`	`182`	`[`
`183`	`183`	`'scope' => 'default',`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ class CookieManager extends Interceptor {`
`23`	`23`	`}`
`24`	`24`	`return request;`
`25`	`25`	`}).catchError((e, stackTrace) {`
`26`		`- // throw AppwriteException(e.message);`
	`26`	`+ return request;`
`27`	`27`	`});`
`28`	`28`	`return request;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@override`
`32`	`32`	`FutureOr<http.Response> onResponse(http.Response response) {`
`33`	`33`	`_saveCookies(response).then((_) => response).catchError((e, stackTrace) {`
`34`		`- // throw AppwriteException(e.message);`
	`34`	`+ return response;`
`35`	`35`	`});`
`36`	`36`	`return response;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class {{ service.name \| caseUcfirst }} : Service {`
`72`	`72`	`{%~ if method.responseModel == 'any' %}`
`73`	`73`	`it`
`74`	`74`	`{%~ else %}`
`75`		`- {{sdk.namespace \| caseDot}}.models.{{ method.responseModel \| caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel \| hasGenericType(spec) %}, nestedType{% endif %})`
	`75`	`+ {{ sdk.namespace \| caseDot }}.models.{{ method.responseModel \| caseUcfirst }}.from(map = it as Map<String, Any>{% if method.responseModel \| hasGenericType(spec) %}, nestedType{% endif %})`
`76`	`76`	`{%~ endif %}`
`77`	`77`	`}`
`78`	`78`	`{%~ endif %}`