Skip to content

Commit c6406b9

Browse files
committed
Merge pull request #790 from drew-gross/expiresAt-fix
Expires at fix
2 parents 9bc1a35 + befcd45 commit c6406b9

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

spec/ParseUser.spec.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe('Parse.User testing', () => {
5454
success: function(user) {
5555
Parse.User.logIn("non_existent_user", "asdf3",
5656
expectError(Parse.Error.OBJECT_NOT_FOUND, done));
57-
},
57+
},
5858
error: function(err) {
5959
console.error(err);
6060
fail("Shit should not fail");
@@ -1763,5 +1763,22 @@ describe('Parse.User testing', () => {
17631763
});
17641764
});
17651765

1766+
it("session expiresAt correct format", (done) => {
1767+
Parse.User.signUp("asdf", "zxcv", null, {
1768+
success: function(user) {
1769+
request.get({
1770+
url: 'http://localhost:8378/1/classes/_Session',
1771+
json: true,
1772+
headers: {
1773+
'X-Parse-Application-Id': 'test',
1774+
'X-Parse-Master-Key': 'test',
1775+
},
1776+
}, (error, response, body) => {
1777+
expect(body.results[0].expiresAt.__type).toEqual('Date');
1778+
done();
1779+
})
1780+
}
1781+
});
1782+
});
17661783
});
17671784

src/transform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ function untransformObject(schema, className, mongoObject, isNestedObject = fals
644644
break;
645645
case 'expiresAt':
646646
case '_expiresAt':
647-
restObject['expiresAt'] = Parse._encode(new Date(mongoObject[key])).iso;
647+
restObject['expiresAt'] = Parse._encode(new Date(mongoObject[key]));
648648
break;
649649
default:
650650
// Check other auth data keys

0 commit comments

Comments
 (0)