Skip to content

Commit 257f337

Browse files
committed
Merge branches 'develop' and 'master' of https://github.com/phillwiggins/flutter_parse_sdk
# Conflicts: # .idea/libraries/Dart_Packages.xml # lib/src/objects/parse_file.dart # lib/src/objects/parse_user.dart # pubspec.yaml
1 parent a1f742b commit 257f337

File tree

4 files changed

+17
-26
lines changed

4 files changed

+17
-26
lines changed

example/lib/diet_plan.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import 'dart:core';
22

3-
import 'package:parse_server_sdk/parse.dart';
3+
import 'package:parse_server_sdk/parse_server_sdk.dart';
44

55
class DietPlan extends ParseObject implements ParseCloneable {
6-
76
DietPlan() : super(_keyTableName);
8-
DietPlan.clone(): this();
7+
DietPlan.clone() : this();
98

109
/// Looks strangely hacky but due to Flutter not using reflection, we have to
1110
/// mimic a clone
12-
@override clone(Map map) => DietPlan.clone()..fromJson(map);
11+
@override
12+
clone(Map map) => DietPlan.clone()..fromJson(map);
1313

1414
static const String _keyTableName = 'Diet_Plans';
1515
static const String keyName = 'Name';

example/lib/main.dart

+8-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_plugin_example/application_constants.dart';
33
import 'package:flutter_plugin_example/diet_plan.dart';
4-
import 'package:parse_server_sdk/parse.dart';
4+
import 'package:parse_server_sdk/parse_server_sdk.dart';
55

66
void main() => runApp(new MyApp());
77

@@ -178,20 +178,13 @@ class _MyAppState extends State<MyApp> {
178178
}
179179

180180
function() async {
181-
var user =
182-
ParseUser("TestFlutter", "TestPassword123", "[email protected]");
183-
await user.signUp();
184-
var loginResponse = await user.login();
185-
if (loginResponse.success) user = loginResponse.result;
186-
187-
var customClient = ParseHTTPClient();
188-
customClient.additionalHeaders = {
189-
keyHeaderSessionToken: ParseCoreData().sessionId
190-
};
191-
var function = ParseCloudFunction('hello', client: customClient);
192-
function.execute();
193-
194-
user.destroy();
181+
var function = ParseCloudFunction('hello');
182+
var result = await function.executeObjectFunction<ParseObject>();
183+
if (result.success) {
184+
if (result.result is ParseObject) {
185+
print((result.result as ParseObject).className);
186+
}
187+
}
195188
}
196189

197190
functionWithParameters() async {
File renamed without changes.

test/parse_client_configuration_test.dart

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
import 'package:parse_server_sdk/parse_server_sdk.dart';
12
import 'package:test/test.dart';
2-
import 'package:parse_server_sdk/parse.dart';
33

4-
void main(){
5-
test("testBuilder",() {
6-
Parse().initialize("appId",
7-
"serverUrl",
4+
void main() {
5+
test("testBuilder", () {
6+
Parse().initialize("appId", "serverUrl",
87
clientKey: "clientKey",
98
liveQueryUrl: "liveQueryUrl",
109
appName: "appName",
@@ -20,6 +19,5 @@ void main(){
2019
expect(ParseCoreData().masterKey, "masterKey");
2120
expect(ParseCoreData().sessionId, "sessionId");
2221
expect(ParseCoreData().debug, true);
23-
2422
});
25-
}
23+
}

0 commit comments

Comments
 (0)