From 55db6a9b126f7053343e3bb34fcb064c4ff7c53d Mon Sep 17 00:00:00 2001
From: Lurkars <git@8lh.de>
Date: Mon, 14 Mar 2022 10:14:35 +0100
Subject: [PATCH] apply textures on openid login, fix pusher errors on woka
 list (#1961)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* apply textures on openid login, fix pusher errors on woka list

* remove logging

* Returning a HTTP 400 id roomUrl parameter not set

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
---
 front/src/Connexion/ConnectionManager.ts      | 21 ++++++++++++++++---
 front/src/Phaser/Login/CustomizeScene.ts      |  2 +-
 .../src/Phaser/Login/SelectCharacterScene.ts  |  2 +-
 pusher/src/Controller/WokaListController.ts   | 18 +++++++---------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 004f9039..7578a942 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -330,9 +330,12 @@ class ConnectionManager {
                 throw new Error("No Auth code provided");
             }
         }
-        const { authToken, userUuid, email, username, locale } = await Axios.get(`${PUSHER_URL}/login-callback`, {
-            params: { code, nonce, token, playUri: this.currentRoom?.key },
-        }).then((res) => {
+        const { authToken, userUuid, email, username, locale, textures } = await Axios.get(
+            `${PUSHER_URL}/login-callback`,
+            {
+                params: { code, nonce, token, playUri: this.currentRoom?.key },
+            }
+        ).then((res) => {
             return res.data;
         });
         localUserStore.setAuthToken(authToken);
@@ -361,6 +364,18 @@ class ConnectionManager {
             }
         }
 
+        if (textures) {
+            const layers: string[] = [];
+            for (const texture of textures) {
+                if (texture !== undefined) {
+                    layers.push(texture.id);
+                }
+            }
+            if (layers.length > 0) {
+                gameManager.setCharacterLayers(layers);
+            }
+        }
+
         //user connected, set connected store for menu at true
         userIsConnected.set(true);
     }
diff --git a/front/src/Phaser/Login/CustomizeScene.ts b/front/src/Phaser/Login/CustomizeScene.ts
index 918cf9cf..30fbd77d 100644
--- a/front/src/Phaser/Login/CustomizeScene.ts
+++ b/front/src/Phaser/Login/CustomizeScene.ts
@@ -46,7 +46,7 @@ export class CustomizeScene extends AbstractCharacterScene {
         // FIXME: window.location.href is wrong. We need the URL of the main room (so we need to apply any redirect before!)
         this.load.json(
             wokaMetadataKey,
-            `${PUSHER_URL}/woka/list/` + encodeURIComponent(window.location.href),
+            `${PUSHER_URL}/woka/list?roomUrl=` + encodeURIComponent(window.location.href),
             undefined,
             {
                 responseType: "text",
diff --git a/front/src/Phaser/Login/SelectCharacterScene.ts b/front/src/Phaser/Login/SelectCharacterScene.ts
index f7fd3c8a..064739f5 100644
--- a/front/src/Phaser/Login/SelectCharacterScene.ts
+++ b/front/src/Phaser/Login/SelectCharacterScene.ts
@@ -50,7 +50,7 @@ export class SelectCharacterScene extends AbstractCharacterScene {
         // FIXME: window.location.href is wrong. We need the URL of the main room (so we need to apply any redirect before!)
         this.load.json(
             wokaMetadataKey,
-            `${PUSHER_URL}/woka/list/` + encodeURIComponent(window.location.href),
+            `${PUSHER_URL}/woka/list?roomUrl=` + encodeURIComponent(window.location.href),
             undefined,
             {
                 responseType: "text",
diff --git a/pusher/src/Controller/WokaListController.ts b/pusher/src/Controller/WokaListController.ts
index 56300e90..42d3a4c5 100644
--- a/pusher/src/Controller/WokaListController.ts
+++ b/pusher/src/Controller/WokaListController.ts
@@ -1,17 +1,17 @@
 import { BaseHttpController } from "./BaseHttpController";
+import { parse } from "query-string";
 import { wokaService } from "../Services/WokaService";
-import * as tg from "generic-type-guard";
 import { jwtTokenManager } from "../Services/JWTTokenManager";
 
 export class WokaListController extends BaseHttpController {
     routes() {
-        this.app.options("/woka/list/:roomUrl", {}, (req, res) => {
+        this.app.options("/woka/list", {}, (req, res) => {
             res.status(200).send("");
             return;
         });
 
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        this.app.get("/woka/list/:roomUrl", {}, async (req, res) => {
+        this.app.get("/woka/list", {}, async (req, res) => {
             const token = req.header("Authorization");
 
             if (!token) {
@@ -29,17 +29,13 @@ export class WokaListController extends BaseHttpController {
                 return;
             }
 
-            const isParameters = new tg.IsInterface()
-                .withProperties({
-                    roomUrl: tg.isString,
-                })
-                .get();
+            let { roomUrl } = parse(req.path_query);
 
-            if (!isParameters(req.path_parameters)) {
-                return res.status(400).send("Unknown parameters");
+            if (typeof roomUrl !== "string") {
+                return res.status(400).send("missing roomUrl URL parameter");
             }
 
-            const roomUrl = decodeURIComponent(req.path_parameters.roomUrl);
+            roomUrl = decodeURIComponent(roomUrl);
             const wokaList = await wokaService.getWokaList(roomUrl, req.params["uuid"]);
 
             if (!wokaList) {