Merge branch 'develop' into player-report

# Conflicts:
#	back/src/Controller/IoSocketController.ts
This commit is contained in:
Gregoire Parant
2020-10-15 09:44:37 +02:00
9 changed files with 226 additions and 150 deletions
@@ -40,7 +40,6 @@ export class AuthenticateController extends BaseController {
try {
if (typeof organizationMemberToken != 'string') throw new Error('No organization token');
const data = await adminApi.fetchMemberDataByToken(organizationMemberToken);
const userUuid = data.userUuid;
const organizationSlug = data.organizationSlug;
const worldSlug = data.worldSlug;
@@ -58,7 +57,7 @@ export class AuthenticateController extends BaseController {
}));
} catch (e) {
console.log("An error happened", e)
console.error("An error happened", e)
res.writeStatus(e.status || "500 Internal Server Error").end('An error happened');
}