Merge pull request #566 from parse-community/release/2.1.0

Release/2.1.0

Author: RodrigoSMarques

packages/dart/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.1.0
+Option para uses ParseHTTPClient (default) or ParseDioClient (slow on Flutter Web).
+    **BREAKING CHANGE** if use progress callback at the file upload in version 2.0.1
+Added method excludeKeys: Exclude specific fields from the returned query
+Changed to the method POST on Login
+Bug fixes
+General improvements
+Updated dependencies
 ## 2.0.1
 Fixed network exceptions. [#482](https://github.com/parse-community/Parse-SDK-Flutter/pull/482)
 

packages/dart/README.md

@@ -20,7 +20,7 @@ This is a work in progress and we are consistently updating it. Please let us kn
 To install, either add to your pubspec.yaml
 ```yml
 dependencies:  
-    parse_server_sdk: ^2.0.1
+    parse_server_sdk: ^2.1.0
 ```
 or clone this repository and add to your project. As this is an early development with multiple contributors, it is probably best to download/clone and keep updating as an when a new feature is added.
 
@@ -50,7 +50,6 @@ It's possible to add other parameters to work with your instance of Parse Server
   await Parse().initialize(
         keyApplicationId,
         keyParseServerUrl,
-        masterKey: keyParseMasterKey, // Required for Back4App and others
         clientKey: keyParseClientKey, // Required for some setups
         debug: true, // When enabled, prints logs to console
         liveQueryUrl: keyLiveQueryUrl, // Required if using LiveQuery 

packages/dart/lib/parse_server_sdk.dart

@@ -6,11 +6,9 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:dio/dio.dart' hide Options;
-import 'package:dio/dio.dart' as dio show Options;
 import 'package:meta/meta.dart';
 import 'package:mime_type/mime_type.dart';
-import 'package:parse_server_sdk/src/network/http_client_adapter.dart';
+import 'package:parse_server_sdk/src/network/parse_http_client.dart';
 import 'package:parse_server_sdk/src/network/parse_websocket.dart'
     as parse_web_socket;
 import 'package:path/path.dart' as path;
@@ -21,13 +19,16 @@ import 'package:uuid/uuid.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:xxtea/xxtea.dart';
 
+export 'src/network/parse_dio_client.dart';
+export 'src/network/parse_http_client.dart';
+
 part 'src/base/parse_constants.dart';
 part 'src/data/parse_core_data.dart';
 part 'src/data/parse_subclass_handler.dart';
 part 'src/enums/parse_enum_api_rq.dart';
-part 'src/network/dio-options.dart';
+part 'src/network/options.dart';
+part 'src/network/parse_client.dart';
 part 'src/network/parse_connectivity.dart';
-part 'src/network/parse_http_client.dart';
 part 'src/network/parse_live_query.dart';
 part 'src/network/parse_query.dart';
 part 'src/objects/parse_acl.dart';
@@ -77,7 +78,7 @@ class Parse {
   /// Parse().initialize(
   ///        "PARSE_APP_ID",
   ///        "https://parse.myaddress.com/parse/,
-  ///        masterKey: "asd23rjh234r234r234r",
+  ///        clientKey: "asd23rjh234r234r234r",
   ///        debug: true,
   ///        liveQuery: true);
   /// ```
@@ -93,7 +94,7 @@ class Parse {
     String clientKey,
     String masterKey,
     String sessionId,
-    bool autoSendSessionId,
+    bool autoSendSessionId = true,
     SecurityContext securityContext,
     CoreStore coreStore,
     Map<String, ParseObjectConstructor> registeredSubClassMap,
@@ -103,6 +104,7 @@ class Parse {
     ParseConnectivityProvider connectivityProvider,
     String fileDirectory,
     Stream<void> appResumedStream,
+    ParseClientCreator clientCreator,
   }) async {
     final String url = removeTrailingSlash(serverUrl);
 
@@ -128,6 +130,7 @@ class Parse {
       connectivityProvider: connectivityProvider,
       fileDirectory: fileDirectory,
       appResumedStream: appResumedStream,
+      clientCreator: clientCreator,
     );
 
     _hasBeenInitialized = true;
@@ -138,13 +141,13 @@ class Parse {
   bool hasParseBeenInitialized() => _hasBeenInitialized;
 
   Future<ParseResponse> healthCheck(
-      {bool debug, ParseHTTPClient client, bool sendSessionIdByDefault}) async {
+      {bool debug, ParseClient client, bool sendSessionIdByDefault}) async {
     ParseResponse parseResponse;
 
     final bool _debug = isDebugEnabled(objectLevelDebug: debug);
 
-    final ParseHTTPClient _client = client ??
-        ParseHTTPClient(
+    final ParseClient _client = client ??
+        ParseCoreData().clientCreator(
             sendSessionId:
                 sendSessionIdByDefault ?? ParseCoreData().autoSendSessionId,
             securityContext: ParseCoreData().securityContext);
@@ -153,8 +156,8 @@ class Parse {
     const ParseApiRQ type = ParseApiRQ.healthCheck;
 
     try {
-      final Response<String> response = await _client
-          .get<String>('${ParseCoreData().serverUrl}$keyEndPointHealth');
+      final ParseNetworkResponse response =
+          await _client.get('${ParseCoreData().serverUrl}$keyEndPointHealth');
       parseResponse =
           handleResponse<Parse>(null, response, type, _debug, className);
     } on Exception catch (e) {

packages/dart/lib/src/base/parse_constants.dart

@@ -1,7 +1,7 @@
 part of flutter_parse_sdk;
 
 // Library
-const String keySdkVersion = '2.0.1';
+const String keySdkVersion = '2.1.0';
 const String keyLibraryName = 'Flutter Parse SDK';
 
 // End Points
@@ -46,7 +46,7 @@ const String keyHeaderSessionToken = 'X-Parse-Session-Token';
 const String keyHeaderRevocableSession = 'X-Parse-Revocable-Session';
 const String keyHeaderUserAgent = 'user-agent';
 const String keyHeaderApplicationId = 'X-Parse-Application-Id';
-const String keyHeaderContentType = Headers.contentTypeHeader;
+const String keyHeaderContentType = 'content-type';
 const String keyHeaderContentTypeJson = 'application/json';
 const String keyHeaderMasterKey = 'X-Parse-Master-Key';
 const String keyHeaderClientKey = 'X-Parse-Client-Key';

packages/dart/lib/src/data/parse_core_data.dart

@@ -36,6 +36,7 @@ class ParseCoreData {
     ParseConnectivityProvider connectivityProvider,
     String fileDirectory,
     Stream<void> appResumedStream,
+    ParseClientCreator clientCreator,
   }) async {
     _instance = ParseCoreData._init(appId, serverUrl);
 
@@ -98,6 +99,10 @@ class ParseCoreData {
     if (appResumedStream != null) {
       _instance.appResumedStream = appResumedStream;
     }
+
+    if (clientCreator != null) {
+      _instance.clientCreator = clientCreator;
+    }
   }
 
   String appName;
@@ -119,6 +124,9 @@ class ParseCoreData {
   ParseConnectivityProvider connectivityProvider;
   String fileDirectory;
   Stream<void> appResumedStream;
+  ParseClientCreator clientCreator =
+      ({bool sendSessionId, SecurityContext securityContext}) => ParseHTTPClient(
+          sendSessionId: sendSessionId, securityContext: securityContext);
 
   void registerSubClass(
       String className, ParseObjectConstructor objectConstructor) {
@@ -139,7 +147,7 @@ class ParseCoreData {
 
   ParseUser createParseUser(
       String username, String password, String emailAddress,
-      {String sessionToken, bool debug, ParseHTTPClient client}) {
+      {String sessionToken, bool debug, ParseClient client}) {
     return _subClassHandler.createParseUser(username, password, emailAddress,
         sessionToken: sessionToken, debug: debug, client: client);
   }

packages/dart/lib/src/data/parse_subclass_handler.dart

@@ -3,7 +3,7 @@ part of flutter_parse_sdk;
 typedef ParseObjectConstructor = ParseObject Function();
 typedef ParseUserConstructor = ParseUser Function(
     String username, String password, String emailAddress,
-    {String sessionToken, bool debug, ParseHTTPClient client});
+    {String sessionToken, bool debug, ParseClient client});
 typedef ParseFileConstructor = ParseFileBase Function(
     {String name, String url});
 
@@ -58,7 +58,7 @@ class ParseSubClassHandler {
 
   ParseUser createParseUser(
       String username, String password, String emailAddress,
-      {String sessionToken, bool debug, ParseHTTPClient client}) {
+      {String sessionToken, bool debug, ParseClient client}) {
     return _parseUserConstructor != null
         ? _parseUserConstructor(username, password, emailAddress,
             sessionToken: sessionToken, debug: debug, client: client)

packages/dart/lib/src/network/dio-options.dart

@@ -0,0 +1,10 @@
+part of flutter_parse_sdk;
+
+class ParseNetworkOptions {
+  ParseNetworkOptions({this.headers});
+
+  final Map<String, dynamic> headers;
+  // final ParseNetworkResponseType responseType;
+}
+
+enum ParseNetworkResponseType { json, stream, plain, bytes }

packages/dart/lib/src/network/http_client_adapter_native.dart renamed to packages/dart/lib/src/network/dio_adapter_io.dart

@@ -0,0 +1,102 @@
+part of flutter_parse_sdk;
+
+typedef ParseClientCreator = ParseClient Function(
+    {bool sendSessionId, SecurityContext securityContext});
+
+abstract class ParseClient {
+  Future<ParseNetworkResponse> get(
+    String path, {
+    ParseNetworkOptions options,
+    ProgressCallback onReceiveProgress,
+  });
+
+  Future<ParseNetworkResponse> put(
+    String path, {
+    String data,
+    ParseNetworkOptions options,
+  });
+
+  Future<ParseNetworkResponse> post(
+    String path, {
+    String data,
+    ParseNetworkOptions options,
+  });
+
+  Future<ParseNetworkResponse> postBytes(
+    String path, {
+    Stream<List<int>> data,
+    ParseNetworkOptions options,
+    ProgressCallback onSendProgress,
+  });
+
+  Future<ParseNetworkResponse> delete(
+    String path, {
+    ParseNetworkOptions options,
+  });
+
+  Future<ParseNetworkByteResponse> getBytes(
+    String path, {
+    ParseNetworkOptions options,
+    ProgressCallback onReceiveProgress,
+  });
+
+  // Future<ParseNetworkByteResponse> putBytes(
+  //   String path, {
+  //   dynamic data,
+  //   Map<String, dynamic> queryParameters,
+  //   ParseNetworkOptions options,
+  //   ProgressCallback onReceiveProgress,
+  // });
+  //
+  // Future<ParseNetworkByteResponse> postBytes(
+  //   String path, {
+  //   String data,
+  //   ParseNetworkOptions options,
+  //   ProgressCallback onReceiveProgress,
+  //   ProgressCallback onSendProgress,
+  // });
+  //
+  // Future<ParseNetworkByteResponse> deleteBytes(
+  //   String path, {
+  //   Map<String, dynamic> queryParameters,
+  //   ParseNetworkOptions options,
+  // });
+
+  @deprecated
+  ParseCoreData get data => ParseCoreData();
+}
+
+/// Callback to listen the progress for sending/receiving data.
+///
+/// [count] is the length of the bytes have been sent/received.
+///
+/// [total] is the content length of the response/request body.
+/// 1.When receiving data:
+///   [total] is the request body length.
+/// 2.When receiving data:
+///   [total] will be -1 if the size of the response body is not known in advance,
+///   for example: response data is compressed with gzip or no content-length header.
+typedef ProgressCallback = void Function(int count, int total);
+
+class ParseNetworkResponse {
+  final String data;
+  final int statusCode;
+
+  ParseNetworkResponse({
+    this.data,
+    this.statusCode = -1,
+  });
+}
+
+class ParseNetworkByteResponse extends ParseNetworkResponse {
+  final List<int> bytes;
+
+  ParseNetworkByteResponse({
+    this.bytes,
+    final String data = 'byte response',
+    final int statusCode,
+  }) : super(
+          data: data,
+          statusCode: statusCode,
+        );
+}