Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from develop

Browse source
This commit is contained in:
arp 2020-10-09 17:10:24 +02:00
commit f550c5a775
14 changed files with 93 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import {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 {adminApi, AdminApiData} from "../Services/AdminApi";
@ -50,11 +50,11 @@ export class AuthenticateController extends BaseController {
mapUrlStart = data.mapUrlStart;
newUrl = this.getNewUrlOnAdminAuth(data)
} else if (mapSlug !== null) {
userUuid = uuid();
userUuid = v4();
mapUrlStart = mapSlug;
newUrl = null;
} else {
userUuid = uuid();
userUuid = v4();
mapUrlStart = host.replace('api.', 'maps.') + URL_ROOM_STARTED;
newUrl = '_/global/'+mapUrlStart;
}

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

@ -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,