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

Merge branch 'develop' of github.com:thecodingmachine/workadventure

Browse Source
This commit is contained in:
_Bastler 2021-12-09 08:14:10 +01:00
commit 4695098632
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/Connexion/AxiosUtils.ts
View File

@ -13,6 +13,12 @@ axiosWithRetry.defaults.raxConfig = {
maxRetryAfter: 60_000,
statusCodesToRetry: [
[100, 199],
[429, 429],
[501, 599],
],
// You can detect when a retry is happening, and figure out how many
// retry attempts have been made
onRetryAttempt: (err) => {

7
front/src/Connexion/Room.ts
View File

@ -115,11 +115,12 @@ export class Room {
this._contactPage = data.contactPage || CONTACT_URL;
return new MapDetail(data.mapUrl, data.textures);
} catch (e) {
console.error("Error => getMapDetail", e, e.response);
//TODO fix me and manage Error class
if (e.response?.data === "Token decrypted error") {
if (axios.isAxiosError(e) && e.response?.status == 401 && e.response?.data === "Token decrypted error") {
console.warn("JWT token sent could not be decrypted. Maybe it expired?");
localUserStore.setAuthToken(null);
window.location.assign("/login");
} else {
console.error("Error => getMapDetail", e, e.response);
}
throw e;
}

3
messages/protos/messages.proto
View File

@ -259,6 +259,9 @@ message BanUserMessage{
string message = 2;
}
/**
* Messages going from back and pusher to the front
*/
message ServerToClientMessage {
oneof message {
BatchMessage batchMessage = 1;

15
pusher/src/Controller/MapController.ts
View File

@ -8,6 +8,7 @@ import { isMapDetailsData, MapDetailsData } from "../Services/AdminApi/MapDetail
import { socketManager } from "../Services/SocketManager";
import { AuthTokenData, jwtTokenManager } from "../Services/JWTTokenManager";
import { v4 } from "uuid";
import { InvalidTokenError } from "./InvalidTokenError";
export class MapController extends BaseController {
constructor(private App: TemplatedApp) {
@ -86,11 +87,15 @@ export class MapController extends BaseController {
userId = authTokenData.identifier;
console.info("JWT expire, but decoded", userId);
} catch (e) {
// The token was not good, redirect user on login page
res.writeStatus("500");
res.writeHeader("Access-Control-Allow-Origin", FRONT_URL);
res.end("Token decrypted error");
return;
if (e instanceof InvalidTokenError) {
// The token was not good, redirect user on login page
res.writeStatus("401 Unauthorized");
res.writeHeader("Access-Control-Allow-Origin", FRONT_URL);
res.end("Token decrypted error");
return;
} else {
return this.errorToResponse(e, res);
}
}
}
}