Compare commits

..

No commits in common. "7b4e89555ea138acc9908b218491c5b913f1a168" and "154c7637195f6f13fcb2f2e1b92fa0d6f2d05b34" have entirely different histories.

2 changed files with 8 additions and 4 deletions

View File

@ -19,6 +19,7 @@ const authchecker = async (action: Action, permissions: string[] | string) => {
} else { } else {
required_permissions = permissions required_permissions = permissions
} }
console.log(required_permissions);
let jwtPayload = undefined let jwtPayload = undefined
try { try {
@ -26,6 +27,7 @@ const authchecker = async (action: Action, permissions: string[] | string) => {
jwtPayload = <any>jwt.verify(provided_token, config.jwt_secret); jwtPayload = <any>jwt.verify(provided_token, config.jwt_secret);
jwtPayload = jwtPayload["userdetails"]; jwtPayload = jwtPayload["userdetails"];
} catch (error) { } catch (error) {
console.log(action.request.headers["authorization"]);
jwtPayload = await refresh(action); jwtPayload = await refresh(action);
} }
@ -39,6 +41,7 @@ const authchecker = async (action: Action, permissions: string[] | string) => {
for (let required_permission of required_permissions) { for (let required_permission of required_permissions) {
if (!(jwtPayload["permissions"].includes(required_permission))) { return false; } if (!(jwtPayload["permissions"].includes(required_permission))) { return false; }
} }
console.log("success");
return true; return true;
} }
@ -52,6 +55,9 @@ const refresh = async (action: Action) => {
refresh_token = cookie.parse(action.request.headers["cookie"])["lfk_backend__refresh_token"]; refresh_token = cookie.parse(action.request.headers["cookie"])["lfk_backend__refresh_token"];
} }
catch { catch {
console.log(action.request.headers["cookie"])
console.log("cookie fail here")
console.log(cookie.parse(action.request.headers["cookie"]))
throw new IllegalJWTError(); throw new IllegalJWTError();
} }
@ -59,6 +65,8 @@ const refresh = async (action: Action) => {
try { try {
jwtPayload = <any>jwt.verify(refresh_token, config.jwt_secret); jwtPayload = <any>jwt.verify(refresh_token, config.jwt_secret);
} catch (error) { } catch (error) {
console.log(refresh_token);
console.log("jwt fail")
throw new IllegalJWTError(); throw new IllegalJWTError();
} }

View File

@ -25,7 +25,6 @@ export class HandleLogout {
*/ */
public async logout(): Promise<Logout> { public async logout(): Promise<Logout> {
let logout: Logout = new Logout(); let logout: Logout = new Logout();
console.log(this.token)
if (!this.token || this.token === undefined) { if (!this.token || this.token === undefined) {
throw new JwtNotProvidedError() throw new JwtNotProvidedError()
} }
@ -33,17 +32,14 @@ export class HandleLogout {
try { try {
decoded = jsonwebtoken.verify(this.token, config.jwt_secret) decoded = jsonwebtoken.verify(this.token, config.jwt_secret)
} catch (error) { } catch (error) {
console.log("decoding error")
throw new IllegalJWTError() throw new IllegalJWTError()
} }
logout.timestamp = Math.floor(Date.now() / 1000) logout.timestamp = Math.floor(Date.now() / 1000)
let found_user: User = await getConnectionManager().get().getRepository(User).findOne({ id: decoded["id"] }); let found_user: User = await getConnectionManager().get().getRepository(User).findOne({ id: decoded["id"] });
if (!found_user) { if (!found_user) {
console.log("user error")
throw new UserNotFoundError() throw new UserNotFoundError()
} }
if (found_user.refreshTokenCount !== decoded["refreshTokenCount"]) { if (found_user.refreshTokenCount !== decoded["refreshTokenCount"]) {
console.log("invalid rtc")
throw new RefreshTokenCountInvalidError() throw new RefreshTokenCountInvalidError()
} }
found_user.refreshTokenCount++; found_user.refreshTokenCount++;