lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Update hydraAccessToken to accessToken

Browse source
This commit is contained in:
Gregoire Parant 2021-11-15 12:30:25 +01:00
parent 7d0b573d37
commit 16c08d86f2
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pusher/src/Controller/AuthenticateController.ts
View file

@ -62,10 +62,11 @@ export class AuthenticateController extends BaseController {
if (token != undefined) { if (token != undefined) {
try { try {
const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false); const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
if (authTokenData.hydraAccessToken == undefined) { if (authTokenData.accessToken == undefined) {
throw Error("Token cannot to be check on Hydra"); throw Error("Token cannot to be check on Hydra");
} }
await openIDClient.checkTokenAuth(authTokenData.hydraAccessToken); const resCheckTokenAuth = await openIDClient.checkTokenAuth(authTokenData.accessToken);
console.log("resCheckTokenAuth", resCheckTokenAuth);
res.writeStatus("200"); res.writeStatus("200");
this.addCorsHeaders(res); this.addCorsHeaders(res);
return res.end(JSON.stringify({ authToken: token })); return res.end(JSON.stringify({ authToken: token }));
@ -100,10 +101,10 @@ export class AuthenticateController extends BaseController {
try { try {
const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false); const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
if (authTokenData.hydraAccessToken == undefined) { if (authTokenData.accessToken == undefined) {
throw Error("Token cannot to be logout on Hydra"); throw Error("Token cannot to be logout on Hydra");
} }
await openIDClient.logoutUser(authTokenData.hydraAccessToken); await openIDClient.logoutUser(authTokenData.accessToken);
} catch (error) { } catch (error) {
console.error("openIDCallback => logout-callback", error); console.error("openIDCallback => logout-callback", error);
} finally { } finally {
@ -208,14 +209,14 @@ export class AuthenticateController extends BaseController {
if (token != undefined) { if (token != undefined) {
try { try {
const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false); const authTokenData: AuthTokenData = jwtTokenManager.verifyJWTToken(token as string, false);
if (authTokenData.hydraAccessToken == undefined) { if (authTokenData.accessToken == undefined) {
throw Error("Token cannot to be check on Hydra"); throw Error("Token cannot to be check on Hydra");
} }
await openIDClient.checkTokenAuth(authTokenData.hydraAccessToken); await openIDClient.checkTokenAuth(authTokenData.accessToken);
//get login profile //get login profile
res.writeStatus("302"); res.writeStatus("302");
res.writeHeader("Location", adminApi.getProfileUrl(authTokenData.hydraAccessToken)); res.writeHeader("Location", adminApi.getProfileUrl(authTokenData.accessToken));
this.addCorsHeaders(res); this.addCorsHeaders(res);
// eslint-disable-next-line no-unsafe-finally // eslint-disable-next-line no-unsafe-finally
return res.end(); return res.end();

6
pusher/src/Services/JWTTokenManager.ts
View file

@ -6,13 +6,13 @@ import { adminApi, AdminBannedData } from "../Services/AdminApi";
export interface AuthTokenData { export interface AuthTokenData {
identifier: string; //will be a email if logged in or an uuid if anonymous identifier: string; //will be a email if logged in or an uuid if anonymous
hydraAccessToken?: string; accessToken?: string;
} }
export const tokenInvalidException = "tokenInvalid"; export const tokenInvalidException = "tokenInvalid";
class JWTTokenManager { class JWTTokenManager {
public createAuthToken(identifier: string, hydraAccessToken?: string) { public createAuthToken(identifier: string, accessToken?: string) {
return Jwt.sign({ identifier, hydraAccessToken }, SECRET_KEY, { expiresIn: "30d" }); return Jwt.sign({ identifier, accessToken }, SECRET_KEY, { expiresIn: "30d" });
} }
public verifyJWTToken(token: string, ignoreExpiration: boolean = false): AuthTokenData { public verifyJWTToken(token: string, ignoreExpiration: boolean = false): AuthTokenData {