Gregoire Parant
c1222c1c57
Fix run pretty
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-29 13:45:31 +02:00
Gregoire Parant
dce1ece837
Merge branch 'develop' into changeRegisterAccess
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
# Conflicts:
# front/src/Connexion/ConnectionManager.ts
# front/vite.config.ts
2022-03-29 13:30:40 +02:00
Piotr 'pwh' Hanusiak
82dffff5a7
make use of proto well knows types
2022-03-28 17:08:12 +02:00
Piotr 'pwh' Hanusiak
b95d5f1d10
merged develop
2022-03-28 13:16:29 +02:00
Piotr 'pwh' Hanusiak
f656702bb9
merged develop
2022-03-24 14:56:42 +01:00
David Négrier
705c75e3c7
Adding wokalist type checking on front
...
Additionally, we are making superLoad.json accept a new "immediateCallback" parameter that resolves during the event handler (and not after)
2022-03-21 11:29:18 +01:00
Gregoire Parant
e618dc6c3d
Refactor connexion manager
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-20 14:33:25 +01:00
David Négrier
c529658ef4
Adding first version of SuperLoader
...
This class is the Phaser loader as it should be: it comes with promises,
can be easily run out of the "preload" phase and won't crash if the
scene is destroyed before textures are loaded.
2022-03-18 18:11:32 +01:00
Gregoire Parant
56fb73c682
Change roomId by playUri
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-17 10:53:56 +01:00
Gregoire Parant
5448596f01
Merge branch 'develop' into changeRegisterAccess
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
# Conflicts:
# pusher/src/Services/AdminApi.ts
2022-03-17 09:54:24 +01:00
David Négrier
53b184e82b
Adding support for custom logos
...
The admin can now set custom logos for the login scene and for the loading screen.
2022-03-15 18:16:56 +01:00
Lurkars
55db6a9b12
apply textures on openid login, fix pusher errors on woka list ( #1961 )
...
* 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>
2022-03-14 10:14:35 +01:00
David Négrier
6f4c3a89cd
Improving openapi doc
2022-03-14 09:57:56 +01:00
David Négrier
6540f15c5b
Refactoring Woka management ( #1810 )
...
* Wrap websockets with HyperExpress
* Add endpoints on pusher to resolve wokas
* getting textures urls from pusher
* Adding OpenAPI documentation for the pusher.
The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.
* revert FRONT_URL
* playerTextures metadata is being loaded via Phaser.Loader
* fetch textures every time character or customize scene is open
* Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)
* Sending character layer details to admin
* Cleaning commented code
* Fixing regex
* Fix woka endpoints on pusher
* Change error wording on pusher
* Working on integration of the woka-list with the new admin endpoint.
* Switching from "name" to "id" in texture object + using zod for woka/list validation
* Add position on default woka data
* Remove async on pusher option method
* Fix woka list url
* add options for /register
* Fxiing loading the Woka list
* Actually returning something in logout-callback
* Copying messages to back too
* remove customize button if no body parts are available (#1952 )
* remove customize button if no body parts are available
* remove unused position field from PlayerTexturesCollection interface
* removed unused label field
* fix LocalUser test
* little PlayerTextures class refactor
* Fixing linting
* Fixing missing Openapi packages in prod
* Fixing back build
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
* Add returns on pusher endpoints
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: Piotr Hanusiak <wacneg@gmail.com>
2022-03-11 17:02:58 +01:00
Alexis Faizeau
36646cbdbe
Add returns on pusher endpoints
2022-03-11 16:26:45 +01:00
Piotr Hanusiak
2a73400f7c
remove customize button if no body parts are available ( #1952 )
...
* remove customize button if no body parts are available
* remove unused position field from PlayerTexturesCollection interface
* removed unused label field
* fix LocalUser test
* little PlayerTextures class refactor
* Fixing linting
* Fixing missing Openapi packages in prod
* Fixing back build
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-03-11 14:30:00 +01:00
David Négrier
4ebb25e6ea
Merge branch 'develop' of github.com:thecodingmachine/workadventure into refactor_wokas
2022-03-11 11:55:30 +01:00
David Négrier
f97681cef5
Actually returning something in logout-callback
2022-03-11 10:44:40 +01:00
Hanusiak Piotr
5a8cba24fa
much cleaner approach to group lock update
2022-03-10 12:20:53 +01:00
Hanusiak Piotr
3760b9c4ad
add options for /register
2022-03-08 15:52:48 +01:00
Hanusiak Piotr
5706e5c416
remove console logs
2022-03-03 12:31:17 +01:00
Hanusiak Piotr
a0535ed4a8
Updating GroupDescriptors on LockGroupMessage
2022-03-03 12:22:16 +01:00
Hanusiak Piotr
a0205bf682
cleanup
2022-03-02 17:00:43 +01:00
Hanusiak Piotr
ef22d4ba20
listening to lockGroupMessage on front
2022-03-02 10:44:26 +01:00
Hanusiak Piotr
d43c8d181a
sending info about group lock state. wip
2022-03-01 11:36:45 +01:00
Lurkars
c8047bf4fa
change to scope variable in enviroment
2022-02-28 14:56:44 +01:00
Alexis Faizeau
4091606f75
Remove async on pusher option method
2022-02-28 12:09:15 +01:00
Lurkars
0a2bfc556f
Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile
2022-02-28 10:35:15 +01:00
David Négrier
08fffab410
Switching from "name" to "id" in texture object + using zod for woka/list validation
2022-02-25 17:05:34 +01:00
David Négrier
da469b64d2
Working on integration of the woka-list with the new admin endpoint.
2022-02-24 21:09:19 +01:00
Alexis Faizeau
0543232bc3
Change error wording on pusher
2022-02-24 14:54:36 +01:00
Alexis Faizeau
586e829e2e
Fix woka endpoints on pusher
2022-02-24 14:11:28 +01:00
David Négrier
c37046e138
Fixing regex
2022-02-24 12:15:23 +01:00
David Négrier
1b286002ff
Cleaning commented code
2022-02-24 12:10:49 +01:00
David Négrier
8e11c4445b
Sending character layer details to admin
2022-02-24 10:25:14 +01:00
David Négrier
378a95962a
Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)
2022-02-23 21:13:11 +01:00
Hanusiak Piotr
52e15eccfa
revert FRONT_URL
2022-02-23 19:53:54 +01:00
David Négrier
3b4f06d659
Adding OpenAPI documentation for the pusher.
...
The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.
2022-02-23 19:53:54 +01:00
Hanusiak Piotr
80761804a7
getting textures urls from pusher
2022-02-23 19:53:54 +01:00
Alexis Faizeau
2161a40e05
Add endpoints on pusher to resolve wokas
2022-02-23 19:53:54 +01:00
Alexis Faizeau
f993aa4f5a
Wrap websockets with HyperExpress
2022-02-23 19:53:53 +01:00
Gregoire Parant
658781e02e
Merge branch 'master' into develop
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
# Conflicts:
# front/public/resources/logos/meet.svg
2022-02-22 23:40:48 +01:00
Gregoire Parant
3a734cc2ae
Enable limitation freemium
...
- Fix warning message
- Fix post message API pusher
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-18 21:33:23 +01:00
Lurkars
2816946c94
add OIDC username + locale
2022-02-16 09:11:08 +01:00
David Négrier
4bcdbcb1bd
Fixing linting
2022-02-15 09:15:41 +01:00
Ludwig Behm
9073024b1d
pusher: add missing Content-Type header for json responses
2022-02-14 00:53:38 +01:00
Gregoire Parant
64ba7575a0
Add play uri param
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-08 18:47:11 +01:00
David Négrier
f5464fb1af
Fixing bad return in controller
2022-01-27 18:46:28 +01:00
David Négrier
12d6d9a50d
Disabling completely routes if admin token not configured
2022-01-27 18:38:33 +01:00
Alexis Faizeau
3f3f488924
Merge pull request #1718 from thecodingmachine/master
...
Hot fixes
2022-01-12 10:47:27 +01:00
Alban Bruder
4a78e449df
Fix circular serialization in pusher dump endpoint
2022-01-07 14:37:44 +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
Alexis Faizeau
68431c5242
Merge branch 'develop' into master
2021-12-30 13:18:13 +01:00
Alexis Faizeau
b148a46e3c
Remove unused policy type from ApiData typeguard
2021-12-30 12:51:52 +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
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
David Négrier
e660e25616
Fixing new MapDetails type guard
...
It was working improperly with messages from the admin
2021-12-21 11:37:54 +01:00
David Négrier
d792d35d09
Correctly cleaning room in pusher even if an exception occurs
...
Closes #1646 (again)
2021-12-20 15:33:47 +01:00
David Négrier
e0aab9c0ce
Properly delete rooms in Pusher in case of connection error and empty room
...
Closes #1646
2021-12-20 14:16:52 +01:00
David Négrier
36f5d42668
Fixing prettier setup on messages
2021-12-16 16:46:22 +01:00
David Négrier
8c93801746
Fixing wrong import
2021-12-16 16:18:23 +01:00
David Négrier
b2bcfde5b1
Merge branch 'develop' of github.com:thecodingmachine/workadventure into upgrade_typescript_4.5
2021-12-16 16:07:17 +01:00
David Négrier
0c281db411
More eslint fixes (+ ignoring no-unsafe-argument rule for now)
2021-12-16 15:57:37 +01:00
David Négrier
fa2e583d48
Reimporting correctly types moved to /messages
2021-12-16 10:04:41 +01:00
PizZaKatZe
0a410d289d
Implement follow request / confirmation UI
2021-12-15 18:42:22 +01:00
PizZaKatZe
1fca99c0d1
Send follow me request to all players
2021-12-15 18:41:36 +01:00
David Négrier
2fff6ae41e
Improving code security by adding stricter typings
2021-12-14 18:55:58 +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
Valdo Romao
d523eee5bd
Fixed pusher lint error
2021-12-13 16:22:59 +00:00
David Négrier
598c7412a2
When sending an invalid token, the HTTP API from the Pusher now returns a 401 instead of an HTTP 500.
2021-12-08 14:46:23 +01:00
David Négrier
1e6ce4dec8
Merge branch 'master' of github.com:thecodingmachine/workadventure into develop
2021-12-07 14:59:17 +01:00
David Négrier
c27662c315
Merge branch 'develop' of github.com:thecodingmachine/workadventure into e2e_reconnect_tests
2021-12-06 18:07:47 +01:00
David Négrier
d23a64d074
Fix sending empty variable message for users that have no right to read variable
...
When a user had no right to read a variable and the variable changed, the user was notified nonetheless with an empty SubMessage, causing an error message in the front:
> Uncaught Error: Unexpected batch message type onmessage RoomConnection.ts:181 RoomConnection.ts:181:30 onmessage RoomConnection.ts:181
This fix closes #1613
2021-12-03 16:07:42 +01:00
David Négrier
4cff230256
Creating only one WS connection to pusher from admin
...
Also: migration to Typescript 4.5 and µWebsockets 1.20.4
2021-12-01 20:14:53 +01:00
Valdo Romao
67fc6e8cd2
Fixed missing definition in FetchMemberDataByUuidResponse
2021-12-01 17:59:56 +00: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
David Négrier
fcf0888864
Adding a reconnect feature in case first Pusher request fails
...
Now, if the first pusher request fails, a waiting message will be displayed and the application will reconnect when the pusher comes back alive or the network connection is established again.
2021-12-01 14:14:02 +01:00
Gregoire Parant
060c844468
Fix htag in localstorage
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-24 19:24:43 +01:00
David Négrier
6e6cdc7bde
Revert "Improving log messages"
2021-11-24 16:20:07 +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
grégoire parant
26fa566d85
Change 'access-control-allow-origin' to FRONT_URL env variavle ( #1567 )
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-17 02:21:58 +01:00
grégoire parant
75ba9ddae8
HotFix Allow Origin header for CORS ( #1566 )
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 18:38:18 +01:00
Gregoire Parant
e54732be1b
HotFix authentication manager to get data from back
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 14:46:32 +01:00
Gregoire Parant
8768374460
HotFix connexion manager
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 13:14:40 +01:00
Gregoire Parant
c1dc438138
HotFix encrypted and decrypted error
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 11:14:27 +01:00
Gregoire Parant
20164417fb
Change data by resCheckTokenAuth
2021-11-15 16:34:23 +01:00
David Négrier
4e042389c5
Merge branch 'master' of github.com:thecodingmachine/workadventure into develop
...
# Conflicts:
# front/src/Connexion/ConnectionManager.ts
# pusher/src/Controller/AuthenticateController.ts
# pusher/src/Controller/IoSocketController.ts
# pusher/src/Services/JWTTokenManager.ts
2021-11-15 16:30:45 +01:00
Gregoire Parant
210a789aa4
Fix feedback @moufmouf
2021-11-15 15:58:08 +01:00
Gregoire Parant
61b8d584af
delete useless userIdentify
2021-11-15 14:34:23 +01:00
Gregoire Parant
16c08d86f2
Update hydraAccessToken to accessToken
2021-11-15 12:30:25 +01:00
Gregoire Parant
7d0b573d37
Define profile variable to show user connected
...
- OPID_PROFILE_SCREEN_PROVIDER is a variable to show profile of user connected. You can defined your own provider or use classic provider of WorkAdventure.
- OpenIdProfileController with url "/profile" get user data and create simple html to show user informations. This url will be called with params 'accessToken'
- If you define your custom profile url, it will be called with param 'accessToken'.
accessToken is token to access at user informations in your OpenId provider.
2021-11-12 20:48:26 +01:00
Gregoire Parant
ca74f92051
Pull open id admin from @GRP
2021-11-12 16:59:34 +01:00
Gregoire Parant
213af0cfa3
Changes ANONYMOUS dynamic variable
2021-11-12 16:47:39 +01:00
Gregoire Parant
fa233e13c6
Changes ANONYMOUS variable
...
This variable will be use to mandatory login user in self hosted
2021-11-12 16:43:37 +01:00
grégoire parant
c1788424b5
Merge pull request #1533 from Lurkars/oidcRequired
...
use OIDC without admin api, option to disable anonymous login
Thanks for your work @Lurkars . I will take your changes and apply some update. When I will finish, I will share you the result and requirement for mounting correct openid connection with puhser and without ADMIN part 💪 🚀
2021-11-12 16:39:15 +01:00
Gregoire Parant
89baafba2f
Rollback openid connect to use code and nonce
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-09 00:08:01 +01:00
Gregoire Parant
4c028bfcb3
OpenId from Admin connect
...
- Create admin environment for redirect uri of openID
- Add log out redirect when user click on log out button
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-08 19:27:01 +01:00
Alexis Faizeau
dd89f12c2e
Implement logger on pusher
2021-11-08 19:05:25 +01:00