From 452f9768b391f1afed2ecb2d27560648686b9b20 Mon Sep 17 00:00:00 2001
From: Phill <phill.wiggins@gmail.com>
Date: Tue, 8 Jan 2019 20:08:13 +0000
Subject: [PATCH] Version 1.0.1 - Code tidy on queries

---
 CHANGELOG.md                      |  4 ++++
 README.md                         |  7 +------
 lib/src/data/parse_data_user.dart | 16 ++++++++--------
 lib/src/objects/parse_user.dart   |  5 ++---
 pubspec.yaml                      |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae0e8e077..f8a7f12ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.2
+
+Fixed login
+
 ## 1.0.1
 
 Added documentation and GeoPoints
diff --git a/README.md b/README.md
index c9ce665c4..207619a64 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +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.1
-	
-
-
-
+    parse_server_sdk: ^1.0.2
 ```
 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.
 
diff --git a/lib/src/data/parse_data_user.dart b/lib/src/data/parse_data_user.dart
index 701cee684..b4238cbe9 100644
--- a/lib/src/data/parse_data_user.dart
+++ b/lib/src/data/parse_data_user.dart
@@ -26,16 +26,16 @@ class User extends ParseBase {
   factory User() => _instance;
 
   /// Returns a [User] from a [Map] object
-  fromJson(Map objectData) {
+  fromJson(objectData) {
     if (getObjectData() == null) setObjectData(objectData);
     getObjectData().addAll(objectData);
-    if (getObjectData().containsKey(ParseConstants.OBJECT_ID)) objectId = get(ParseConstants.OBJECT_ID).toString();
-    if (getObjectData().containsKey(ParseConstants.CREATED_AT)) createdAt = convertStringToDateTime(get(ParseConstants.CREATED_AT).toString());
-    if (getObjectData().containsKey(ParseConstants.UPDATED_AT)) updatedAt = convertStringToDateTime(get(ParseConstants.UPDATED_AT).toString());
-    if (getObjectData().containsKey(ACL)) acl = get(ACL).toString();
-    if (getObjectData().containsKey(USERNAME)) username = get(USERNAME).toString();
-    if (getObjectData().containsKey(PASSWORD)) password = get(PASSWORD).toString();
-    if (getObjectData().containsKey(EMAIL)) emailAddress = get(EMAIL).toString();
+    if (getObjectData().containsKey(ParseConstants.OBJECT_ID)) objectId = getObjectData()[ParseConstants.OBJECT_ID];
+    if (getObjectData().containsKey(ParseConstants.CREATED_AT)) createdAt = convertStringToDateTime(getObjectData()[ParseConstants.CREATED_AT]);
+    if (getObjectData().containsKey(ParseConstants.UPDATED_AT)) updatedAt = convertStringToDateTime(getObjectData()[ParseConstants.UPDATED_AT]);
+    if (getObjectData().containsKey(ACL)) acl = getObjectData()[ACL].toString();
+    if (getObjectData().containsKey(USERNAME)) username = getObjectData()[USERNAME];
+    if (getObjectData().containsKey(PASSWORD)) password = getObjectData()[PASSWORD];
+    if (getObjectData().containsKey(EMAIL)) emailAddress = getObjectData()[EMAIL];
 
     if (updatedAt == null) updatedAt = createdAt;
 
diff --git a/lib/src/objects/parse_user.dart b/lib/src/objects/parse_user.dart
index fa44b7815..ce188d30c 100644
--- a/lib/src/objects/parse_user.dart
+++ b/lib/src/objects/parse_user.dart
@@ -167,15 +167,14 @@ class ParseUser {
 
     var responseString = ' \n';
 
-    responseString += "----"
-        "\n${_client.data.appName} API Response ($className : ${type.toString()}) :";
+    responseString += "----""\n${_client.data.appName} API Response ($className : ${type.toString()}) :";
 
     if (response.statusCode == 200 || response.statusCode == 201) {
       responseString += "\nStatus Code: ${response.statusCode}";
       responseString += "\nPayload: ${responseData.toString()}";
 
       if (responseData.containsKey('objectId')) {
-        User.instance.fromJson(JsonDecoder().convert(response.body) as Map);
+        User.instance.fromJson(responseData);
         _client.data.sessionId = responseData['sessionToken'];
       }
     } else {
diff --git a/pubspec.yaml b/pubspec.yaml
index 44fd7d519..add1ec577 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: parse_server_sdk
 description: This is a Flutter plugin that allows communication with a Parse Server, (https://parseplatform.org)
-version: 1.0.1
+version: 1.0.2
 homepage: https://github.com/phillwiggins/flutter_parse_sdk
 author: PhillWiggins <phill.wiggins@gmail.com>