Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-discussion

.github/workflows/build-and-deploy.yml

@@ -137,7 +137,7 @@ jobs:
           check_for_duplicate_msg: true
 
       - name: Run Cypress tests
-        uses: cypress-io/github-action@v1
+        uses: cypress-io/github-action@v2
         if: ${{ env.GITHUB_REF_SLUG != 'master' }}
         env:
           CYPRESS_BASE_URL: https://play.${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com
@@ -148,7 +148,7 @@ jobs:
           working-directory: e2e
 
       - name: Run Cypress tests in prod
-        uses: cypress-io/github-action@v1
+        uses: cypress-io/github-action@v2
         if: ${{ env.GITHUB_REF_SLUG == 'master' }}
         env:
           CYPRESS_BASE_URL: https://play.workadventu.re

back/src/Controller/IoSocketController.ts

@@ -22,7 +22,7 @@ import {adminApi, CharacterTexture, FetchMemberDataByUuidResponse} from "../Serv
 import {SocketManager, socketManager} from "../Services/SocketManager";
 import {emitInBatch, resetPing} from "../Services/IoSocketHelpers";
 import {clientEventsEmitter} from "../Services/ClientEventsEmitter";
-import {ADMIN_API_TOKEN} from "../Enum/EnvironmentVariable";
+import {ADMIN_API_TOKEN, ADMIN_API_URL} from "../Enum/EnvironmentVariable";
 
 export class IoSocketController {
     private nextUserId: number = 1;
@@ -166,18 +166,21 @@ export class IoSocketController {
                         if(room.isFull){
                             throw new Error('Room is full');
                         }
-                        try {
+                        if (ADMIN_API_URL) {
-                            const userData = await adminApi.fetchMemberDataByUuid(userUuid);
+                            try {
-                            //console.log('USERDATA', userData)
+                                const userData = await adminApi.fetchMemberDataByUuid(userUuid);
-                            memberTags = userData.tags;
+                                //console.log('USERDATA', userData)
-                            memberTextures = userData.textures;
+                                memberTags = userData.tags;
-                            if (!room.anonymous && room.policyType === GameRoomPolicyTypes.USE_TAGS_POLICY && !room.canAccess(memberTags)) {
+                                memberTextures = userData.textures;
-                                throw new Error('No correct tags')
+                                if (!room.anonymous && room.policyType === GameRoomPolicyTypes.USE_TAGS_POLICY && !room.canAccess(memberTags)) {
+                                    throw new Error('No correct tags')
+                                }
+                                //console.log('access granted for user '+userUuid+' and room '+roomId);
+                            } catch (e) {
+                                console.log('access not granted for user '+userUuid+' and room '+roomId);
+                                console.error(e);
+                                throw new Error('Client cannot acces this ressource.')
                             }
-                            //console.log('access granted for user '+userUuid+' and room '+roomId);
-                        } catch (e) {
-                            console.log('access not granted for user '+userUuid+' and room '+roomId);
-                            throw new Error('Client cannot acces this ressource.')
                         }
 
                         // Generate characterLayers objects from characterLayers string[]
@@ -238,22 +241,24 @@ export class IoSocketController {
                 socketManager.handleJoinRoom(client);
                 resetPing(client);
 
-                //get data information and shwo messages
+                //get data information and show messages
-                adminApi.fetchMemberDataByUuid(client.userUuid).then((res: FetchMemberDataByUuidResponse) => {
+                if (ADMIN_API_URL) {
-                    if (!res.messages) {
+                    adminApi.fetchMemberDataByUuid(client.userUuid).then((res: FetchMemberDataByUuidResponse) => {
-                        return;
+                        if (!res.messages) {
-                    }
+                            return;
-                    res.messages.forEach((c: unknown) => {
+                        }
-                        const messageToSend = c as { type: string, message: string };
+                        res.messages.forEach((c: unknown) => {
-                        socketManager.emitSendUserMessage({
+                            const messageToSend = c as { type: string, message: string };
-                            userUuid: client.userUuid,
+                            socketManager.emitSendUserMessage({
-                            type: messageToSend.type,
+                                userUuid: client.userUuid,
-                            message: messageToSend.message
+                                type: messageToSend.type,
-                        })
+                                message: messageToSend.message
+                            })
+                        });
+                    }).catch((err) => {
+                        console.error('fetchMemberDataByUuid => err', err);
                     });
-                }).catch((err) => {
+                }
-                    console.error('fetchMemberDataByUuid => err', err);
-                });
             },
             message: (ws, arrayBuffer, isBinary): void => {
                 const client = ws as ExSocketInterface;

back/src/Enum/EnvironmentVariable.ts

@@ -3,7 +3,7 @@ const URL_ROOM_STARTED = "/Floor0/floor0.json";
 const MINIMUM_DISTANCE = process.env.MINIMUM_DISTANCE ? Number(process.env.MINIMUM_DISTANCE) : 64;
 const GROUP_RADIUS = process.env.GROUP_RADIUS ? Number(process.env.GROUP_RADIUS) : 48;
 const ALLOW_ARTILLERY = process.env.ALLOW_ARTILLERY ? process.env.ALLOW_ARTILLERY == 'true' : false;
-const ADMIN_API_URL = process.env.ADMIN_API_URL || 'http://admin';
+const ADMIN_API_URL = process.env.ADMIN_API_URL || '';
 const ADMIN_API_TOKEN = process.env.ADMIN_API_TOKEN || 'myapitoken';
 const MAX_USERS_PER_ROOM = parseInt(process.env.MAX_USERS_PER_ROOM || '') || 600;
 const CPU_OVERHEAT_THRESHOLD = Number(process.env.CPU_OVERHEAT_THRESHOLD) || 80;

back/src/Services/JWTTokenManager.ts

@@ -1,4 +1,4 @@
-import {ALLOW_ARTILLERY, SECRET_KEY} from "../Enum/EnvironmentVariable";
+import {ADMIN_API_URL, ALLOW_ARTILLERY, SECRET_KEY} from "../Enum/EnvironmentVariable";
 import {uuid} from "uuidv4";
 import Jwt from "jsonwebtoken";
 import {TokenInterface} from "../Controller/AuthenticateController";
@@ -48,17 +48,21 @@ class JWTTokenManager {
                     return;
                 }
 
-                //verify user in admin
+                if (ADMIN_API_URL) {
-                adminApi.fetchCheckUserByToken(tokenInterface.userUuid).then(() => {
+                    //verify user in admin
-                    resolve(tokenInterface.userUuid);
+                    adminApi.fetchCheckUserByToken(tokenInterface.userUuid).then(() => {
-                }).catch((err) => {
-                    //anonymous user
-                    if(err.response && err.response.status && err.response.status === 404){
                         resolve(tokenInterface.userUuid);
-                        return;
+                    }).catch((err) => {
-                    }
+                        //anonymous user
-                    reject(new Error('Authentication error, invalid token structure. ' + err));
+                        if(err.response && err.response.status && err.response.status === 404){
-                });
+                            resolve(tokenInterface.userUuid);
+                            return;
+                        }
+                        reject(err);
+                    });
+                } else {
+                    resolve(tokenInterface.userUuid);
+                }
             });
         });
     }

deeployer.libsonnet

@@ -3,6 +3,7 @@
   local namespace = env.GITHUB_REF_SLUG,
   local tag = namespace,
   local url = if namespace == "master" then "workadventu.re" else namespace+".workadventure.test.thecodingmachine.com",
+  local adminUrl = if namespace == "master" || namespace == "develop" || std.startsWith(namespace, "admin") then "https://admin."+url else null,
   "$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json",
   "version": "1.0",
   "containers": {
@@ -16,11 +17,12 @@
        "env": {
          "SECRET_KEY": "tempSecretKeyNeedsToChange",
          "ADMIN_API_TOKEN": env.ADMIN_API_TOKEN,
-         "ADMIN_API_URL": "https://admin."+url,
          "JITSI_ISS": env.JITSI_ISS,
          "JITSI_URL": env.JITSI_URL,
          "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY,
-       }
+       } + if adminUrl != null then {
+         "ADMIN_API_URL": adminUrl,
+       } else {}
      },
     "front": {
       "image": "thecodingmachine/workadventure-front:"+tag,