_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #333 from thecodingmachine/fixstatuscode

Browse Source 
Fixing HTTP status code not correctly outputed because of CORS headers
This commit is contained in:
David Négrier 2020-10-15 17:35:26 +02:00 committed by GitHub
commit 6d0c435553
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
back/src/Controller/AuthenticateController.ts
View File

@ -28,8 +28,6 @@ export class AuthenticateController extends BaseController {
this.App.post("/register", (res: HttpResponse, req: HttpRequest) => { this.App.post("/register", (res: HttpResponse, req: HttpRequest) => {
(async () => { (async () => {
this.addCorsHeaders(res);
res.onAborted(() => { res.onAborted(() => {
console.warn('Login request was aborted'); console.warn('Login request was aborted');
}) })
@ -50,7 +48,9 @@ export class AuthenticateController extends BaseController {
const mapUrlStart = data.mapUrlStart; const mapUrlStart = data.mapUrlStart;
const authToken = jwtTokenManager.createJWTToken(userUuid); const authToken = jwtTokenManager.createJWTToken(userUuid);
res.writeStatus("200 OK").end(JSON.stringify({ res.writeStatus("200 OK");
this.addCorsHeaders(res);
res.end(JSON.stringify({
authToken, authToken,
userUuid, userUuid,
organizationSlug, organizationSlug,
@ -61,7 +61,9 @@ export class AuthenticateController extends BaseController {
} catch (e) { } catch (e) {
console.log("An error happened", e) console.log("An error happened", e)
res.writeStatus(e.status || "500 Internal Server Error").end('An error happened'); res.writeStatus(e.status || "500 Internal Server Error");
this.addCorsHeaders(res);
res.end('An error happened');
} }
@ -79,8 +81,6 @@ export class AuthenticateController extends BaseController {
this.App.get("/verify", (res: HttpResponse, req: HttpRequest) => { this.App.get("/verify", (res: HttpResponse, req: HttpRequest) => {
(async () => { (async () => {
this.addCorsHeaders(res);
const query = parse(req.getQuery()); const query = parse(req.getQuery());
res.onAborted(() => { res.onAborted(() => {
@ -90,12 +90,17 @@ export class AuthenticateController extends BaseController {
try { try {
await jwtTokenManager.getUserUuidFromToken(query.token as string); await jwtTokenManager.getUserUuidFromToken(query.token as string);
} catch (e) { } catch (e) {
res.writeStatus("400 Bad Request").end(JSON.stringify({ res.writeStatus("400 Bad Request");
this.addCorsHeaders(res);
res.end(JSON.stringify({
"success": false, "success": false,
"message": "Invalid JWT token" "message": "Invalid JWT token"
})); }));
return;
} }
res.writeStatus("200 OK").end(JSON.stringify({ res.writeStatus("200 OK");
this.addCorsHeaders(res);
res.end(JSON.stringify({
"success": true "success": true
})); }));
})(); })();
@ -112,7 +117,6 @@ export class AuthenticateController extends BaseController {
}); });
this.App.post("/anonymLogin", (res: HttpResponse, req: HttpRequest) => { this.App.post("/anonymLogin", (res: HttpResponse, req: HttpRequest) => {
this.addCorsHeaders(res);
res.onAborted(() => { res.onAborted(() => {
console.warn('Login request was aborted'); console.warn('Login request was aborted');
@ -120,7 +124,9 @@ export class AuthenticateController extends BaseController {
const userUuid = v4(); const userUuid = v4();
const authToken = jwtTokenManager.createJWTToken(userUuid); const authToken = jwtTokenManager.createJWTToken(userUuid);
res.writeStatus("200 OK").end(JSON.stringify({ res.writeStatus("200 OK");
this.addCorsHeaders(res);
res.end(JSON.stringify({
authToken, authToken,
userUuid, userUuid,
})); }));

15
back/src/Controller/FileController.ts
View File

@ -44,8 +44,6 @@ export class FileController extends BaseController {
this.App.post("/upload-audio-message", (res: HttpResponse, req: HttpRequest) => { this.App.post("/upload-audio-message", (res: HttpResponse, req: HttpRequest) => {
(async () => { (async () => {
this.addCorsHeaders(res);
res.onAborted(() => { res.onAborted(() => {
console.warn('upload-audio-message request was aborted'); console.warn('upload-audio-message request was aborted');
}) })
@ -80,14 +78,18 @@ export class FileController extends BaseController {
} }
}); });
res.writeStatus("200 OK").end(JSON.stringify({ res.writeStatus("200 OK");
this.addCorsHeaders(res);
res.end(JSON.stringify({
id: audioMessageId, id: audioMessageId,
path: `/download-audio-message/${audioMessageId}` path: `/download-audio-message/${audioMessageId}`
})); }));
} catch (e) { } catch (e) {
console.log("An error happened", e) console.log("An error happened", e)
res.writeStatus(e.status || "500 Internal Server Error").end('An error happened'); res.writeStatus(e.status || "500 Internal Server Error");
this.addCorsHeaders(res);
res.end('An error happened');
} }
})(); })();
}); });
@ -101,7 +103,6 @@ export class FileController extends BaseController {
}); });
this.App.get("/download-audio-message/:id", (res: HttpResponse, req: HttpRequest) => { this.App.get("/download-audio-message/:id", (res: HttpResponse, req: HttpRequest) => {
this.addCorsHeaders(res);
res.onAborted(() => { res.onAborted(() => {
console.warn('upload-audio-message request was aborted'); console.warn('upload-audio-message request was aborted');
@ -111,7 +112,9 @@ export class FileController extends BaseController {
const file = this.uploadedFileBuffers.get(id); const file = this.uploadedFileBuffers.get(id);
if (file === undefined) { if (file === undefined) {
res.writeStatus("404 Not found").end("Cannot find file"); res.writeStatus("404 Not found");
this.addCorsHeaders(res);
res.end("Cannot find file");
return; return;
} }

21
back/src/Controller/MapController.ts
View File

@ -24,7 +24,6 @@ export class MapController extends BaseController{
}); });
this.App.get("/map", (res: HttpResponse, req: HttpRequest) => { this.App.get("/map", (res: HttpResponse, req: HttpRequest) => {
this.addCorsHeaders(res);
res.onAborted(() => { res.onAborted(() => {
console.warn('/map request was aborted'); console.warn('/map request was aborted');
@ -34,25 +33,35 @@ export class MapController extends BaseController{
if (typeof query.organizationSlug !== 'string') { if (typeof query.organizationSlug !== 'string') {
console.error('Expected organizationSlug parameter'); console.error('Expected organizationSlug parameter');
res.writeStatus("400 Bad request").end("Expected organizationSlug parameter"); res.writeStatus("400 Bad request");
this.addCorsHeaders(res);
res.end("Expected organizationSlug parameter");
} }
if (typeof query.worldSlug !== 'string') { if (typeof query.worldSlug !== 'string') {
console.error('Expected worldSlug parameter'); console.error('Expected worldSlug parameter');
res.writeStatus("400 Bad request").end("Expected worldSlug parameter"); res.writeStatus("400 Bad request");
this.addCorsHeaders(res);
res.end("Expected worldSlug parameter");
} }
if (typeof query.roomSlug !== 'string' && query.roomSlug !== undefined) { if (typeof query.roomSlug !== 'string' && query.roomSlug !== undefined) {
console.error('Expected only one roomSlug parameter'); console.error('Expected only one roomSlug parameter');
res.writeStatus("400 Bad request").end("Expected only one roomSlug parameter"); res.writeStatus("400 Bad request");
this.addCorsHeaders(res);
res.end("Expected only one roomSlug parameter");
} }
(async () => { (async () => {
try { try {
const mapDetails = await adminApi.fetchMapDetails(query.organizationSlug as string, query.worldSlug as string, query.roomSlug as string|undefined); const mapDetails = await adminApi.fetchMapDetails(query.organizationSlug as string, query.worldSlug as string, query.roomSlug as string|undefined);
res.writeStatus("200 OK").end(JSON.stringify(mapDetails)); res.writeStatus("200 OK");
this.addCorsHeaders(res);
res.end(JSON.stringify(mapDetails));
} catch (e) { } catch (e) {
console.error(e); console.error(e);
res.writeStatus("500 Internal Server Error").end("An error occurred"); res.writeStatus("500 Internal Server Error")
this.addCorsHeaders(res);
res.end("An error occurred");
} }
})(); })();