Commit Graph

576 Commits

Author SHA1 Message Date
dependabot[bot]
f9e8e0bd60
Bump follow-redirects from 1.14.7 to 1.14.8 in /back
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-13 20:09:24 +00:00
_Bastler
ed687bf3bf Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-27 19:09:17 +01:00
David Négrier
12d6d9a50d Disabling completely routes if admin token not configured 2022-01-27 18:38:33 +01:00
_Bastler
f2da041b7c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-25 21:09:48 +01:00
dependabot[bot]
baf1453e14
Bump node-fetch from 2.6.6 to 2.6.7 in /back
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 16:54:52 +00:00
_Bastler
24aaa4582f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-17 08:21:06 +01:00
David Négrier
ccfe049e6c
Merge pull request #1723 from thecodingmachine/fix-group
Change group radius management
2022-01-14 13:53:15 +01:00
David Négrier
82c2d21423
Merge pull request #1654 from thecodingmachine/feature-camera-management
Feature camera management
2022-01-14 11:57:05 +01:00
Alexis Faizeau
cd566e43a7 Change group radius management 2022-01-14 11:53:33 +01:00
_Bastler
ed28cd0882 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-14 10:43:49 +01:00
dependabot[bot]
57b2b4e9fe
Bump follow-redirects from 1.14.6 to 1.14.7 in /back
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 09:27:10 +00:00
Hanusiak Piotr
a1c96b0524 merged develop 2022-01-13 10:44:06 +01:00
_Bastler
04a334c8e7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-12 10:56:50 +01:00
_Bastler
5cc573ac49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-07 09:59:00 +01:00
David Négrier
ab0f5e9837 Stopping sending literal errors
Errors now must be of "Error" type.
Rule added in eslint.
2022-01-06 10:52:06 +01:00
Gregoire Parant
08847e1a64 Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/RoomConnection.ts
2022-01-05 12:08:27 +01:00
Gregoire Parant
8b758a0053 Merge branch 'develop' into 2daysLimit
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-01-05 11:47:31 +01:00
_Bastler
9b62e5f4ba Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-03 19:10:22 +01:00
David Négrier
6bd9a998f9 Removing unused messages 2022-01-03 16:26:52 +01:00
_Bastler
146129b829 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-24 22:05:46 +01:00
David Négrier
a1cfaa0225 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-24 15:06:15 +01:00
David Négrier
a4a89735f6 Fixing missing builders 2021-12-24 15:04:01 +01:00
David Négrier
9a3bca0659 Updating Node version to latest minor in Pusher and Back for prod images 2021-12-24 14:59:40 +01:00
David Négrier
d6e8bd522f Fixing issue if group was deleted when out of bounds. 2021-12-24 14:07:29 +01:00
David Négrier
05bedf0c22 Adding an "out-of-bounds" notion for a group.
This allows hiding a group when some players are out of the radius but the group still exists because of the "follow" feature.
2021-12-24 13:21:44 +01:00
_Bastler
579d6991bd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-23 21:45:55 +01:00
David Négrier
368a115b4c Merge branch 'develop' of github.com:thecodingmachine/workadventure into feat/follow-woka 2021-12-23 16:04:59 +01:00
David Négrier
3e91a79078 Upgrading eslint 2021-12-23 15:33:19 +01:00
David Négrier
220c9433d1 Updating back component to Typescript 4.5 2021-12-23 14:26:49 +01:00
David Négrier
3daf7a402e Upgrading ts-node-dev to stable release 2021-12-23 14:15:14 +01:00
David Négrier
e34c49fd49 Fixing tests 2021-12-23 10:44:46 +01:00
David Négrier
35463930a0 Sending color outline on connect 2021-12-23 10:22:19 +01:00
David Négrier
482ba9690a Sharing outline color changes in real time 2021-12-22 18:34:36 +01:00
_Bastler
d03e1b3536 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-20 17:14:18 +01:00
PizZaKatZe
f2e37b8cff Clean up now unused function in group model 2021-12-20 16:49:41 +01:00
PizZaKatZe
329f721998
Update back/src/Model/Group.ts
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-12-20 16:46:16 +01:00
Alban Bruder
d185c0ee24 fix code styling 2021-12-20 15:14:49 +01:00
Alban Bruder
4ffcebb2e4 Use specified type in admin message 2021-12-20 13:53:54 +01:00
PizZaKatZe
5c385c520a Cleanup; pretty 2021-12-18 11:45:17 +01:00
David Négrier
c96b65549f Performing proper cleanup when a user leaves 2021-12-18 11:34:20 +01:00
David Négrier
cd805fab31 Refactoring following code to make a distinction beween followed and following users.
Also, moving sending messages to the User class.
2021-12-18 11:34:20 +01:00
David Négrier
fd9cb09de6 Checking if a user should leave a group when someone moves in the group every time.
This fixes a long standing issue.
2021-12-18 11:34:20 +01:00
David Négrier
44ff9e30d5 Using id instead of name to identify other Wokas 2021-12-18 11:34:20 +01:00
PizZaKatZe
ab994183e5 Fix not following users getting "stuck" in groups 2021-12-16 21:26:30 +01:00
PizZaKatZe
2bd71790b5 Use user IDs instead of names 2021-12-15 18:42:24 +01:00
PizZaKatZe
e528682403 Use User.group instead of iterating over groups
Thanks @moufmouf for pointing this out.
2021-12-15 18:42:24 +01:00
PizZaKatZe
7bff782f7f Improve follow abort message; avoid having to change it in backend 2021-12-15 18:42:24 +01:00
PizZaKatZe
c2f5501236 Do not leave group when following is active 2021-12-15 18:42:24 +01:00
PizZaKatZe
0a410d289d Implement follow request / confirmation UI 2021-12-15 18:42:22 +01:00
PizZaKatZe
d6ef60a3d8 Send request to group members only 2021-12-15 18:41:37 +01:00
PizZaKatZe
1fca99c0d1 Send follow me request to all players 2021-12-15 18:41:36 +01:00
_Bastler
97e64b2296 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-15 13:23:01 +01:00
David Négrier
0a705eadf9
Merge pull request #1616 from Waclaw-I/feature-camera-zone-focus
Focusable zones
2021-12-14 15:43:45 +01:00
_Bastler
301d756a3d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-13 19:10:50 +01:00
David Négrier
8a96ff8ee4
Merge pull request #1614 from ValdoTR/user-room-token
Added the user-room token created from admin when we access a room
2021-12-13 17:50:49 +01:00
Hanusiak Piotr
e97fd1d38c Merge branch 'develop' into feature-camera-zone-focus 2021-12-07 13:20:15 +01:00
_Bastler
13e854c4c4 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 08:38:21 +01:00
David Négrier
b9840cfa3d Fix CI 2021-12-06 18:34:09 +01:00
Hanusiak Piotr
3d3ca45921 ran prettier for back 2021-12-06 11:37:55 +01:00
Hanusiak Piotr
eb95e2e483 detecting zoe enter and leave events 2021-12-04 17:11:49 +01:00
David Négrier
6427d85c24 Fixing warning in lint 2021-12-03 18:29:36 +01:00
David Négrier
bf830a67cb Fixing debug controller in back 2021-12-03 09:23:31 +01:00
Valdo Romao
dd79f7d0f4 Added the user-room token created from admin when we access a room 2021-12-01 15:50:14 +00:00
_Bastler
96e9540e97 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 17:10:50 +01:00
_Bastler
a63c351eae Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 17:03:42 +01:00
David Négrier
94959e2e91 Merge branch 'develop' of github.com:thecodingmachine/workadventure into HotFixCleanTokenParamUrl
# Conflicts:
#	back/src/Services/Logger.ts
2021-11-24 17:03:29 +01:00
David Négrier
d1122d75ec Fixing CI 2021-11-24 16:59:22 +01:00
David Négrier
6e6cdc7bde
Revert "Improving log messages" 2021-11-24 16:20:07 +01:00
_Bastler
a99be4fbf5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 15:44:37 +01:00
David Négrier
a1107bd20e Merge branch 'develop' of github.com:thecodingmachine/workadventure into improve_logging 2021-11-24 15:36:35 +01:00
_Bastler
3b98888c3a merge latest dev 2021-11-24 13:00:27 +01:00
David Négrier
a82f4e1813 Adding end-to-end tests
The first test is testing a tricky cache scenario with the back when testing variables.
The end-to-end package used is testcafe.
2021-11-23 15:43:34 +01:00
David Négrier
d8ecae64f0 Moving lastLoad initialization before we start loading to avoid loading several times 2021-11-23 09:34:39 +01:00
David Négrier
82a1a5fc1e Retry loading map on variable error
If the back is getting an error (because the user has no right to set a variable),
instead of failing directly, let's try to reload the map (maybe we have cached a wrong version of the map).
2021-11-22 18:43:56 +01:00
Alexis Faizeau
6a195be814 Implement logger on back 2021-11-08 17:44:57 +01:00
Alexis Faizeau
c573e9fbaf Implement no floating promises on eslint rules 2021-11-08 14:45:25 +01:00
David Négrier
6c6a7e6fe4 Improving log messages
Signed-off-by: David Négrier <d.negrier@thecodingmachine.com>
2021-11-08 14:30:54 +01:00
_Bastler
f984897e80 secure DISABLE_ANONYMOUS 2021-10-21 16:23:42 +02:00
_Bastler
b74e122409 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-18 14:57:20 +02:00
David Négrier
b201165b81 Upgrading @workadventure/tiled-map-type-guard to 1.0.3
This will fix the issue with maps containing group layers.
2021-10-18 14:11:24 +02:00
_Bastler
15766e521e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-10 10:30:04 +02:00
Kharhamel
5255847452 FIX: if a conversion group move to another user, this user will be added to the group 2021-10-08 11:02:58 +02:00
_Bastler
5e6ffd9fa2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-23 18:47:36 +02:00
dependabot[bot]
16d45c921f
Bump axios from 0.21.1 to 0.21.2 in /back
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 12:34:04 +00:00
_Bastler
b47201687a better we.bslty & deveop integration 2021-09-16 18:24:03 +02:00
_Bastler
15404015f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-13 11:11:52 +02:00
David Négrier
05646718a9 Fix disconnects after 5 minutes in Chrome
This commit increases idle timeout for websocket connection

Issue: after 5 minutes of inactive tab (hidden tab) in Chrome, WorkAdventure was disconnected.

I believe Google was going in "intensive throttling" mode (see  https://developer.chrome.com/blog/timer-throttling-in-chrome-88/#intensive-throttling)
This means setTimeouts are run only once per minute.

And I believe the "keep alive" must be implemented with a "setTimeout" (one way or another even if I can't find a trace of this in the code). This would mean that the browser would send keep alive requests only once per minute.
But the pusher is configured to shut the connection after 30 seconds of idle activity.

Therefore, the pusher disconnects inactive Chrome tabs. By raising the Pusher idle timer to 2 minutes, we give a chance to Chrome to send a ping to the server in time (since Chrome won't send more than 1 ping per minute).
2021-09-10 18:30:36 +02:00
_Bastler
62e164de9e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-02 19:18:25 +02:00
David Négrier
68a4772627 Allowing variables nested in group layers
Up until this commit, variables nested in object layers inside group layers where not found by the front nor the back.
This PR changes analysis so that variables can be detected.
2021-09-02 18:05:55 +02:00
_Bastler
8715781bbd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 19:24:26 +02:00
dependabot[bot]
1b5042ef6a
Bump path-parse from 1.0.6 to 1.0.7 in /back
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-01 13:10:28 +00:00
_Bastler
29b790ec32 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-01 14:58:52 +02:00
Kharhamel
c0547637b5
Merge pull request #1404 from thecodingmachine/dependabot/npm_and_yarn/back/tar-4.4.19
Bump tar from 4.4.15 to 4.4.19 in /back
2021-09-01 14:33:57 +02:00
dependabot[bot]
df0546a2f3
Bump tar from 4.4.15 to 4.4.19 in /back
Bumps [tar](https://github.com/npm/node-tar) from 4.4.15 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.15...v4.4.19)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-01 12:28:03 +00:00
kharhamel
bc9131119f remove the package systeminformation from back 2021-09-01 14:21:26 +02:00
_Bastler
e7acfb3fbb Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-08-24 17:09:51 +02:00
David Négrier
428fbaae02
Merge pull request #1338 from thecodingmachine/dependabot/npm_and_yarn/back/tar-4.4.15
Bump tar from 4.4.13 to 4.4.15 in /back
2021-08-24 11:58:54 +02:00
_Bastler
94328771bf update production docker stuff 2021-08-20 12:30:33 +02:00
_Bastler
fc567e76f4 update dependencies, Iframe module loading 2021-08-17 20:33:20 +02:00
_Bastler
d6931f4ed9 revert map fetcher 2021-08-11 16:26:33 +02:00