lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Migrating to uuid v4

Browse source
This commit is contained in:
David Négrier 2020-10-01 16:51:51 +02:00
parent 1270ae6817
commit f06abfae4c
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
back/src/Controller/AuthenticateController.ts
View file

@ -1,6 +1,6 @@
import Jwt from "jsonwebtoken"; import Jwt from "jsonwebtoken";
import {ADMIN_API_TOKEN, ADMIN_API_URL, SECRET_KEY, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..." import {ADMIN_API_TOKEN, ADMIN_API_URL, SECRET_KEY, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import { uuid } from 'uuidv4'; import { v4 } from 'uuid';
import {HttpRequest, HttpResponse, TemplatedApp} from "uWebSockets.js"; import {HttpRequest, HttpResponse, TemplatedApp} from "uWebSockets.js";
import {BaseController} from "./BaseController"; import {BaseController} from "./BaseController";
import Axios from "axios"; import Axios from "axios";
@ -63,7 +63,7 @@ export class AuthenticateController extends BaseController {
mapUrlStart = data.mapUrlStart; mapUrlStart = data.mapUrlStart;
newUrl = this.getNewUrlOnAdminAuth(data) newUrl = this.getNewUrlOnAdminAuth(data)
} else { } else {
userUuid = uuid(); userUuid = v4();
mapUrlStart = host.replace('api.', 'maps.') + URL_ROOM_STARTED; mapUrlStart = host.replace('api.', 'maps.') + URL_ROOM_STARTED;
newUrl = null; newUrl = null;
} }

4
back/src/Controller/FileController.ts
View file

@ -1,6 +1,6 @@
import {App} from "../Server/sifrr.server"; import {App} from "../Server/sifrr.server";
import {uuid} from "uuidv4"; import {v4} from "uuid";
import {HttpRequest, HttpResponse} from "uWebSockets.js"; import {HttpRequest, HttpResponse} from "uWebSockets.js";
import {BaseController} from "./BaseController"; import {BaseController} from "./BaseController";
import { Readable } from 'stream' import { Readable } from 'stream'
@ -51,7 +51,7 @@ export class FileController extends BaseController {
}) })
try { try {
const audioMessageId = uuid(); const audioMessageId = v4();
const params = await res.formData({ const params = await res.formData({
onFile: (fieldname: string, onFile: (fieldname: string,

4
back/src/Controller/IoSocketController.ts
View file

@ -16,7 +16,7 @@ import {PointInterface} from "../Model/Websocket/PointInterface";
import {isWebRtcSignalMessageInterface} from "../Model/Websocket/WebRtcSignalMessage"; import {isWebRtcSignalMessageInterface} from "../Model/Websocket/WebRtcSignalMessage";
import {UserInGroupInterface} from "../Model/Websocket/UserInGroupInterface"; import {UserInGroupInterface} from "../Model/Websocket/UserInGroupInterface";
import {isItemEventMessageInterface} from "../Model/Websocket/ItemEventMessage"; import {isItemEventMessageInterface} from "../Model/Websocket/ItemEventMessage";
import {uuid} from 'uuidv4'; import { v4 as uuidv4 } from 'uuid';
import {GroupUpdateInterface} from "_Model/Websocket/GroupUpdateInterface"; import {GroupUpdateInterface} from "_Model/Websocket/GroupUpdateInterface";
import {Movable} from "../Model/Movable"; import {Movable} from "../Model/Movable";
import { import {
@ -135,7 +135,7 @@ export class IoSocketController {
if (ALLOW_ARTILLERY) { if (ALLOW_ARTILLERY) {
return { return {
token, token,
userUuid: uuid() userUuid: uuidv4()
} }
} else { } else {
throw new Error("In order to perform a load-testing test on this environment, you must set the ALLOW_ARTILLERY environment variable to 'true'"); throw new Error("In order to perform a load-testing test on this environment, you must set the ALLOW_ARTILLERY environment variable to 'true'");