Merge branch 'master' into fix-exception-code

TorstenDittmann · web-flow · commit 8e55d12c563a · 2021-09-06T09:31:58.000+02:00
diff --git a/src/SDK/Language/Dart.php b/src/SDK/Language/Dart.php
@@ -208,7 +208,7 @@ public function getParamExample(array $param)
         if(empty($example) && $example !== 0 && $example !== false) {
             switch ($type) {
                 case self::TYPE_FILE:
-                    $output .= 'await MultipartFile.fromPath(\'<field-name>\', \'./path-to-files/image.jpg\', \'image.jpg\')';
+                    $output .= 'await MultipartFile.fromPath(\''.$param['name'].'\', \'./path-to-files/image.jpg\', \'image.jpg\')';
                     break;
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
@@ -339,6 +339,18 @@ public function getFiles()
                 'template'      => 'dart/pubspec.yaml.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/client_io.dart',
+                'template'      => 'dart/lib/client_io.dart.twig',
+                'minify'        => false,
+            ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/client_browser.dart',
+                'template'      => 'dart/lib/client_browser.dart.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/lib/src/service.dart',
diff --git a/src/SDK/Language/Flutter.php b/src/SDK/Language/Flutter.php
@@ -187,6 +187,30 @@ public function getFiles()
                 'template'      => 'flutter/lib/package.dart.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/client_io.dart',
+                'template'      => 'flutter/lib/client_io.dart.twig',
+                'minify'        => false,
+            ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/client_browser.dart',
+                'template'      => 'flutter/lib/client_browser.dart.twig',
+                'minify'        => false,
+            ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/realtime_io.dart',
+                'template'      => 'flutter/lib/realtime_io.dart.twig',
+                'minify'        => false,
+            ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/realtime_browser.dart',
+                'template'      => 'flutter/lib/realtime_browser.dart.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/pubspec.yaml',
diff --git a/templates/dart/lib/client_browser.dart.twig b/templates/dart/lib/client_browser.dart.twig
@@ -0,0 +1 @@
+export 'src/client_browser.dart';
diff --git a/templates/dart/lib/client_io.dart.twig b/templates/dart/lib/client_io.dart.twig
@@ -0,0 +1 @@
+export 'src/client_io.dart';
diff --git a/templates/flutter/lib/client_browser.dart.twig b/templates/flutter/lib/client_browser.dart.twig
@@ -0,0 +1 @@
+export 'src/client_browser.dart';
diff --git a/templates/flutter/lib/client_io.dart.twig b/templates/flutter/lib/client_io.dart.twig
@@ -0,0 +1 @@
+export 'src/client_io.dart';
diff --git a/templates/flutter/lib/package.dart.twig b/templates/flutter/lib/package.dart.twig
@@ -15,6 +15,7 @@ export 'src/client.dart';
 export 'src/exception.dart';
 export 'src/realtime.dart';
 export 'src/realtime_subscription.dart';
+export 'src/realtime_message.dart';
 export 'package:http/http.dart' show MultipartFile;
 
 {% for service in spec.services %}
diff --git a/templates/flutter/lib/realtime_browser.dart.twig b/templates/flutter/lib/realtime_browser.dart.twig
@@ -0,0 +1 @@
+export 'src/realtime_browser.dart';
diff --git a/templates/flutter/lib/realtime_io.dart.twig b/templates/flutter/lib/realtime_io.dart.twig
@@ -0,0 +1 @@
+export 'src/realtime_io.dart';
diff --git a/templates/flutter/lib/src/client_io.dart.twig b/templates/flutter/lib/src/client_io.dart.twig
@@ -187,11 +187,17 @@ class ClientIO extends ClientBase with ClientMixin {
 
   Future webAuth(Uri url) {
     return FlutterWebAuth.authenticate(
-            url: url.toString(),
-            callbackUrlScheme: "appwrite-callback-" + config['project']!)
-        .then((value) async {
-      Cookie cookie = new Cookie(
-          url.queryParameters['key']!, url.queryParameters['secret']!);
+      url: url.toString(),
+      callbackUrlScheme: "appwrite-callback-" + config['project']!,
+    ).then((value) async {
+      Uri url = Uri.parse(value);
+      final key = url.queryParameters['key'];
+      final secret = url.queryParameters['secret'];
+      if (key == null || secret == null) {
+        throw {{spec.title | caseUcfirst}}Exception(
+            "Invalid OAuth2 Response. Key and Secret not available.", 500);
+      }
+      Cookie cookie = new Cookie(key, secret);
       cookie.domain = Uri.parse(_endPoint).host;
       cookie.httpOnly = true;
       cookie.path = '/';
diff --git a/templates/flutter/lib/src/client_stub.dart.twig b/templates/flutter/lib/src/client_stub.dart.twig
@@ -1,6 +1,6 @@
 import 'client_base.dart';
 
-/// Implemented in `browser_client.dart` and `io_client.dart`.
+/// Implemented in `client_browser.dart` and `client_io.dart`.
 ClientBase createClient({required String endPoint, required bool selfSigned}) =>
     throw UnsupportedError(
         'Cannot create a client without dart:html or dart:io.');
diff --git a/templates/flutter/lib/src/realtime_message.dart.twig b/templates/flutter/lib/src/realtime_message.dart.twig
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 
 class RealtimeMessage {
@@ -59,13 +58,12 @@ class RealtimeMessage {
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
-    final collectionEquals = const DeepCollectionEquality().equals;
-  
+
     return other is RealtimeMessage &&
-      other.event == event &&
-      collectionEquals(other.payload, payload) &&
-      collectionEquals(other.channels, channels) &&
-      other.timestamp == timestamp;
+        other.event == event &&
+        mapEquals(other.payload, payload) &&
+        listEquals(other.channels, channels) &&
+        other.timestamp == timestamp;
   }
 
   @override
diff --git a/templates/flutter/lib/src/realtime_stub.dart.twig b/templates/flutter/lib/src/realtime_stub.dart.twig
@@ -1,6 +1,6 @@
 import 'realtime_base.dart';
 import 'client.dart';
 
-/// Implemented in `browser_client.dart` and `io_client.dart`.
+/// Implemented in `realtime_browser.dart` and `realtime_io.dart`.
 RealtimeBase createRealtime(Client client) => throw UnsupportedError(
     'Cannot create a client without dart:html or dart:io.');
diff --git a/templates/web/src/sdk.ts.twig b/templates/web/src/sdk.ts.twig
@@ -170,7 +170,7 @@ class {{ spec.title | caseUcfirst }} {
         },
         authenticate: (event) => {
             const message: RealtimeResponse = JSON.parse(event.data);
-            if (message.type === 'connected') {
+            if (message.type === 'connected' && this.realtime.socket?.readyState === WebSocket.OPEN) {
                 const cookie = JSON.parse(window.localStorage.getItem('cookieFallback') ?? "{}");
                 const session = cookie?.[`a_session_${this.config.project}`];
                 const data = <RealtimeResponseConnected>message.data;
@@ -435,4 +435,4 @@ class {{ spec.title | caseUcfirst }} {
 };
 
 export { {{spec.title | caseUcfirst}} }
-export type { {{spec.title | caseUcfirst}}Exception }
+export type { {{spec.title | caseUcfirst}}Exception }
diff --git a/tests/languages/android/ServiceTest.kt b/tests/languages/android/ServiceTest.kt
@@ -53,7 +53,7 @@ class ServiceTest {
     @Throws(IOException::class)
     fun test() {
         val client = Client(ApplicationProvider.getApplicationContext())
-            .setEndpointRealtime("wss://demo.appwrite.org/v1")
+            .setEndpointRealtime("wss://demo.appwrite.io/v1")
             .setProject("console")
             .addHeader("Origin", "http://localhost")
             .setSelfSigned(true)
diff --git a/tests/languages/flutter/tests.dart b/tests/languages/flutter/tests.dart
@@ -8,7 +8,7 @@ void main() async {
 
   client.setSelfSigned();
   client.setProject('console');
-  client.setEndPointRealtime("wss://demo.appwrite.org/v1"); // change this later to appwrite.io
+  client.setEndPointRealtime("wss://demo.appwrite.io/v1"); // change this later to appwrite.io
 
   Realtime realtime = Realtime(client);
   final rtsub = realtime.subscribe(["tests"]);
diff --git a/tests/languages/web/index.html b/tests/languages/web/index.html
@@ -20,7 +20,7 @@
             let sdk = new Appwrite();
 
             sdk.setProject('console');
-            sdk.setEndpointRealtime('wss://demo.appwrite.org/v1');
+            sdk.setEndpointRealtime('wss://demo.appwrite.io/v1');
 
             sdk.subscribe('tests', event => {
                 responseRealtime = event.payload.response;
