Merge pull request #87 from ParsePlatform/fosco.map
Added map to schema object types, fixed expiresAt
This commit is contained in:
@@ -283,8 +283,7 @@ RestWrite.prototype.transformUser = function() {
|
|||||||
'action': 'login',
|
'action': 'login',
|
||||||
'authProvider': 'password'
|
'authProvider': 'password'
|
||||||
},
|
},
|
||||||
restricted: false,
|
restricted: false
|
||||||
expiresAt: 0
|
|
||||||
};
|
};
|
||||||
var create = new RestWrite(this.config, Auth.master(this.config),
|
var create = new RestWrite(this.config, Auth.master(this.config),
|
||||||
'_Session', null, sessionData);
|
'_Session', null, sessionData);
|
||||||
|
|||||||
@@ -282,6 +282,7 @@ function getType(obj) {
|
|||||||
case 'string':
|
case 'string':
|
||||||
case 'number':
|
case 'number':
|
||||||
return type;
|
return type;
|
||||||
|
case 'map':
|
||||||
case 'object':
|
case 'object':
|
||||||
if (!obj) {
|
if (!obj) {
|
||||||
return undefined;
|
return undefined;
|
||||||
|
|||||||
@@ -46,6 +46,11 @@ function transformKeyValue(schema, className, restKey, restValue, options) {
|
|||||||
case '_session_token':
|
case '_session_token':
|
||||||
key = '_session_token';
|
key = '_session_token';
|
||||||
break;
|
break;
|
||||||
|
case 'expiresAt':
|
||||||
|
case '_expiresAt':
|
||||||
|
key = '_expiresAt';
|
||||||
|
timeField = true;
|
||||||
|
break;
|
||||||
case '_rperm':
|
case '_rperm':
|
||||||
case '_wperm':
|
case '_wperm':
|
||||||
return {key: key, value: restValue};
|
return {key: key, value: restValue};
|
||||||
@@ -642,6 +647,10 @@ function untransformObject(schema, className, mongoObject) {
|
|||||||
case '_created_at':
|
case '_created_at':
|
||||||
restObject['createdAt'] = Parse._encode(new Date(mongoObject[key])).iso;
|
restObject['createdAt'] = Parse._encode(new Date(mongoObject[key])).iso;
|
||||||
break;
|
break;
|
||||||
|
case 'expiresAt':
|
||||||
|
case '_expiresAt':
|
||||||
|
restObject['expiresAt'] = Parse._encode(new Date(mongoObject[key])).iso;
|
||||||
|
break;
|
||||||
case '_auth_data_anonymous':
|
case '_auth_data_anonymous':
|
||||||
restObject['authData'] = restObject['authData'] || {};
|
restObject['authData'] = restObject['authData'] || {};
|
||||||
restObject['authData']['anonymous'] = mongoObject[key];
|
restObject['authData']['anonymous'] = mongoObject[key];
|
||||||
|
|||||||
5
users.js
5
users.js
@@ -55,6 +55,9 @@ function handleLogIn(req) {
|
|||||||
user.sessionToken = token;
|
user.sessionToken = token;
|
||||||
delete user.password;
|
delete user.password;
|
||||||
|
|
||||||
|
var expiresAt = new Date();
|
||||||
|
expiresAt.setFullYear(expiresAt.getFullYear() + 1);
|
||||||
|
|
||||||
var sessionData = {
|
var sessionData = {
|
||||||
sessionToken: token,
|
sessionToken: token,
|
||||||
user: {
|
user: {
|
||||||
@@ -67,7 +70,7 @@ function handleLogIn(req) {
|
|||||||
'authProvider': 'password'
|
'authProvider': 'password'
|
||||||
},
|
},
|
||||||
restricted: false,
|
restricted: false,
|
||||||
expiresAt: 0,
|
expiresAt: Parse._encode(expiresAt).iso,
|
||||||
installationId: req.info.installationId
|
installationId: req.info.installationId
|
||||||
};
|
};
|
||||||
var create = new RestWrite(req.config, Auth.master(req.config),
|
var create = new RestWrite(req.config, Auth.master(req.config),
|
||||||
|
|||||||
Reference in New Issue
Block a user