diff --git a/src/auth/AuthGuard.ts b/src/auth/AuthGuard.ts index c165079..e13b8eb 100644 --- a/src/auth/AuthGuard.ts +++ b/src/auth/AuthGuard.ts @@ -63,7 +63,7 @@ export default class AuthGuard { } public async getProofsForSession(session: Session & Partial): Promise[]> { - if (!session.is_authenticated) return []; + if (!session.isAuthenticated) return []; const proofs = []; for (const method of this.authMethods) { @@ -80,7 +80,7 @@ export default class AuthGuard { } if (proofs.length === 0) { - session.is_authenticated = false; + session.isAuthenticated = false; session.persistent = false; } @@ -152,7 +152,7 @@ export default class AuthGuard { } // Login - session.is_authenticated = true; + session.isAuthenticated = true; session.persistent = persistSession; if (onLogin) await onLogin(user); diff --git a/src/auth/password/PasswordAuthProof.ts b/src/auth/password/PasswordAuthProof.ts index 21d9981..dca436f 100644 --- a/src/auth/password/PasswordAuthProof.ts +++ b/src/auth/password/PasswordAuthProof.ts @@ -6,7 +6,7 @@ import {Session, SessionData} from "express-session"; export default class PasswordAuthProof implements AuthProof { public static getProofForSession(session: Session & Partial): PasswordAuthProof | null { - return session.auth_password_proof ? new PasswordAuthProof(session) : null; + return session.authPasswordProof ? new PasswordAuthProof(session) : null; } public static createAuthorizedProofForRegistration(session: Session): PasswordAuthProof { @@ -29,9 +29,9 @@ export default class PasswordAuthProof implements AuthProof { private constructor(session: Session & Partial) { this.session = session; - this.authorized = session.auth_password_proof?.authorized || false; - this.forRegistration = session.auth_password_proof?.forRegistration || false; - this.userId = session.auth_password_proof?.userId || null; + this.authorized = session.authPasswordProof?.authorized || false; + this.forRegistration = session.authPasswordProof?.forRegistration || false; + this.userId = session.authPasswordProof?.userId || null; } public async getResource(): Promise { @@ -54,7 +54,7 @@ export default class PasswordAuthProof implements AuthProof { } public async revoke(): Promise { - this.session.auth_password_proof = undefined; + this.session.authPasswordProof = undefined; } private async getUserPassword(): Promise { @@ -74,7 +74,7 @@ export default class PasswordAuthProof implements AuthProof { } private save() { - this.session.auth_password_proof = { + this.session.authPasswordProof = { authorized: this.authorized, forRegistration: this.forRegistration, userId: this.userId, diff --git a/src/types/Express.d.ts b/src/types/Express.d.ts index 5b14407..2d61e3c 100644 --- a/src/types/Express.d.ts +++ b/src/types/Express.d.ts @@ -45,9 +45,9 @@ declare module 'express-session' { persistent?: boolean; - is_authenticated?: boolean; + isAuthenticated?: boolean; - auth_password_proof?: PasswordAuthProofSessionData; + authPasswordProof?: PasswordAuthProofSessionData; csrf?: string; }