From f06abfae4c8edafee31304d3d9ef37823481cc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Thu, 1 Oct 2020 16:51:51 +0200
Subject: [PATCH] Migrating to uuid v4

---
 back/src/Controller/AuthenticateController.ts | 4 ++--
 back/src/Controller/FileController.ts         | 4 ++--
 back/src/Controller/IoSocketController.ts     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/back/src/Controller/AuthenticateController.ts b/back/src/Controller/AuthenticateController.ts
index aa27a468..84cfd97f 100644
--- a/back/src/Controller/AuthenticateController.ts
+++ b/back/src/Controller/AuthenticateController.ts
@@ -1,6 +1,6 @@
 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 { uuid } from 'uuidv4';
+import { v4 } from 'uuid';
 import {HttpRequest, HttpResponse, TemplatedApp} from "uWebSockets.js";
 import {BaseController} from "./BaseController";
 import Axios from "axios";
@@ -63,7 +63,7 @@ export class AuthenticateController extends BaseController {
                         mapUrlStart = data.mapUrlStart;
                         newUrl = this.getNewUrlOnAdminAuth(data)
                     } else {
-                        userUuid = uuid();
+                        userUuid = v4();
                         mapUrlStart = host.replace('api.', 'maps.') + URL_ROOM_STARTED;
                         newUrl = null;
                     }
diff --git a/back/src/Controller/FileController.ts b/back/src/Controller/FileController.ts
index 889cfa61..87b72b80 100644
--- a/back/src/Controller/FileController.ts
+++ b/back/src/Controller/FileController.ts
@@ -1,6 +1,6 @@
 import {App} from "../Server/sifrr.server";
 
-import {uuid} from "uuidv4";
+import {v4} from "uuid";
 import {HttpRequest, HttpResponse} from "uWebSockets.js";
 import {BaseController} from "./BaseController";
 import { Readable } from 'stream'
@@ -51,7 +51,7 @@ export class FileController extends BaseController {
                 })
 
                 try {
-                    const audioMessageId = uuid();
+                    const audioMessageId = v4();
 
                     const params = await res.formData({
                         onFile: (fieldname: string,
diff --git a/back/src/Controller/IoSocketController.ts b/back/src/Controller/IoSocketController.ts
index 9696748a..e9f97ea6 100644
--- a/back/src/Controller/IoSocketController.ts
+++ b/back/src/Controller/IoSocketController.ts
@@ -16,7 +16,7 @@ import {PointInterface} from "../Model/Websocket/PointInterface";
 import {isWebRtcSignalMessageInterface} from "../Model/Websocket/WebRtcSignalMessage";
 import {UserInGroupInterface} from "../Model/Websocket/UserInGroupInterface";
 import {isItemEventMessageInterface} from "../Model/Websocket/ItemEventMessage";
-import {uuid} from 'uuidv4';
+import { v4 as uuidv4 } from 'uuid';
 import {GroupUpdateInterface} from "_Model/Websocket/GroupUpdateInterface";
 import {Movable} from "../Model/Movable";
 import {
@@ -135,7 +135,7 @@ export class IoSocketController {
             if (ALLOW_ARTILLERY) {
                 return {
                     token,
-                    userUuid: uuid()
+                    userUuid: uuidv4()
                 }
             } 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'");