Skip to content

Commit 5fc579f

Browse files
committed
Version 1.0.1 - Fixed login
1 parent 7ea5df0 commit 5fc579f

9 files changed

+303
-211
lines changed

.idea/workspace.xml

+271-183
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
abstract class ApplicationConstants {
2-
static const String APP_NAME = "";
3-
static const String PARSE_APPLICATION_ID = "";
4-
static const String PARSE_MASTER_KEY = "";
5-
static const String PARSE_SERVER_URL = "";
2+
static const String APP_NAME = "BodyCal";
3+
static const String PARSE_APPLICATION_ID = "bodycaldb";
4+
static const String PARSE_MASTER_KEY = "343gf35g4t6hev445f4t5f45g45d";
5+
static const String PARSE_SERVER_URL = "https://bc-server.purewowstudio.com/parse/";
66
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
part of flutter_parse_sdk;
22

33
/// Used to define the API calls made in ParseFunction logs
4-
enum ParseApiFunctionCallType { execute }
4+
enum ParseApiFunction { execute }
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
part of flutter_parse_sdk;
22

33
/// Used to define the API calls made in ParseObject logs
4-
enum ParseApiObjectCallType { get, getAll, create, save, query, delete }
4+
enum ParseApiObject { get, getAll, create, save, query, delete }

lib/src/enums/parse_enum_user_call.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
part of flutter_parse_sdk;
22

33
/// Used to define the API calls made in ParseUser logs
4-
enum ParseApiUserCallType {
4+
enum ParseApiUser {
55
currentUser,
66
signUp,
77
login,

lib/src/objects/parse_function.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ class ParseCloudFunction extends ParseBase {
2222
execute() async {
2323
var uri = _client.data.serverUrl + "$_path";
2424
var result = await _client.post(uri, body: JsonEncoder().convert(getObjectData()));
25-
return _handleResult(result, ParseApiFunctionCallType.execute);
25+
return _handleResult(result, ParseApiFunction.execute);
2626
}
2727

2828
/// Handles an API response
29-
ParseResponse _handleResult(Response response, ParseApiFunctionCallType type) {
29+
ParseResponse _handleResult(Response response, ParseApiFunction type) {
3030
ParseResponse parseResponse = ParseResponse.handleResponse(this, response);
3131
Map<String, dynamic> responseData = JsonDecoder().convert(response.body);
3232

lib/src/objects/parse_object.dart

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ class ParseObject extends ParseBase {
2525
var uri = _getBasePath(_path);
2626
if (objectId != null) uri += "/$objectId";
2727
var result = await _client.get(uri);
28-
return _handleResult(result, ParseApiObjectCallType.get);
28+
return _handleResult(result, ParseApiObject.get);
2929
}
3030

3131
/// Gets all objects from this table - Limited response at the moment
3232
getAll() async {
3333
var result = await _client.get(_getBasePath(_path));
34-
return _handleResult(result, ParseApiObjectCallType.getAll);
34+
return _handleResult(result, ParseApiObject.getAll);
3535
}
3636

3737
/// Creates a new object and saves it online
3838
create() async {
3939
var uri = _client.data.serverUrl + "$_path";
4040
var result =
4141
await _client.post(uri, body: JsonEncoder().convert(getObjectData()));
42-
return _handleResult(result, ParseApiObjectCallType.create);
42+
return _handleResult(result, ParseApiObject.create);
4343
}
4444

4545
/// Saves the current object online
@@ -50,29 +50,29 @@ class ParseObject extends ParseBase {
5050
var uri = "${_getBasePath(_path)}/$objectId";
5151
var result =
5252
await _client.put(uri, body: JsonEncoder().convert(getObjectData()));
53-
return _handleResult(result, ParseApiObjectCallType.save);
53+
return _handleResult(result, ParseApiObject.save);
5454
}
5555
}
5656

5757
/// Can be used to create custom queries
5858
query(String query) async {
5959
var uri = "${_getBasePath(_path)}?$query";
6060
var result = await _client.get(uri);
61-
return _handleResult(result, ParseApiObjectCallType.query);
61+
return _handleResult(result, ParseApiObject.query);
6262
}
6363

6464
/// Deletes the current object locally and online
6565
delete(String path, String objectId) async {
6666
var uri = "${_getBasePath(path)}/$objectId";
6767
var result = await _client.delete(uri);
68-
return _handleResult(result, ParseApiObjectCallType.delete);
68+
return _handleResult(result, ParseApiObject.delete);
6969
}
7070

7171
/// Generates the path for the object
7272
_getBasePath(String path) => "${_client.data.serverUrl}$path";
7373

7474
/// Handles an API response and logs data if [bool] debug is enabled
75-
ParseResponse _handleResult(Response response, ParseApiObjectCallType type) {
75+
ParseResponse _handleResult(Response response, ParseApiObject type) {
7676
ParseResponse parseResponse = ParseResponse.handleResponse(this, response);
7777
Map<String, dynamic> responseData = JsonDecoder().convert(response.body);
7878

lib/src/objects/parse_user.dart

+9-9
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ParseUser {
4646
final response = await _client.get(uri, headers: {
4747
ParseConstants.HEADER_SESSION_TOKEN: _client.data.sessionId
4848
});
49-
return _handleResponse(response, ParseApiUserCallType.currentUser);
49+
return _handleResponse(response, ParseApiUser.currentUser);
5050
}
5151
}
5252

@@ -76,7 +76,7 @@ class ParseUser {
7676
},
7777
body: JsonEncoder().convert(bodyData));
7878

79-
_handleResponse(response, ParseApiUserCallType.signUp);
79+
_handleResponse(response, ParseApiUser.signUp);
8080
return User.instance;
8181
}
8282

@@ -100,7 +100,7 @@ class ParseUser {
100100
ParseConstants.HEADER_REVOCABLE_SESSION: "1",
101101
});
102102

103-
_handleResponse(response, ParseApiUserCallType.login);
103+
_handleResponse(response, ParseApiUser.login);
104104
return User.instance;
105105
}
106106

@@ -117,7 +117,7 @@ class ParseUser {
117117
body: JsonEncoder().convert({"email": User().emailAddress}));
118118

119119
return _handleResponse(
120-
response, ParseApiUserCallType.verificationEmailRequest);
120+
response, ParseApiUser.verificationEmailRequest);
121121
}
122122

123123
/// Sends a password reset email to the users email address
@@ -126,7 +126,7 @@ class ParseUser {
126126
"${_client.data.serverUrl}/requestPasswordReset",
127127
body: JsonEncoder().convert({"email": User().emailAddress}));
128128

129-
return _handleResponse(response, ParseApiUserCallType.requestPasswordReset);
129+
return _handleResponse(response, ParseApiUser.requestPasswordReset);
130130
}
131131

132132
/// Saves the current user
@@ -140,7 +140,7 @@ class ParseUser {
140140
final response = await _client.put(
141141
_client.data.serverUrl + "$path/${User().objectId}",
142142
body: JsonEncoder().convert(User().getObjectData()));
143-
return _handleResponse(response, ParseApiUserCallType.save);
143+
return _handleResponse(response, ParseApiUser.save);
144144
}
145145
}
146146

@@ -150,19 +150,19 @@ class ParseUser {
150150
_client.data.serverUrl + "$path/${User().objectId}",
151151
headers: {"X-Parse-Session-Token": _client.data.sessionId});
152152

153-
_handleResponse(response, ParseApiUserCallType.destroy);
153+
_handleResponse(response, ParseApiUser.destroy);
154154

155155
return User.instance.objectId;
156156
}
157157

158158
/// Gets a list of all users (limited return)
159159
all() async {
160160
final response = await _client.get(_client.data.serverUrl + "$path");
161-
return _handleResponse(response, ParseApiUserCallType.all);
161+
return _handleResponse(response, ParseApiUser.all);
162162
}
163163

164164
/// Handles all the reponse data for this class
165-
_handleResponse(Response response, ParseApiUserCallType type) {
165+
_handleResponse(Response response, ParseApiUser type) {
166166
Map<String, dynamic> responseData = JsonDecoder().convert(response.body);
167167

168168
var responseString = ' \n';

lib/src/utils/parse_utils_date.dart

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ part of flutter_parse_sdk;
33
/// Converts a [String] into a [DateTime] from a Parse Server format
44
DateTime convertStringToDateTime(String date) {
55
if (date == null) return null;
6-
var formatter = DateFormat(ParseConstants.PARSE_DATE_FORMAT);
7-
var dateToReturn = formatter.parse(_removeTimeZones(date));
8-
return dateToReturn;
6+
7+
try {
8+
var formatter = DateFormat(ParseConstants.PARSE_DATE_FORMAT);
9+
return formatter.parse(_removeTimeZones(date));
10+
} on FormatException {
11+
return null;
12+
}
913
}
1014

1115
/// Removes timezones as our current implementation does work

0 commit comments

Comments
 (0)