From fcd50a0a765e5c952d46dca81d50a783e2269df0 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 14 Jun 2025 13:35:22 +0200 Subject: [PATCH] Release 2.171.0-beta.1 --- CHANGELOG.md | 2 +- apps/api/src/app/auth/auth.controller.ts | 3 +++ .../middlewares/html-template.middleware.ts | 19 +++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 183a51664..c5a123a01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## 2.171.0-beta.1 - 2025-06-14 ### Added diff --git a/apps/api/src/app/auth/auth.controller.ts b/apps/api/src/app/auth/auth.controller.ts index a91525269..e623198f5 100644 --- a/apps/api/src/app/auth/auth.controller.ts +++ b/apps/api/src/app/auth/auth.controller.ts @@ -9,6 +9,7 @@ import { Controller, Get, HttpException, + Logger, Param, Post, Req, @@ -87,6 +88,8 @@ export class AuthController { // Handles the Google OAuth2 callback const jwt: string = (request.user as any).jwt; + Logger.debug(`JWT: ${!!jwt} in google/callback`, 'AuthController'); + if (jwt) { response.redirect( `${this.configurationService.get( diff --git a/apps/api/src/middlewares/html-template.middleware.ts b/apps/api/src/middlewares/html-template.middleware.ts index 5cf353e9a..b034ad40c 100644 --- a/apps/api/src/middlewares/html-template.middleware.ts +++ b/apps/api/src/middlewares/html-template.middleware.ts @@ -83,6 +83,8 @@ export class HtmlTemplateMiddleware implements NestMiddleware { private indexHtmlMap: { [languageCode: string]: string } = {}; public constructor(private readonly i18nService: I18nService) { + Logger.debug('Initialize HtmlTemplateMiddleware', 'HtmlTemplateMiddleware'); + try { this.indexHtmlMap = SUPPORTED_LANGUAGE_CODES.reduce( (map, languageCode) => ({ @@ -104,6 +106,8 @@ export class HtmlTemplateMiddleware implements NestMiddleware { } public use(request: Request, response: Response, next: NextFunction) { + Logger.debug('use', 'HtmlTemplateMiddleware'); + const path = request.originalUrl.replace(/\/$/, ''); let languageCode = path.substr(1, 2); @@ -120,6 +124,17 @@ export class HtmlTemplateMiddleware implements NestMiddleware { this.isFileRequest(path) || !environment.production ) { + Logger.debug(`Path: ${path}`, 'HtmlTemplateMiddleware'); + Logger.debug( + `Starts with api: ${path.startsWith('/api/')}`, + 'HtmlTemplateMiddleware' + ); + Logger.debug( + `File request: ${this.isFileRequest(path)}`, + 'HtmlTemplateMiddleware' + ); + Logger.debug('Skip', 'HtmlTemplateMiddleware'); + // Skip next(); } else { @@ -146,11 +161,15 @@ export class HtmlTemplateMiddleware implements NestMiddleware { })}` }); + Logger.debug('Send index HTML', 'HtmlTemplateMiddleware'); + return response.send(indexHtml); } } private isFileRequest(filename: string) { + Logger.debug(`isFileRequest: ${filename}`, 'HtmlTemplateMiddleware'); + if (filename === '/assets/LICENSE') { return true; } else if ( diff --git a/package-lock.json b/package-lock.json index 05bc353d0..2a99e8432 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ghostfolio", - "version": "2.170.0", + "version": "2.171.0-beta.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ghostfolio", - "version": "2.170.0", + "version": "2.171.0-beta.1", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { diff --git a/package.json b/package.json index c79e8d004..7e1b82e7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghostfolio", - "version": "2.170.0", + "version": "2.171.0-beta.1", "homepage": "https://ghostfol.io", "license": "AGPL-3.0", "repository": "https://github.com/ghostfolio/ghostfolio",