Merge pull request #4 from phillwiggins/master

Merge upstream.

Author: chrbayer

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.11
+ParseFile fixed
+Anonymous login
+SecurityContext
+CloudFunctions with objects
+
 ## 1.0.10
 Add ParseConfig.
 Fixed whereEqualsTo('', PARSEOBJECT) and other queries

README.md

@@ -13,7 +13,7 @@ Want to get involved? Join our Slack channel and help out! (http://flutter-parse
 To install, either add to your pubspec.yaml
 ```
 dependencies:  
-    parse_server_sdk: ^1.0.10
+    parse_server_sdk: ^1.0.11
 ```
 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.
 
@@ -33,8 +33,10 @@ Parse().initialize(
         ApplicationConstants.keyApplicationId,
         ApplicationConstants.keyParseServerUrl,
         masterKey: ApplicationConstants.keyParseMasterKey,
-       debug: true,
-        liveQuery: true);
+        clientKey: ApplicationConstants.keyParseClientKey,
+        debug: true,
+        liveQuery: true,
+		securityContext: securityContext);
 ```
 
 ## Queries

example/lib/diet_plan.dart

@@ -1,15 +1,15 @@
 import 'dart:core';
 
-import 'package:parse_server_sdk/parse.dart';
+import 'package:parse_server_sdk/parse_server_sdk.dart';
 
 class DietPlan extends ParseObject implements ParseCloneable {
-
   DietPlan() : super(_keyTableName);
-  DietPlan.clone(): this();
+  DietPlan.clone() : this();
 
   /// Looks strangely hacky but due to Flutter not using reflection, we have to
   /// mimic a clone
-  @override clone(Map map) => DietPlan.clone()..fromJson(map);
+  @override
+  clone(Map map) => DietPlan.clone()..fromJson(map);
 
   static const String _keyTableName = 'Diet_Plans';
   static const String keyName = 'Name';

example/lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_plugin_example/application_constants.dart';
 import 'package:flutter_plugin_example/diet_plan.dart';
-import 'package:parse_server_sdk/parse.dart';
+import 'package:parse_server_sdk/parse_server_sdk.dart';
 
 void main() => runApp(new MyApp());
 
@@ -178,20 +178,13 @@ class _MyAppState extends State<MyApp> {
   }
 
   function() async {
-    var user =
-        ParseUser("TestFlutter", "TestPassword123", "[email protected]");
-    await user.signUp();
-    var loginResponse = await user.login();
-    if (loginResponse.success) user = loginResponse.result;
-
-    var customClient = ParseHTTPClient();
-    customClient.additionalHeaders = {
-      keyHeaderSessionToken: ParseCoreData().sessionId
-    };
-    var function = ParseCloudFunction('hello', client: customClient);
-    function.execute();
-
-    user.destroy();
+    var function = ParseCloudFunction('hello');
+    var result = await function.executeObjectFunction<ParseObject>();
+    if (result.success) {
+      if (result.result is ParseObject) {
+        print((result.result as ParseObject).className);
+      }
+    }
   }
 
   functionWithParameters() async {

lib/parse.dart renamed to lib/parse_server_sdk.dart

@@ -6,6 +6,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:http/http.dart';
+import 'package:http/io_client.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 import 'package:shared_preferences/shared_preferences.dart';
@@ -57,7 +58,6 @@ part 'src/utils/parse_utils.dart';
 
 class Parse {
   ParseCoreData data;
-  final ParseHTTPClient client = new ParseHTTPClient();
   bool _hasBeenInitialised = false;
 
   /// To initialise Parse Server in your application
@@ -78,14 +78,16 @@ class Parse {
       String liveQueryUrl,
       String clientKey,
       String masterKey,
-      String sessionId}) {
+      String sessionId,
+      SecurityContext securityContext}) {
     ParseCoreData.init(appId, serverUrl,
         debug: debug,
         appName: appName,
         liveQueryUrl: liveQueryUrl,
         masterKey: masterKey,
         clientKey: clientKey,
-        sessionId: sessionId);
+        sessionId: sessionId,
+        securityContext: securityContext);
 
     ParseCoreData().initStorage();
 
@@ -100,7 +102,7 @@ class Parse {
     ParseResponse parseResponse;
 
     try {
-      var response = await ParseHTTPClient()
+      var response = await ParseHTTPClient(ParseCoreData().securityContext)
           .get("${ParseCoreData().serverUrl}$keyEndPointHealth");
       parseResponse =
           ParseResponse.handleResponse(this, response, returnAsResult: true);

lib/src/base/parse_constants.dart

@@ -1,7 +1,7 @@
 part of flutter_parse_sdk;
 
 // Library
-const String keySdkVersion = '1.0.10';
+const String keySdkVersion = '1.0.11';
 const String keyLibraryName = 'Flutter Parse SDK';
 
 // End Points

lib/src/data/parse_core_data.dart

@@ -11,7 +11,13 @@ class ParseCoreData {
   /// This class should not be user unless switching servers during the app,
   /// which is odd. Should only be user by Parse.init
   static void init(appId, serverUrl,
-      {debug, appName, liveQueryUrl, masterKey, clientKey, sessionId}) {
+      {debug,
+      appName,
+      liveQueryUrl,
+      masterKey,
+      clientKey,
+      sessionId,
+      securityContext}) {
     _instance = ParseCoreData._init(appId, serverUrl);
 
     if (debug != null) _instance.debug = debug;
@@ -20,6 +26,7 @@ class ParseCoreData {
     if (clientKey != null) _instance.clientKey = clientKey;
     if (masterKey != null) _instance.masterKey = masterKey;
     if (sessionId != null) _instance.sessionId = sessionId;
+    if (securityContext != null) _instance.securityContext = securityContext;
   }
 
   String appName;
@@ -29,6 +36,7 @@ class ParseCoreData {
   String masterKey;
   String clientKey;
   String sessionId;
+  SecurityContext securityContext;
   bool debug;
   SharedPreferences storage;
 

lib/src/network/parse_http_client.dart

@@ -2,12 +2,15 @@ part of flutter_parse_sdk;
 
 /// Creates a custom version of HTTP Client that has Parse Data Preset
 class ParseHTTPClient extends BaseClient {
-  final Client _client = Client();
+  final Client _client;
   final String _userAgent = "$keyLibraryName $keySdkVersion";
   ParseCoreData data = ParseCoreData();
   Map<String, String> additionalHeaders;
 
-  ParseHTTPClient();
+  ParseHTTPClient([SecurityContext securityContext])
+      : _client = securityContext != null
+            ? IOClient(HttpClient(context: securityContext))
+            : IOClient();
 
   /// Overrides the call method for HTTP Client and adds custom headers
   @override

lib/src/objects/parse_config.dart

@@ -1,7 +1,7 @@
 part of flutter_parse_sdk;
 
 class ParseConfig extends ParseObject {
-  var _client = ParseHTTPClient();
+  var _client = ParseHTTPClient(ParseCoreData().securityContext);
 
   /// Creates an instance of ParseConfig so that you can grab all configs from the server
   ParseConfig({bool debug, ParseHTTPClient client}) : super('config') {
@@ -14,7 +14,8 @@ class ParseConfig extends ParseObject {
     try {
       var uri = "${ParseCoreData().serverUrl}/config";
       var result = await _client.get(uri);
-      return handleResponse(this, result, ParseApiRQ.getConfigs, _debug, className);
+      return handleResponse(
+          this, result, ParseApiRQ.getConfigs, _debug, className);
     } on Exception catch (e) {
       return handleException(e, ParseApiRQ.getConfigs, _debug, className);
     }
@@ -26,7 +27,8 @@ class ParseConfig extends ParseObject {
       var uri = "${ParseCoreData().serverUrl}/config";
       var body = "{\"params\":{\"$key\": \"${parseEncode(value)}\"}}";
       var result = await _client.put(uri, body: body);
-      return handleResponse(this, result, ParseApiRQ.addConfig, _debug, className);
+      return handleResponse(
+          this, result, ParseApiRQ.addConfig, _debug, className);
     } on Exception catch (e) {
       return handleException(e, ParseApiRQ.addConfig, _debug, className);
     }

lib/src/objects/parse_file.dart

@@ -33,7 +33,10 @@ class ParseFile extends ParseObject {
   ParseFile(this._file,
       {String name, String url, bool debug, ParseHTTPClient client})
       : super(keyFile) {
-    client == null ? _client = ParseHTTPClient() : _client = client;
+    client == null
+        ? _client = ParseHTTPClient(ParseCoreData().securityContext)
+        : _client = client;
+        
     _debug = isDebugEnabled(objectLevelDebug: debug);
     if (_file != null) {
       this._fileName = path.basename(_file.path);
@@ -93,6 +96,7 @@ class ParseFile extends ParseObject {
     var uri = _client.data.serverUrl + "$_path";
     final body = await _file.readAsBytes();
     final response = await _client.post(uri, headers: headers, body: body);
-    return handleResponse<ParseFile>(this, response, ParseApiRQ.upload, _debug, className);
+    return handleResponse<ParseFile>(
+        this, response, ParseApiRQ.upload, _debug, className);
   }
 }