Skip to content

Commit 4b48e01

Browse files
committed
Merge pull request #87 from ParsePlatform/fosco.map
Added map to schema object types, fixed expiresAt
2 parents 774de7b + 78b20d3 commit 4b48e01

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

RestWrite.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,7 @@ RestWrite.prototype.transformUser = function() {
283283
'action': 'login',
284284
'authProvider': 'password'
285285
},
286-
restricted: false,
287-
expiresAt: 0
286+
restricted: false
288287
};
289288
var create = new RestWrite(this.config, Auth.master(this.config),
290289
'_Session', null, sessionData);

Schema.js

+1
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ function getType(obj) {
282282
case 'string':
283283
case 'number':
284284
return type;
285+
case 'map':
285286
case 'object':
286287
if (!obj) {
287288
return undefined;

transform.js

+9
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ function transformKeyValue(schema, className, restKey, restValue, options) {
4646
case '_session_token':
4747
key = '_session_token';
4848
break;
49+
case 'expiresAt':
50+
case '_expiresAt':
51+
key = '_expiresAt';
52+
timeField = true;
53+
break;
4954
case '_rperm':
5055
case '_wperm':
5156
return {key: key, value: restValue};
@@ -642,6 +647,10 @@ function untransformObject(schema, className, mongoObject) {
642647
case '_created_at':
643648
restObject['createdAt'] = Parse._encode(new Date(mongoObject[key])).iso;
644649
break;
650+
case 'expiresAt':
651+
case '_expiresAt':
652+
restObject['expiresAt'] = Parse._encode(new Date(mongoObject[key])).iso;
653+
break;
645654
case '_auth_data_anonymous':
646655
restObject['authData'] = restObject['authData'] || {};
647656
restObject['authData']['anonymous'] = mongoObject[key];

users.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ function handleLogIn(req) {
5555
user.sessionToken = token;
5656
delete user.password;
5757

58+
var expiresAt = new Date();
59+
expiresAt.setFullYear(expiresAt.getFullYear() + 1);
60+
5861
var sessionData = {
5962
sessionToken: token,
6063
user: {
@@ -67,7 +70,7 @@ function handleLogIn(req) {
6770
'authProvider': 'password'
6871
},
6972
restricted: false,
70-
expiresAt: 0,
73+
expiresAt: Parse._encode(expiresAt).iso,
7174
installationId: req.info.installationId
7275
};
7376
var create = new RestWrite(req.config, Auth.master(req.config),

0 commit comments

Comments
 (0)