Merge pull request #254 from appwrite/fix-flutter-exports

Fix flutter exports

Author: TorstenDittmann

src/SDK/Language/Dart.php

@@ -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',

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',

templates/dart/lib/client_browser.dart.twig

@@ -0,0 +1 @@
+export 'src/client_browser.dart';

templates/dart/lib/client_io.dart.twig

@@ -0,0 +1 @@
+export 'src/client_io.dart';

templates/flutter/lib/client_browser.dart.twig

@@ -0,0 +1 @@
+export 'src/client_browser.dart';

templates/flutter/lib/client_io.dart.twig

@@ -0,0 +1 @@
+export 'src/client_io.dart';

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 %}

templates/flutter/lib/realtime_browser.dart.twig

@@ -0,0 +1 @@
+export 'src/realtime_browser.dart';

templates/flutter/lib/realtime_io.dart.twig

@@ -0,0 +1 @@
+export 'src/realtime_io.dart';

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 = '/';