Merge pull request #607 from appwrite/fix-flutter-test

Author: lohanidamodar

.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

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;

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

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

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);