Merge branch 'master' of https://github.com/appwrite/sdk-generator into feat-new-headers

christyjacob4 · christyjacob4 · commit 1133f869cfb8 · 2022-09-01T08:50:59.000Z
diff --git a/src/SDK/Language/Kotlin.php b/src/SDK/Language/Kotlin.php
@@ -228,9 +228,17 @@ public function getParamExample(array $param)
                 case self::TYPE_FILE:
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
-                case self::TYPE_ARRAY:
                     $output .= $example;
                     break;
+                case self::TYPE_ARRAY:
+                    if (\str_starts_with($example, '[')) {
+                        $example = \substr($example, 1);
+                    }
+                    if (\str_ends_with($example, ']')) {
+                        $example = \substr($example, 0, -1);
+                    }
+                    $output .= 'listOf(' . $example . ')';
+                    break;
                 case self::TYPE_BOOLEAN:
                     $output .= ($example) ? 'true' : 'false';
                     break;
diff --git a/templates/android/LICENSE.md.twig b/templates/android/LICENSE.md.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/cli/LICENSE.md.twig b/templates/cli/LICENSE.md.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/cli/lib/questions.js.twig b/templates/cli/lib/questions.js.twig
@@ -160,7 +160,7 @@ const questionsInitFunction = [
     type: "input",
     name: "id",
     message: "What ID would you like to have for your function?",
-    default: "myAwesomeFunction"
+    default: "unique()"
   },
   {
     type: "list",
diff --git a/templates/dart/LICENSE.twig b/templates/dart/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/dart/lib/services/service.dart.twig b/templates/dart/lib/services/service.dart.twig
@@ -8,19 +8,19 @@ part of {{ language.params.packageName }};
 {% endmacro %}
 
 {%if service.description %}
-{{ service.description|dartComment}}
+{{- service.description|dartComment}}
 {% endif %}
 class {{ service.name | caseUcfirst }} extends Service {
     {{ service.name | caseUcfirst }}(super.client);
 
 {% for method in service.methods %}
-     /// {{ method.title }}
-{% if method.description %}
-     ///
+    /// {{ method.title }}
+{%~ if method.description %}
+    ///
 {{ method.description | dartComment }}
-     ///
+    ///
 {% endif %}
-    {% if method.type == 'location' %} Future<Uint8List> {% else %} {% if method.responseModel and method.responseModel != 'any' %}Future<models.{{method.responseModel | caseUcfirst | overrideIdentifier}}>{% else %}Future{% endif %}{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters.all, method.consumes) }}) async {
+    {% if method.type == 'location' %}Future<Uint8List>{% else %}{% if method.responseModel and method.responseModel != 'any' %}Future<models.{{method.responseModel | caseUcfirst | overrideIdentifier}}>{% else %}Future{% endif %}{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters.all, method.consumes) }}) async {
         final String path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replaceAll('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | overrideIdentifier }}){% endfor %};
 
 {% if 'multipart/form-data' in method.consumes %}
diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig
@@ -8,8 +8,8 @@ documentation: {{ spec.contactURL }}
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  http: ^0.13.4
+  http: ^0.13.5
 
 dev_dependencies:
-  test: ^1.16.8
-  lints: ^2.0.0
+  test: ^1.21.4
+  lints: ^2.0.0
diff --git a/templates/deno/LICENSE.twig b/templates/deno/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/dotnet/LICENSE.twig b/templates/dotnet/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/flutter/LICENSE.twig b/templates/flutter/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/flutter/lib/src/client_browser.dart.twig b/templates/flutter/lib/src/client_browser.dart.twig
@@ -1,7 +1,7 @@
 import 'dart:html' as html;
 import 'dart:math';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_web_auth/flutter_web_auth.dart';
+import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/browser_client.dart';
 import 'client_mixin.dart';
@@ -212,7 +212,7 @@ class ClientBrowser extends ClientBase with ClientMixin {
 
   @override
   Future webAuth(Uri url) {
-  return FlutterWebAuth.authenticate(
+  return FlutterWebAuth2.authenticate(
       url: url.toString(),
       callbackUrlScheme: "appwrite-callback-" + config['project']!,
     );
diff --git a/templates/flutter/lib/src/client_io.dart.twig b/templates/flutter/lib/src/client_io.dart.twig
@@ -6,7 +6,7 @@ import 'package:http/http.dart' as http;
 import 'package:http/io_client.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:flutter_web_auth/flutter_web_auth.dart';
+import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
 import 'client_mixin.dart';
 import 'client_base.dart';
 import 'cookie_manager.dart';
@@ -305,7 +305,7 @@ class ClientIO extends ClientBase with ClientMixin {
 
   @override
   Future webAuth(Uri url) {
-    return FlutterWebAuth.authenticate(
+    return FlutterWebAuth2.authenticate(
       url: url.toString(),
       callbackUrlScheme: "appwrite-callback-" + config['project']!,
     ).then((value) async {
diff --git a/templates/flutter/pubspec.yaml.twig b/templates/flutter/pubspec.yaml.twig
@@ -7,15 +7,16 @@ issue_tracker: https://github.com/appwrite/sdk-generator/issues
 documentation: {{ spec.contactURL }}
 environment:
   sdk: '>=2.17.0 <3.0.0'
+
 dependencies:
   flutter:
     sdk: flutter
   cookie_jar: ^3.0.1
-  device_info_plus: ^4.0.2
-  flutter_web_auth: ^0.4.1
-  http: ^0.13.4
-  package_info_plus: 1.4.3
-  path_provider: ^2.0.9
+  device_info_plus: ^4.1.2
+  flutter_web_auth_2: ^1.0.1
+  http: ^0.13.5
+  package_info_plus: ^1.4.3+1
+  path_provider: ^2.0.11
   web_socket_channel: ^2.2.0
 
 dev_dependencies:
diff --git a/templates/go/LICENSE.twig b/templates/go/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/kotlin/LICENSE.md.twig b/templates/kotlin/LICENSE.md.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/node/LICENSE.twig b/templates/node/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/php/LICENSE.twig b/templates/php/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/python/LICENSE.twig b/templates/python/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/ruby/LICENSE.twig b/templates/ruby/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/swift/LICENSE.twig b/templates/swift/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}
diff --git a/templates/swift/Sources/Client.swift.twig b/templates/swift/Sources/Client.swift.twig
@@ -370,15 +370,19 @@ open class Client {
 
         if idParamName != nil && params[idParamName!] as! String != "unique()" {
             // Make a request to check if a file already exists
-            let map = try! await call(
-                method: "GET",
-                path: path + "/" + (params[idParamName!] as! String),
-                headers: headers,
-                params: [:],
-                converter: { return $0 }
-            )
-            let chunksUploaded = map["chunksUploaded"] as! Int
-            offset = min(size, (chunksUploaded * Client.chunkSize))
+            do {
+                let map = try await call(
+                    method: "GET",
+                    path: path + "/" + (params[idParamName!] as! String),
+                    headers: headers,
+                    params: [:],
+                    converter: { return $0 }
+                )
+                let chunksUploaded = map["chunksUploaded"] as! Int
+                offset = min(size, (chunksUploaded * Client.chunkSize))
+            } catch {
+                // File does not exist yet, swallow exception
+            }
         }
 
         while offset < size {
diff --git a/templates/swift/Sources/OAuth/WebAuthComponent.swift.twig b/templates/swift/Sources/OAuth/WebAuthComponent.swift.twig
@@ -23,7 +23,7 @@ public class WebAuthComponent {
     ///
     /// Authenticate Session with OAuth2
     ///
-    /// Launches a chrome custom tab from the given activity and directs to the given url,
+    /// Launches a browser window from your app and directs to the given url,
     /// suspending until the user returns to the app, at which point the given [onComplete] callback
     /// will run, passing the callback url from the intent used to launch the [CallbackActivity],
     /// or an [IllegalStateException] in the case the user closed the window or returned to the
@@ -62,12 +62,37 @@ public class WebAuthComponent {
         var domain = cookieParts["domain"]!
         domain.remove(at: domain.startIndex)
 
-        let cookie = HTTPClient.Cookie(
-            name: cookieParts["key"]!,
-            value: cookieParts["secret"]!
-        )
-        let cookieJson = try! cookie.toJson()
-        UserDefaults.standard.set(cookieJson, forKey: "\(domain)-cookies")
+        let key: String = cookieParts["key"]!
+        let secret: String = cookieParts["secret"]!
+        let path: String? = cookieParts["path"]
+        let expires: String? = cookieParts["expires"]
+        let maxAge: String? = cookieParts["maxAge"]
+        let sameSite: String? = cookieParts["sameSite"]
+        let httpOnly: Bool? = cookieParts.keys.contains("httpOnly")
+        let secure: Bool? = cookieParts.keys.contains("secure")
+
+        var cookie = "\(key)=\(secret)"
+
+        if let path = path {
+            cookie += "; path=\(path)"
+        }
+        if let expires = expires {
+            cookie += "; expires=\(expires)"
+        }
+        if let maxAge = maxAge {
+            cookie += "; max-age=\(maxAge)"
+        }
+        if let sameSite = sameSite {
+            cookie += "; sameSite=\(sameSite)"
+        }
+        if let httpOnly = httpOnly, httpOnly {
+            cookie += "; httpOnly"
+        }
+        if let secure = secure, secure {
+            cookie += "; secure"
+        }
+
+        UserDefaults.standard.set([cookie], forKey: "\(domain)-cookies")
 
         WebAuthComponent.onCallback(
             scheme: components.scheme!,
diff --git a/templates/swift/example-swiftui/Shared/ExampleViewModel.swift b/templates/swift/example-swiftui/Shared/ExampleViewModel.swift
@@ -31,79 +31,76 @@ extension ExampleView {
         
         func register() async {
             do {
-                let response = try await account.create(
+                let user = try await account.create(
                     userId: userId,
                     email: username,
                     password: password
                 )
-                self.userId = response.id
-                self.response = String(describing: response.toMap())
+                self.userId = user.id
+                self.response = String(describing: user.toMap())
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
         
         func login() async {
             do {
-                let response = try await account.createSession(
+                let session = try await account.createEmailSession(
                     email: username,
                     password: password
                 )
-                self.response = String(describing: response.toMap())
+                self.response = String(describing: session.toMap())
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
         
         func loginWithFacebook() async {
             do {
-                let response = try await account.createOAuth2Session(
-                    provider: "facebook",
-                    success: "\(host)/auth/oauth2/success",
-                    failure: "\(host)/auth/oauth2/failure"
-                )
-                self.response = String(describing: response)
+                _ = try await account.createOAuth2Session(provider: "facebook")
+
+                self.response = "Success!"
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
         
         func download() async {
             do {
-                let response = try await storage.getFileDownload(
+                let data = try await storage.getFileDownload(
                     bucketId: bucketId,
                     fileId: fileId
                 )
-                self.downloadedImage = Image(data: Data(buffer: response))
+                self.downloadedImage = Image(data: Data(buffer: data))
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
         
         func upload(image: OSImage) async {
-            let imageBuffer = ByteBufferAllocator()
-                .buffer(data: image.data)
-                
             #if os(macOS)
             let fileName = "file.tiff"
+            let mime = "image/tiff"
             #else
             let fileName = "file.png"
+            let mime = "image/png"
             #endif
             
-            let file = File(
-                name: fileName,
-                buffer: imageBuffer
+            let file = InputFile.fromData(
+                image.data,
+                filename: fileName,
+                mimeType: mime
             )
             
             do {
-                let response = try await storage.createFile(
+                let file = try await storage.createFile(
                     bucketId: bucketId,
                     fileId: fileId,
                     file: file
                 )
-                self.response = String(describing: response.toMap())
+                self.response = String(describing: file.toMap())
             } catch {
-                self.response = String(describing: error)
+                self.response = error.localizedDescription
             }
         }
         
diff --git a/templates/swift/example-uikit/UIKitExample/ViewController.swift b/templates/swift/example-uikit/UIKitExample/ViewController.swift
@@ -58,7 +58,7 @@ class ViewController: UIViewController {
     
     @IBAction func loginClick(_ sender: Any) async {
         do {
-            let response = try await account.createSession(
+            let response = try await account.createEmailSession(
                 email: "jake@appwrite.io",
                 password: "password"
             )
diff --git a/templates/web/LICENSE.twig b/templates/web/LICENSE.twig
@@ -1 +1 @@
-{{sdk.licenseContent}}
+{{sdk.licenseContent | raw}}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{{sdk.licenseContent}}`
	`1`	`+{{sdk.licenseContent \| raw}}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ const questionsInitFunction = [`
`160`	`160`	`type: "input",`
`161`	`161`	`name: "id",`
`162`	`162`	`message: "What ID would you like to have for your function?",`
`163`		`- default: "myAwesomeFunction"`
	`163`	`+ default: "unique()"`
`164`	`164`	`},`
`165`	`165`	`{`
`166`	`166`	`type: "list",`