Merge pull request #119 from waifuvault/fix-login

fix issue with invalid password-causing exception

src/engine/impl/HttpErrorRenderers/AuthenticationErrorRenderEngine.ts

@@ -1,21 +1,28 @@
-import { Injectable, ProviderScope } from "@tsed/di";
+import { Inject, Injectable, ProviderScope } from "@tsed/di";
 import { HTTP_RENDER_ENGINE } from "../../../model/di/tokens.js";
 import type { IHttpErrorRenderEngine } from "../../IHttpErrorRenderEngine.js";
 import { AuthenticationError } from "../../../model/exceptions/AuthenticationError.js";
 import { Exception } from "@tsed/exceptions";
 import { HttpErrorRenderObj } from "../../../utils/typeings.js";
 import { PlatformResponse } from "@tsed/common";
+import { CaptchaManager } from "../../../manager/CaptchaManager.js";
 
 @Injectable({
     scope: ProviderScope.SINGLETON,
     type: HTTP_RENDER_ENGINE,
 })
 export class AuthenticationErrorRenderEngine implements IHttpErrorRenderEngine<string, AuthenticationError> {
+    public constructor(@Inject() private captchaManager: CaptchaManager) {}
+
     public supportsError(exception: Exception): boolean {
         return exception instanceof AuthenticationError;
     }
 
     public render(obj: HttpErrorRenderObj<AuthenticationError>, response: PlatformResponse): Promise<string> {
-        return response.render("login.ejs", obj);
+        const captchaType = this.captchaManager.engine?.type ?? null;
+        return response.render("login.ejs", {
+            captchaType,
+            ...obj,
+        });
     }
 }

src/engine/impl/HttpErrorRenderers/ReCAPTCHALoginExceptionRenderEngine.ts

@@ -1,21 +1,28 @@
 import type { IHttpErrorRenderEngine } from "../../IHttpErrorRenderEngine.js";
 import { ReCAPTCHAException } from "../../../model/exceptions/ReCAPTCHAException.js";
-import { Injectable, InjectContext, ProviderScope } from "@tsed/di";
+import { Inject, Injectable, InjectContext, ProviderScope } from "@tsed/di";
 import { HTTP_RENDER_ENGINE } from "../../../model/di/tokens.js";
 import { HttpErrorRenderObj } from "../../../utils/typeings.js";
 import { type PlatformContext, PlatformResponse } from "@tsed/common";
 import { Exception } from "@tsed/exceptions";
+import { CaptchaManager } from "../../../manager/CaptchaManager.js";
 
 @Injectable({
     scope: ProviderScope.SINGLETON,
     type: HTTP_RENDER_ENGINE,
 })
 export class ReCAPTCHALoginExceptionRenderEngine implements IHttpErrorRenderEngine<string, ReCAPTCHAException> {
+    public constructor(@Inject() private captchaManager: CaptchaManager) {}
+
     @InjectContext()
     protected $ctx?: PlatformContext;
 
     public render(obj: HttpErrorRenderObj<ReCAPTCHAException>, response: PlatformResponse): Promise<string> {
-        return response.render("login.ejs", obj);
+        const captchaType = this.captchaManager.engine?.type ?? null;
+        return response.render("login.ejs", {
+            captchaType,
+            ...obj,
+        });
     }
 
     public supportsError(exception: Exception): boolean {