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

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Matteo Pagliazzi
2020-04-18 16:09:40 +02:00
parent 2896cf77e0 9f9da5632d
commit 8ca5ee99b0
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "habitica", "name": "habitica",
"version": "4.140.6", "version": "4.140.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.140.6", "version": "4.140.7",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@babel/core": "^7.9.0", "@babel/core": "^7.9.0",

1
test/api/unit/middlewares/errorHandler.test.js
View File

@@ -170,6 +170,7 @@ describe('errorHandler', () => {
originalUrl: req.originalUrl, originalUrl: req.originalUrl,
headers: req.headers, headers: req.headers,
body: req.body, body: req.body,
query: req.query,
httpCode: 400, httpCode: 400,
isHandledError: true, isHandledError: true,
}); });

6
website/server/controllers/api-v3/auth.js
View File

@@ -160,8 +160,10 @@ api.redirectApple = {
} }
let url = `/static/apple-redirect?code=${req.body.code}`; let url = `/static/apple-redirect?code=${req.body.code}`;
if (req.body.user) { if (req.body.user) {
const { name } = JSON.parse(req.body.user); const parsedBody = JSON.parse(req.body.user);
url += `&name=${name.firstName} ${name.lastName}`; if (parsedBody && parsedBody.name) {
url += `&name=${parsedBody.name.firstName} ${parsedBody.name.lastName}`;
}
} }
return res.redirect(303, url); return res.redirect(303, url);
}, },

1
website/server/middlewares/errorHandler.js
View File

@@ -69,6 +69,7 @@ export default function errorHandler (err, req, res, next) { // eslint-disable-l
// don't send sensitive information that only adds noise // don't send sensitive information that only adds noise
headers: omit(req.headers, ['x-api-key', 'cookie', 'password', 'confirmPassword']), headers: omit(req.headers, ['x-api-key', 'cookie', 'password', 'confirmPassword']),
body: omit(req.body, ['password', 'confirmPassword']), body: omit(req.body, ['password', 'confirmPassword']),
query: omit(req.query, ['password', 'confirmPassword']),
httpCode: responseErr.httpCode, httpCode: responseErr.httpCode,
isHandledError: responseErr.httpCode < 500, isHandledError: responseErr.httpCode < 500,