Merge pull request #78 from lohanidamodar/dart-sdk

eldadfux · web-flow · commit 91e155304d55 · 2021-01-06T14:37:52.000+02:00
[Draft] Dart sdk
diff --git a/src/SDK/Language/Dart.php b/src/SDK/Language/Dart.php
@@ -125,7 +125,7 @@ public function getTypeName($type)
             case self::TYPE_ARRAY:
             	return 'List';
 			case self::TYPE_OBJECT:
-				return 'dynamic';
+				return 'Map';
             break;
         }
 
@@ -151,7 +151,7 @@ public function getParamDefault(array $param)
         if(empty($default) && $default !== 0 && $default !== false) {
             switch ($type) {
                 case self::TYPE_OBJECT:
-                    $output .= '{}';
+                    $output .= 'const {}';
                     break;
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
@@ -161,7 +161,7 @@ public function getParamDefault(array $param)
                     $output .= 'false';
                     break;
                 case self::TYPE_ARRAY:
-                    $output .= '[]';
+                    $output .= 'const []';
                     break;
                 case self::TYPE_STRING:
                     $output .= "''";
@@ -170,11 +170,11 @@ public function getParamDefault(array $param)
         }
         else {
             switch ($type) {
-                case self::TYPE_OBJECT:
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
                     $output .= $default;
                     break;
+                case self::TYPE_OBJECT:
                 case self::TYPE_ARRAY:
                     $output .= 'const '.$default;
                     break;
diff --git a/templates/dart/docs/example.md.twig b/templates/dart/docs/example.md.twig
@@ -24,7 +24,7 @@ void main() { // Init SDK
 {% if parameter.required %}
     {{ parameter.name | caseCamel }}: {{ parameter | paramExample }},
 {% endif %}
-{% endfor %}  );
+{% endfor %}{% if method.parameters.all|length > 0 %}  {% endif %});
 
 {% if method.type == 'location' %}
   print(result); // Resource URL string
diff --git a/templates/dart/lib/client.dart.twig b/templates/dart/lib/client.dart.twig
@@ -1,11 +1,6 @@
 import 'dart:io';
-
 import 'package:dio/dio.dart';
 import 'package:dio/adapter.dart';
-import 'package:dio_cookie_manager/dio_cookie_manager.dart';
-import 'package:cookie_jar/cookie_jar.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:package_info/package_info.dart';
 
 import 'enums.dart';
 
@@ -17,16 +12,8 @@ class Client {
     bool selfSigned;
     bool initialized = false;
     Dio http;
-    PersistCookieJar cookieJar;
 
-    Client({this.endPoint = 'https://appwrite.io/v1', this.selfSigned = false, Dio http}) : this.http = http ?? Dio() {
-        
-        type = (Platform.isIOS) ? 'ios' : type;
-        type = (Platform.isMacOS) ? 'macos' : type;
-        type = (Platform.isAndroid) ? 'android' : type;
-        type = (Platform.isLinux) ? 'linux' : type;
-        type = (Platform.isWindows) ? 'windows' : type;
-        type = (Platform.isFuchsia) ? 'fuchsia' : type;
+    Client({this.endPoint = '{{spec.endpoint}}', this.selfSigned = false, Dio http}) : this.http = http ?? Dio() {
         
         this.headers = {
             'content-type': 'application/json',
@@ -37,14 +24,7 @@ class Client {
 
         assert(endPoint.startsWith(RegExp("http://|https://")), "endPoint $endPoint must start with 'http'");
     }
-    
-    Future<Directory> _getCookiePath() async {
-        final directory = await getApplicationDocumentsDirectory();
-        final path = directory.path;
-        final Directory dir = new Directory('$path/cookies');
-        await dir.create();
-        return dir;
-    }
+
 
 {% for header in spec.global.headers %}
 {% if header.description %}
@@ -76,17 +56,8 @@ class Client {
 
     Future init() async {
         if(!initialized) {
-          final Directory cookieDir = await _getCookiePath();
-
-          cookieJar = new PersistCookieJar(dir:cookieDir.path);
-
           this.http.options.baseUrl = this.endPoint;
           this.http.options.validateStatus = (status) => status < 400;
-          this.http.interceptors.add(CookieManager(cookieJar));
-
-          PackageInfo packageInfo = await PackageInfo.fromPlatform();
-
-          addHeader('Origin', 'appwrite-' + type + '://' + packageInfo.packageName);
         }
     }
 
@@ -112,6 +83,10 @@ class Client {
         }
 
         if (method == HttpMethod.get) {
+            params.keys.forEach((key) {if (params[key] is int || params[key] is double) {
+              params[key] = params[key].toString();
+            }});
+            
             return http.get(path, queryParameters: params, options: options);
         } else {
             return http.request(path, data: params, options: options);
diff --git a/templates/dart/lib/package.dart.twig b/templates/dart/lib/package.dart.twig
@@ -1,4 +1,4 @@
-export 'package:dio/dio.dart' show Response;
+export 'package:dio/dio.dart' show Response, MultipartFile;
 
 export 'client.dart';
 export 'enums.dart';
diff --git a/templates/dart/lib/services/service.dart.twig b/templates/dart/lib/services/service.dart.twig
@@ -10,16 +10,8 @@
 '{{ parameter.name }}': {{ parameter.name | caseCamel }},{% endif %}
 {% endmacro %}
 
-{% if(service.features.webAuth) %}
-import 'dart:io';
-{% endif %}
-
 import 'package:dio/dio.dart';
 import 'package:meta/meta.dart';
-{% if(service.features.webAuth) %}
-import 'package:flutter_web_auth/flutter_web_auth.dart';
-{% endif %}
-
 import "../client.dart";
 import '../enums.dart';
 import "../service.dart";
@@ -55,43 +47,11 @@ class {{ service.name | caseUcfirst }} extends Service {
 {% endif %}
         };
 
-{% if method.type == 'webAuth' %}
-
-        final List query = [];
-
-        params.forEach((key, value) {
-          if (value is List) { 
-            for (var item in value) {
-              query.add(Uri.encodeComponent(key + '[]') + '=' + Uri.encodeComponent(item));
-            }
-          }
-          else {
-              query.add(Uri.encodeComponent(key) + '=' + Uri.encodeComponent(value));
-          }
-        });
-
-        Uri endpoint = Uri.parse(client.endPoint);
-        Uri url = new Uri(scheme: endpoint.scheme,
-          host: endpoint.host,
-          port: endpoint.port,
-          path: endpoint.path + path,
-          query: query.join('&')
-        );
-
-        return FlutterWebAuth.authenticate(
-          url: url.toString(),
-          callbackUrlScheme: "appwrite-callback-" + client.config['project']
-          ).then((value) async {
-              Uri url = Uri.parse(value);
-              Cookie cookie = new Cookie(url.queryParameters['key'], url.queryParameters['secret']);
-              cookie.domain = Uri.parse(client.endPoint).host;
-              cookie.httpOnly = true;
-              cookie.path = '/';
-              List<Cookie> cookies = [cookie];
-              await client.init();
-              client.cookieJar.saveFromResponse(Uri.parse(client.endPoint), cookies);
-          });
-{% elseif method.type == 'location' %}
+{% if method.type == 'location' %}
+        params.keys.forEach((key) {if (params[key] is int || params[key] is double) {
+          params[key] = params[key].toString();
+        }});
+        
         Uri endpoint = Uri.parse(client.endPoint);
         Uri location = new Uri(scheme: endpoint.scheme,
           host: endpoint.host,
diff --git a/templates/dart/pubspec.yaml.twig b/templates/dart/pubspec.yaml.twig
@@ -8,16 +8,8 @@ documentation: {{ spec.contactURL }}
 environment:
   sdk: '>=2.6.0 <3.0.0'
 dependencies:
-  meta: ^1.2.2
-  path_provider: ^1.6.11
-  package_info: ^0.4.1
-  dio: ^3.0.9
-  cookie_jar: ^1.0.1
-  dio_cookie_manager: ^1.0.0
-  flutter_web_auth: ^0.2.4
-  flutter:
-    sdk: flutter
+  meta: ^1.1.8
+  dio: ^3.0.10
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
+  test:
diff --git a/tests/SDKTest.php b/tests/SDKTest.php
@@ -35,13 +35,13 @@ class SDKTest extends TestCase
             'build' => [
                 'mkdir -p tests/sdks/dart/tests',
                 'cp tests/languages/dart/tests.dart tests/sdks/dart/tests/tests.dart',
-                'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor appwrite/flutter:0.3.0 flutter pub get',
+                'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor google/dart:latest pub get',
             ],
             'envs' => [
-                'flutter' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor appwrite/flutter:0.3.0 flutter pub run tests/tests.dart',
-                //'dart-2.6' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=tests/sdks/dart/vendor google/dart:2.6 pub run test/tests.dart',
-                //'dart-2.7' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=tests/sdks/dart/vendor google/dart:2.7 pub run test/tests.dart',
-                //'dart-2.8-dev' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=tests/sdks/dart/vendor google/dart:2.8-dev pub run test/tests.dart',
+                // 'dart-2.6' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor google/dart:2.6 pub run tests/tests.dart',
+                'dart-2.7' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor google/dart:2.7 pub run tests/tests.dart',
+                'dart-2.8' => 'docker run --rm --tty -it -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor google/dart:2.8 pub run tests/tests.dart',
+                'dart-2.10' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor google/dart:2.10 dart pub run tests/tests.dart',
             ],
         ],
 
@@ -178,6 +178,7 @@ public function testHTTPSuccess()
                 ->setLogo('https://appwrite.io/v1/images/console.png')
                 ->setWarning('**WORK IN PROGRESS - THIS IS JUST A TEST SDK**')
                 ->setVersion('0.0.1')
+                ->setExamples('**EXAMPLES** <HTML>')
                 ->setNamespace("io appwrite")
                 ->setGitUserName('repoowner')
                 ->setGitRepoName('reponame')
diff --git a/tests/languages/dart/tests.dart b/tests/languages/dart/tests.dart
@@ -1,4 +1,4 @@
-import '../lib/appwrite.dart';
+import '../lib/packageName.dart';
 
 void main() async {
   Client client = Client();
@@ -49,6 +49,10 @@ void main() async {
   response = await general.redirect();
   print(response.data['result']);
 
+  final file = await MultipartFile.fromFile('../../resources/file.png',filename: 'file.png');
+  response = await general.upload(x:'string',y: 123,z:['string in array'], file: file);
+  print(response.data['result']);
+
   // response = await general.setCookie();
   // print(response.data['result']);
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export 'package:dio/dio.dart' show Response;`
	`1`	`+export 'package:dio/dio.dart' show Response, MultipartFile;`
`2`	`2`
`3`	`3`	`export 'client.dart';`
`4`	`4`	`export 'enums.dart';`