krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

v3: fix iap url

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-19 20:44:44 +02:00
parent 0a14d29ebb
commit c8f55302ca
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/server/controllers/top-level/payments/iap.js
View File

@@ -95,7 +95,7 @@ api.iapAndroidVerify = {
**/ **/
api.iapiOSVerify = { api.iapiOSVerify = {
method: 'POST', method: 'POST',
url: '/iap/android/verify', url: '/iap/ios/verify',
middlewares: [authWithHeaders()], middlewares: [authWithHeaders()],
async handler (req, res) { async handler (req, res) {
let iapBody = req.body; let iapBody = req.body;

3
website/server/libs/api-v3/baseModel.js
View File

@@ -60,6 +60,9 @@ module.exports = function baseModel (schema, options = {}) {
objectPath.del(plainObj, fieldPath); objectPath.del(plainObj, fieldPath);
}); });
// Always return `id`
if (!plainObj.id && plainObj._id) plainObj.id = plainObj._id;
// Allow an additional toJSON transform function to be used // Allow an additional toJSON transform function to be used
return options.toJSONTransform ? options.toJSONTransform(plainObj, doc) : plainObj; return options.toJSONTransform ? options.toJSONTransform(plainObj, doc) : plainObj;
}; };

4
website/server/models/user.js
View File

@@ -529,9 +529,7 @@ schema.plugin(baseModel, {
noSet: [], noSet: [],
private: ['auth.local.hashed_password', 'auth.local.salt'], private: ['auth.local.hashed_password', 'auth.local.salt'],
toJSONTransform: function userToJSON (plainObj, originalDoc) { toJSONTransform: function userToJSON (plainObj, originalDoc) {
plainObj.id = plainObj._id; // plainObj.filters = {}; // TODO Not saved, remove?
// plainObj.filters = {}; TODO Not saved, remove?
plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs
return plainObj; return plainObj;