_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,033 Commits 2 Branches 0 Tags 47 MiB
f6b8677c2e
Commit Graph

3033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grégoire parant
f6b8677c2e
Merge pull request #1565 from thecodingmachine/HotFixCreditPage 
Update design of credit page
 2021-11-16 15:33:35 +01:00
Gregoire Parant
e5979998c5 Update design of credit page 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 15:28:54 +01:00
grégoire parant
7d73ca321d
Merge pull request #1564 from thecodingmachine/HotFixAuthenticationManager 
Hot fix authentication manager
 2021-11-16 15:17:46 +01:00
Gregoire Parant
0614fa7b47 HotFix copy link to share it 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 15:03:54 +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
grégoire parant
6fafb727ba
Merge pull request #1563 from thecodingmachine/HotFixConnexionManager 
HotFix connexion manager
 2021-11-16 13:31:43 +01:00
Gregoire Parant
ba89d9b122 HotFix DISABLED_ROOM for env variable 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 13:18:40 +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
grégoire parant
832c4ab300
Merge pull request #1562 from thecodingmachine/HotFixNewJwtTokenDecrypted 
HotFix encrypted and decrypted error
 2021-11-16 11:26:35 +01:00
Gregoire Parant
ec1cc92c8b replace console log by error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 11:23:18 +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
grégoire parant
9bdda210f5
Merge pull request #1561 from thecodingmachine/develop 
Release v1.6.0
 2021-11-15 16:51:48 +01:00
Gregoire Parant
d3964ae25b HotFix conflict merging 2021-11-15 16:36:10 +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
David Négrier
578fa21591
Merge pull request #1543 from thecodingmachine/fixAdminSocket 
FIX: the admin sockets now uses a short live to check room authorization
 2021-11-15 16:21:20 +01:00
David Négrier
8b6c16fd30
Merge pull request #1553 from thecodingmachine/openidAdminConnect 
OpenId & Admin connect
 2021-11-15 16:20:00 +01:00
Gregoire Parant
210a789aa4 Fix feedback @moufmouf 2021-11-15 15:58:08 +01:00
grégoire parant
a4b8a8422f
Merge pull request #1559 from thecodingmachine/openIdDisabledAnonymousSelfHost 
Open id disabled anonymous self hosted
 2021-11-15 15:29:55 +01:00
Gregoire Parant
bbc2ac2550 Update Connection manager to clean url history of navigator 2021-11-15 15:25:49 +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
15cdc54ec3 Add evnvironment Enum for OPID_LOGIN_SCREEN_PROVIDER variable 2021-11-12 19:36:37 +01:00
Gregoire Parant
f905426ebd Add new variable login provider to connect user 2021-11-12 19:36:13 +01:00
Gregoire Parant
24a1f324c7 Add OpenId login url and provider to login user 2021-11-12 19:35:34 +01:00
Gregoire Parant
e073d70098 Merge branch 'develop' into openidAdminConnect 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 17:01:26 +01:00
Gregoire Parant
ca74f92051 Pull open id admin from @GRP 2021-11-12 16:59:34 +01:00
Gregoire Parant
c21ea8803a Add OPID redirect url 
Is important to defined redirect url to be connected with openid provider
 2021-11-12 16:52:44 +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
461dee776c Update css 2021-11-12 16:22:37 +01:00
Gregoire Parant
49f68451ae Update profile menu and change UX 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 15:31:49 +01:00
Gregoire Parant
d3f120f2bb Update to have token when user is connected 
- Update menu design

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 12:13:44 +01:00
Gregoire Parant
1db22d82af Set state in local storage when openid provider redirect on jwt with token value 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-10 18:26:50 +01:00
David Négrier
ee4ec7ba97
Merge pull request #1555 from thecodingmachine/iconserver 
Add iconserver in services
 2021-11-10 18:12:47 +01:00
David Négrier
0f6ecfc311
Merge pull request #1554 from thecodingmachine/twemojiImplementation 
Implement Twemoji on emote
 2021-11-10 18:11:51 +01:00
Alexis Faizeau
624593e425 Implement twemoji on emote 2021-11-10 16:55:20 +01:00
Alexis Faizeau
1c48feeb61 Add iconserver in services 2021-11-10 16:46:13 +01:00
Gregoire Parant
7406b62093 Add jwt token if is defined un URL 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-09 00:38:32 +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
David Négrier
603045bcad
Merge pull request #1549 from thecodingmachine/property-index 
Create GameMapProperties index
 2021-11-03 00:05:27 +01:00
Alexis Faizeau
5a3d510f05 Create GameMapProperties index 2021-11-02 10:52:25 +01:00
Alexis Faizeau
ec3120cf8f
Merge pull request #1546 from thecodingmachine/fix-room-api 
Fix change layer api functions
 2021-10-29 23:37:54 +02:00
Alexis Faizeau
dbd6ce5bdc Fix player movement tests 2021-10-29 23:30:02 +02:00
Alexis Faizeau
d4470568ec Fix change layer api functions 2021-10-29 23:16:36 +02:00
David Négrier
145117dc58
Merge pull request #1544 from thecodingmachine/property-layer-management 
Implement on enters/leaves layer events
 2021-10-29 19:46:42 +02:00
Alexis Faizeau
e1d454d834 Add enters/leaves layer with api test map 2021-10-29 19:45:03 +02:00