feat: Upgrade various dependencies and fix warnings (#824)

mbfakourii · web-flow · commit 8fefc8508459 · 2023-03-07T16:42:07.000+01:00
BREAKING CHANGE: Upgrades to dio 5.x
diff --git a/packages/dart/CHANGELOG.md b/packages/dart/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [4.0.0](https://github.com/parse-community/Parse-SDK-Flutter/compare/dart-3.1.14...dart-4.0.0) (2023-03-07)
+
+### BREAKING CHANGES
+
+* Upgrades to dio 5.x ([#824](https://github.com/parse-community/Parse-SDK-Flutter/pull/824))
+
+### Feature
+
+* Upgrade various dependencies and fix warnings ([#824](https://github.com/parse-community/Parse-SDK-Flutter/pull/824))
+
 ## [3.1.15](https://github.com/parse-community/Parse-SDK-Flutter/compare/dart-3.1.14...dart-3.1.15) (2023-02-28)
 
 ### Bug Fixes
@@ -173,7 +183,7 @@ Bug fixes
 ## 1.0.22
 
 Added dirty children
-Added option of sembast or share_preferences
+Added option of sembast or share_preferences 
 
 ## 1.0.21
 
@@ -195,7 +205,7 @@ Bug fix
 
 ## 1.0.17
 
-LiveQuery fix
+LiveQuery fix 
 Bug fixes
 
 ## 1.0.16
diff --git a/packages/dart/lib/parse_server_sdk.dart b/packages/dart/lib/parse_server_sdk.dart
@@ -2,7 +2,7 @@ library flutter_parse_sdk;
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
+import 'package:universal_io/io.dart';
 import 'dart:math';
 import 'dart:typed_data';
 import 'package:dio/dio.dart';
@@ -142,9 +142,9 @@ class Parse {
 
   Future<ParseResponse> healthCheck(
       {bool? debug, ParseClient? client, bool? sendSessionIdByDefault}) async {
-    final bool _debug = isDebugEnabled(objectLevelDebug: debug);
+    final bool debugLocal = isDebugEnabled(objectLevelDebug: debug);
 
-    final ParseClient _client = client ??
+    final ParseClient clientLocal = client ??
         ParseCoreData().clientCreator(
             sendSessionId:
                 sendSessionIdByDefault ?? ParseCoreData().autoSendSessionId,
@@ -154,11 +154,11 @@ class Parse {
     const ParseApiRQ type = ParseApiRQ.healthCheck;
 
     try {
-      final ParseNetworkResponse response =
-          await _client.get('${ParseCoreData().serverUrl}$keyEndPointHealth');
-      return handleResponse<Parse>(null, response, type, _debug, className);
+      final ParseNetworkResponse response = await clientLocal
+          .get('${ParseCoreData().serverUrl}$keyEndPointHealth');
+      return handleResponse<Parse>(null, response, type, debugLocal, className);
     } on Exception catch (e) {
-      return handleException(e, type, _debug, className);
+      return handleException(e, type, debugLocal, className);
     }
   }
 }
diff --git a/packages/dart/lib/src/base/parse_constants.dart b/packages/dart/lib/src/base/parse_constants.dart
@@ -1,7 +1,7 @@
 part of flutter_parse_sdk;
 
 // Library
-const String keySdkVersion = '3.1.15';
+const String keySdkVersion = '4.0.0';
 const String keyLibraryName = 'Flutter Parse SDK';
 
 // End Points
diff --git a/packages/dart/lib/src/network/dio_adapter_io.dart b/packages/dart/lib/src/network/dio_adapter_io.dart
@@ -1,11 +1,10 @@
-import 'dart:io';
+import 'package:universal_io/io.dart';
 
-import 'package:dio/adapter.dart';
+import 'package:dio/io.dart';
 import 'package:dio/dio.dart';
 
 HttpClientAdapter createHttpClientAdapter(SecurityContext? securityContext) {
-  final DefaultHttpClientAdapter defaultHttpClientAdapter =
-      DefaultHttpClientAdapter();
+  final IOHttpClientAdapter defaultHttpClientAdapter = IOHttpClientAdapter();
 
   if (securityContext != null) {
     defaultHttpClientAdapter.onHttpClientCreate =
diff --git a/packages/dart/lib/src/network/dio_adapter_js.dart b/packages/dart/lib/src/network/dio_adapter_js.dart
@@ -1,9 +1,7 @@
-import 'dart:io';
-
-import 'package:dio/adapter_browser.dart';
+import 'package:dio/browser.dart';
 import 'package:dio/dio.dart';
 
-HttpClientAdapter createHttpClientAdapter(SecurityContext? securityContext) {
+HttpClientAdapter createHttpClientAdapter(dynamic securityContext) {
   final BrowserHttpClientAdapter browserHttpClientAdapter =
       BrowserHttpClientAdapter();
   return browserHttpClientAdapter;
diff --git a/packages/dart/lib/src/network/parse_dio_client.dart b/packages/dart/lib/src/network/parse_dio_client.dart
@@ -1,13 +1,11 @@
-import 'dart:io';
-
 import 'package:dio/dio.dart' as dio;
 import 'package:parse_server_sdk/parse_server_sdk.dart';
 
 import 'dio_adapter_io.dart' if (dart.library.js) 'dio_adapter_js.dart';
 
 class ParseDioClient extends ParseClient {
-  ParseDioClient(
-      {bool sendSessionId = false, SecurityContext? securityContext}) {
+  // securityContext is SecurityContext
+  ParseDioClient({bool sendSessionId = false, dynamic securityContext}) {
     _client = _ParseDioClient(
       sendSessionId: sendSessionId,
       securityContext: securityContext,
@@ -66,7 +64,8 @@ class ParseDioClient extends ParseClient {
           statusCode: error.response?.statusCode ?? ParseError.otherCause,
         );
       } else {
-        return _getOtherCaseErrorForParseNetworkResponse(error.error);
+        return _getOtherCaseErrorForParseNetworkResponse(
+            error.error.toString());
       }
     }
   }
@@ -141,7 +140,8 @@ class ParseDioClient extends ParseClient {
           statusCode: error.response?.statusCode ?? ParseError.otherCause,
         );
       } else {
-        return _getOtherCaseErrorForParseNetworkResponse(error.error);
+        return _getOtherCaseErrorForParseNetworkResponse(
+            error.error.toString());
       }
     }
   }
@@ -178,8 +178,7 @@ class ParseDioClient extends ParseClient {
 
 /// Creates a custom version of HTTP Client that has Parse Data Preset
 class _ParseDioClient with dio.DioMixin implements dio.Dio {
-  _ParseDioClient(
-      {bool sendSessionId = false, SecurityContext? securityContext})
+  _ParseDioClient({bool sendSessionId = false, dynamic securityContext})
       : _sendSessionId = sendSessionId {
     options = dio.BaseOptions();
     httpClientAdapter = createHttpClientAdapter(securityContext);
@@ -243,7 +242,7 @@ class _ParseDioClient with dio.DioMixin implements dio.Dio {
 
   void _logCUrl(dio.Options options, dynamic data, String url) {
     String curlCmd = 'curl';
-    curlCmd += ' -X ' + options.method!;
+    curlCmd += ' -X ${options.method!}';
     bool compressed = false;
     options.headers!.forEach((String name, dynamic value) {
       if (name.toLowerCase() == 'accept-encoding' &&
@@ -272,8 +271,8 @@ class _ParseDioClient with dio.DioMixin implements dio.Dio {
 class _Options extends dio.Options {
   _Options({
     String? method,
-    int? sendTimeout,
-    int? receiveTimeout,
+    Duration? sendTimeout,
+    Duration? receiveTimeout,
     Map<String, dynamic>? extra,
     Map<String, dynamic>? headers,
     dio.ResponseType? responseType,
diff --git a/packages/dart/lib/src/network/parse_http_client.dart b/packages/dart/lib/src/network/parse_http_client.dart
@@ -1,5 +1,5 @@
 import 'dart:convert';
-import 'dart:io';
+import 'package:universal_io/io.dart';
 
 import 'package:http/http.dart' as http;
 import 'package:http/io_client.dart';
@@ -161,7 +161,7 @@ class _ParseHTTPClient extends http.BaseClient {
 
   void _logCUrl(http.BaseRequest request) {
     String curlCmd = 'curl';
-    curlCmd += ' -X ' + request.method;
+    curlCmd += ' -X ${request.method}';
     bool compressed = false;
     request.headers.forEach((String name, String value) {
       if (name.toLowerCase() == 'accept-encoding' &&
diff --git a/packages/dart/lib/src/network/parse_live_query.dart b/packages/dart/lib/src/network/parse_live_query.dart
@@ -352,20 +352,20 @@ class LiveQueryClient {
     final QueryBuilder query = subscription.query;
     final List<String>? keysToReturn = query.limiters['keys']?.split(',');
     query.limiters.clear(); //Remove limits in LiveQuery
-    final String _where = query.buildQuery().replaceAll('where=', '');
+    final String where = query.buildQuery().replaceAll('where=', '');
 
     //Convert where condition to Map
-    Map<String, dynamic> _whereMap = <String, dynamic>{};
-    if (_where != '') {
-      _whereMap = json.decode(_where);
+    Map<String, dynamic> whereMap = <String, dynamic>{};
+    if (where != '') {
+      whereMap = json.decode(where);
     }
 
     final Map<String, dynamic> subscribeMessage = <String, dynamic>{
       'op': 'subscribe',
       'requestId': subscription.requestId,
       'query': <String, dynamic>{
         'className': query.object.parseClassName,
-        'where': _whereMap,
+        'where': whereMap,
         if (keysToReturn != null && keysToReturn.isNotEmpty)
           'fields': keysToReturn
       }
diff --git a/packages/dart/lib/src/network/parse_query.dart b/packages/dart/lib/src/network/parse_query.dart
@@ -27,7 +27,7 @@ class QueryBuilder<T extends ParseObject> {
       if (i > 0) {
         query += ',';
       }
-      query += '{' + list[i].buildQueries(list[i].queries) + '}';
+      query += '{${list[i].buildQueries(list[i].queries)}}';
     }
     query += ']';
     queries.add(MapEntry<String, dynamic>(_noOperatorNeeded, query));
@@ -523,7 +523,7 @@ class QueryBuilder<T extends ParseObject> {
   String getLimiters(Map<String, dynamic> map) {
     String result = '';
     map.forEach((String key, dynamic value) {
-      result = result + '&$key=$value';
+      result = '$result&$key=$value';
     });
     return result;
   }
@@ -533,7 +533,7 @@ class QueryBuilder<T extends ParseObject> {
     String result = '';
     map.forEach((String key, dynamic value) {
       if (result.isNotEmpty) {
-        result = result + ',"$key":$value';
+        result = '$result,"$key":$value';
       } else {
         result = '"$key":$value';
       }
diff --git a/packages/dart/lib/src/objects/parse_object.dart b/packages/dart/lib/src/objects/parse_object.dart
@@ -226,7 +226,7 @@ class ParseObject extends ParseBase implements ParseCloneable {
     final String parsePath = tempUri.path;
     final dynamic request = <String, dynamic>{
       'method': method,
-      'path': '$parsePath$_path' + (objectId != null ? '/$objectId' : ''),
+      'path': '$parsePath$_path${objectId != null ? '/$objectId' : ''}',
       'body': toJson(forApiRQ: true)
     };
     return request;
diff --git a/packages/dart/lib/src/objects/parse_user.dart b/packages/dart/lib/src/objects/parse_user.dart
@@ -112,8 +112,8 @@ class ParseUser extends ParseObject implements ParseCloneable {
   /// if using custom ParseUser object
   Future<ParseResponse> getUpdatedUser(
       {bool? debug, ParseClient? client}) async {
-    final bool _debug = isDebugEnabled(objectLevelDebug: debug);
-    final ParseClient _client = client ??
+    final bool debugLocal = isDebugEnabled(objectLevelDebug: debug);
+    final ParseClient clientLocal = client ??
         ParseCoreData().clientCreator(
             sendSessionId: true,
             securityContext: ParseCoreData().securityContext);
@@ -130,15 +130,16 @@ class ParseUser extends ParseObject implements ParseCloneable {
     }
 
     try {
-      final Uri url = getSanitisedUri(_client, keyEndPointUserName);
-      final ParseNetworkResponse response = await _client.get(
+      final Uri url = getSanitisedUri(clientLocal, keyEndPointUserName);
+      final ParseNetworkResponse response = await clientLocal.get(
         url.toString(),
         options: ParseNetworkOptions(headers: headers),
       );
       return await _handleResponse(
-          this, response, ParseApiRQ.currentUser, _debug, parseClassName);
+          this, response, ParseApiRQ.currentUser, debugLocal, parseClassName);
     } on Exception catch (e) {
-      return handleException(e, ParseApiRQ.currentUser, _debug, parseClassName);
+      return handleException(
+          e, ParseApiRQ.currentUser, debugLocal, parseClassName);
     }
   }
 
@@ -442,20 +443,21 @@ class ParseUser extends ParseObject implements ParseCloneable {
   static Future<ParseResponse> all({bool? debug, ParseClient? client}) async {
     final ParseUser emptyUser = _getEmptyUser();
 
-    final bool _debug = isDebugEnabled(objectLevelDebug: debug);
-    final ParseClient _client = client ??
+    final bool debugLocal = isDebugEnabled(objectLevelDebug: debug);
+    final ParseClient clientLocal = client ??
         ParseCoreData().clientCreator(
             sendSessionId: true,
             securityContext: ParseCoreData().securityContext);
 
     try {
-      final Uri url = getSanitisedUri(_client, path);
-      final ParseNetworkResponse response = await _client.get(url.toString());
+      final Uri url = getSanitisedUri(clientLocal, path);
+      final ParseNetworkResponse response =
+          await clientLocal.get(url.toString());
       final ParseResponse parseResponse = handleResponse<ParseUser>(
-          emptyUser, response, ParseApiRQ.getAll, _debug, keyClassUser);
+          emptyUser, response, ParseApiRQ.getAll, debugLocal, keyClassUser);
       return parseResponse;
     } on Exception catch (e) {
-      return handleException(e, ParseApiRQ.getAll, _debug, keyClassUser);
+      return handleException(e, ParseApiRQ.getAll, debugLocal, keyClassUser);
     }
   }
 
diff --git a/packages/dart/lib/src/objects/response/parse_response_builder.dart b/packages/dart/lib/src/objects/response/parse_response_builder.dart
@@ -115,7 +115,7 @@ class _ParseResponseBuilder {
   List<T> _handleMultipleResults<T>(T object, List<dynamic> data) {
     final List<T> resultsList = <T>[];
     for (dynamic value in data) {
-      resultsList.add(_handleSingleResult<T>(object, value, true)!);
+      resultsList.add(_handleSingleResult<T>(object, value, true) as T);
     }
     return resultsList;
   }
diff --git a/packages/dart/lib/src/utils/parse_live_list.dart b/packages/dart/lib/src/utils/parse_live_list.dart
@@ -9,17 +9,17 @@ class ParseLiveList<T extends ParseObject> {
   }
 
   static Future<ParseLiveList<T>> create<T extends ParseObject>(
-    QueryBuilder<T> _query, {
+    QueryBuilder<T> query, {
     bool? listenOnAllSubItems,
     List<String>? listeningIncludes,
     bool lazyLoading = true,
     List<String>? preloadedColumns,
   }) {
     final ParseLiveList<T> parseLiveList = ParseLiveList<T>._(
-      _query,
+      query,
       listenOnAllSubItems == true
           ? _toIncludeMap(
-              _query.limiters['include']?.toString().split(',') ?? <String>[])
+              query.limiters['include']?.toString().split(',') ?? <String>[])
           : _toIncludeMap(listeningIncludes ?? <String>[]),
       lazyLoading,
       preloadedColumns: preloadedColumns ?? const <String>[],
diff --git a/packages/dart/pubspec.yaml b/packages/dart/pubspec.yaml
@@ -1,32 +1,33 @@
 name: parse_server_sdk
 description: Dart plugin for Parse Server, (https://parseplatform.org), (https://back4app.com)
-version: 3.1.15
+version: 4.0.0
 homepage: https://github.com/parse-community/Parse-SDK-Flutter
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   # Networking
-  dio: ^4.0.6
-  http: ^0.13.4
-  web_socket_channel: ^2.2.0
+  dio: ^5.0.1
+  http: ^0.13.5
+  web_socket_channel: ^2.3.0
 
   #Database
-  sembast: ^3.2.0
-  sembast_web: ^2.0.1+1
+  sembast: ^3.4.0+6
+  sembast_web: ^2.1.0+4
   xxtea: ^2.1.0
 
   # Utils
-  uuid: ^3.0.6
-  meta: ^1.7.0
-  path: ^1.8.1
+  uuid: ^3.0.7
+  meta: ^1.8.0
+  path: ^1.8.2
   mime_type: ^1.0.0
-  timezone: ^0.9.0
+  timezone: ^0.9.1
+  universal_io: ^2.2.0
 
 dev_dependencies:
-  lints: ^1.0.1
+  lints: ^2.0.1
   # Testing
-  build_runner: ^2.1.11
-  mockito: ^5.2.0
-  test: ^1.21.4
+  build_runner: ^2.3.3
+  mockito: ^5.3.2
+  test: ^1.23.1
diff --git a/packages/dart/test/parse_query_test.dart b/packages/dart/test/parse_query_test.dart
diff --git a/packages/dart/test/parse_query_test.mocks.dart b/packages/dart/test/parse_query_test.mocks.dart
