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

fix localuser for OIDC

Browse Source
This commit is contained in:
_Bastler 2021-09-17 14:02:43 +02:00
parent f053ece7da
commit ea64e79e46
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,11 +288,14 @@ class ConnectionManager {
} }
const nonce = localUserStore.getNonce(); const nonce = localUserStore.getNonce();
const token = localUserStore.getAuthToken(); const token = localUserStore.getAuthToken();
const { authToken, username } = await Axios.get(`${PUSHER_URL}/login-callback`, { params: { code, nonce, token } }).then( const { authToken, username, userUuid } = await Axios.get(`${PUSHER_URL}/login-callback`, { params: { code, nonce, token } }).then(
(res) => res.data (res) => res.data
); );
localUserStore.setAuthToken(authToken);
this.localUser = new LocalUser(userUuid, []);
this.authToken = authToken; this.authToken = authToken;
localUserStore.saveUser(this.localUser);
localUserStore.setAuthToken(this.authToken);
gameManager.setPlayerName(username); gameManager.setPlayerName(username);

4
pusher/src/Controller/AuthenticateController.ts
View File

@ -68,7 +68,7 @@ export class AuthenticateController extends BaseController {
await openIDClient.checkTokenAuth(authTokenData.hydraAccessToken); await openIDClient.checkTokenAuth(authTokenData.hydraAccessToken);
res.writeStatus("200"); res.writeStatus("200");
this.addCorsHeaders(res); this.addCorsHeaders(res);
return res.end(JSON.stringify({ authToken: token, username: authTokenData.username })); return res.end(JSON.stringify({ authToken: token, username: authTokenData.username, userUuid : authTokenData.identifier }));
} catch (err) { } catch (err) {
console.info("User was not connected", err); console.info("User was not connected", err);
} }
@ -83,7 +83,7 @@ export class AuthenticateController extends BaseController {
const authToken = jwtTokenManager.createAuthToken(sub, userInfo.access_token, userInfo.username); const authToken = jwtTokenManager.createAuthToken(sub, userInfo.access_token, userInfo.username);
res.writeStatus("200"); res.writeStatus("200");
this.addCorsHeaders(res); this.addCorsHeaders(res);
return res.end(JSON.stringify({ authToken: authToken, username: userInfo.username })); return res.end(JSON.stringify({ authToken: authToken, username: userInfo.username, userUuid : sub }));
} catch (e) { } catch (e) {
return this.errorToResponse(e, res); return this.errorToResponse(e, res);
} }