_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:thecodingmachine/workadventure into develop

Browse Source
This commit is contained in:
David Négrier 2021-11-30 15:13:36 +01:00
commit 5e7e43732a
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/docker/docker-compose.prod.yaml
View File

@ -66,6 +66,7 @@ services:
API_URL: back:50051 API_URL: back:50051
JITSI_URL: $JITSI_URL JITSI_URL: $JITSI_URL
JITSI_ISS: $JITSI_ISS JITSI_ISS: $JITSI_ISS
FRONT_URL: https://play.${DOMAIN}
labels: labels:
- "traefik.http.routers.pusher.rule=Host(`pusher.${DOMAIN}`)" - "traefik.http.routers.pusher.rule=Host(`pusher.${DOMAIN}`)"
- "traefik.http.routers.pusher.entryPoints=web,traefik" - "traefik.http.routers.pusher.entryPoints=web,traefik"

2
docker-compose.single-domain.yaml
View File

@ -28,7 +28,7 @@ services:
NODE_ENV: development NODE_ENV: development
PUSHER_URL: /pusher PUSHER_URL: /pusher
UPLOADER_URL: /uploader UPLOADER_URL: /uploader
ADMIN_URL: /admin #ADMIN_URL: /admin
MAPS_URL: /maps MAPS_URL: /maps
ICON_URL: /icon ICON_URL: /icon
STARTUP_COMMAND_1: ./templater.sh STARTUP_COMMAND_1: ./templater.sh

2
docker-compose.yaml
View File

@ -34,7 +34,7 @@ services:
NODE_ENV: development NODE_ENV: development
PUSHER_URL: //pusher.workadventure.localhost PUSHER_URL: //pusher.workadventure.localhost
UPLOADER_URL: //uploader.workadventure.localhost UPLOADER_URL: //uploader.workadventure.localhost
ADMIN_URL: //workadventure.localhost #ADMIN_URL: //workadventure.localhost
ICON_URL: //icon.workadventure.localhost ICON_URL: //icon.workadventure.localhost
STARTUP_COMMAND_1: ./templater.sh STARTUP_COMMAND_1: ./templater.sh
STARTUP_COMMAND_2: yarn install STARTUP_COMMAND_2: yarn install

3
front/src/Connexion/ConnectionManager.ts
View File

@ -163,12 +163,13 @@ class ConnectionManager {
console.error(err); console.error(err);
} }
} else { } else {
const query = urlParams.toString();
roomPath = roomPath =
window.location.protocol + window.location.protocol +
"//" + "//" +
window.location.host + window.location.host +
window.location.pathname + window.location.pathname +
urlParams.toString() + //use urlParams because the token param must be deleted (query ? "?" + query : "") + //use urlParams because the token param must be deleted
window.location.hash; window.location.hash;
} }

2
front/webpack.config.ts
View File

@ -189,7 +189,7 @@ module.exports = {
DISABLE_NOTIFICATIONS: false, DISABLE_NOTIFICATIONS: false,
PUSHER_URL: undefined, PUSHER_URL: undefined,
UPLOADER_URL: null, UPLOADER_URL: null,
ADMIN_URL: undefined, ADMIN_URL: null,
CONTACT_URL: null, CONTACT_URL: null,
PROFILE_URL: null, PROFILE_URL: null,
ICON_URL: null, ICON_URL: null,

3
tests/tests/test.ts
View File

@ -4,8 +4,9 @@ const fs = require('fs')
import { Selector } from 'testcafe'; import { Selector } from 'testcafe';
import {userAlice} from "./utils/roles"; import {userAlice} from "./utils/roles";
// Note: we are also testing that we can connect if the URL contains a random query string
fixture `Variables` fixture `Variables`
.page `http://play.workadventure.localhost/_/global/maps.workadventure.localhost/tests/Variables/Cache/variables_tmp.json`; .page `http://play.workadventure.localhost/_/global/maps.workadventure.localhost/tests/Variables/Cache/variables_tmp.json?somerandomparam=1`;
test("Test that variables cache in the back don't prevent setting a variable in case the map changes", async (t: TestController) => { test("Test that variables cache in the back don't prevent setting a variable in case the map changes", async (t: TestController) => {
// Let's start by visiting a map that DOES not have the variable. // Let's start by visiting a map that DOES not have the variable.