From a9c32248561322a22df8630f8598c4e16ff4f1f0 Mon Sep 17 00:00:00 2001 From: Ronnie Alsop <133896587+aRonnieAlsop@users.noreply.github.com> Date: Sat, 22 Mar 2025 01:36:45 -0700 Subject: [PATCH 01/16] Feature/add endpoint to localize site.webmanifest (#4450) * Add endpoint to localize site.webmanifest * Refactor rootUrl * Update changelog --------- Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> --- CHANGELOG.md | 1 + apps/api/src/app/app.module.ts | 2 + .../app/endpoints/assets/assets.controller.ts | 46 +++++++++++++++++++ .../src/app/endpoints/assets/assets.module.ts | 11 +++++ .../api/src/app/sitemap/sitemap.controller.ts | 8 ++-- .../src/assets/site.webmanifest | 4 +- apps/api/src/environments/environment.prod.ts | 3 ++ apps/api/src/environments/environment.ts | 3 ++ apps/api/src/main.ts | 10 ++-- .../middlewares/html-template.middleware.ts | 3 +- .../configuration/configuration.service.ts | 14 ++++-- apps/client/ngsw-config.json | 8 +--- apps/client/project.json | 3 -- apps/client/src/index.html | 5 +- libs/common/src/lib/config.ts | 3 +- 15 files changed, 96 insertions(+), 28 deletions(-) create mode 100644 apps/api/src/app/endpoints/assets/assets.controller.ts create mode 100644 apps/api/src/app/endpoints/assets/assets.module.ts rename apps/{client => api}/src/assets/site.webmanifest (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f83111..83e0bec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added support for filtering in the _Copy AI prompt to clipboard_ actions on the analysis page (experimental) +- Added an endpoint to localize the `site.webmanifest` - Added the _Storybook_ path to the `sitemap.xml` file ### Changed diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts index 2a515bf4..99080e1e 100644 --- a/apps/api/src/app/app.module.ts +++ b/apps/api/src/app/app.module.ts @@ -32,6 +32,7 @@ import { AuthModule } from './auth/auth.module'; import { CacheModule } from './cache/cache.module'; import { AiModule } from './endpoints/ai/ai.module'; import { ApiKeysModule } from './endpoints/api-keys/api-keys.module'; +import { AssetsModule } from './endpoints/assets/assets.module'; import { BenchmarksModule } from './endpoints/benchmarks/benchmarks.module'; import { GhostfolioModule } from './endpoints/data-providers/ghostfolio/ghostfolio.module'; import { MarketDataModule } from './endpoints/market-data/market-data.module'; @@ -61,6 +62,7 @@ import { UserModule } from './user/user.module'; AiModule, ApiKeysModule, AssetModule, + AssetsModule, AuthDeviceModule, AuthModule, BenchmarksModule, diff --git a/apps/api/src/app/endpoints/assets/assets.controller.ts b/apps/api/src/app/endpoints/assets/assets.controller.ts new file mode 100644 index 00000000..1735cc59 --- /dev/null +++ b/apps/api/src/app/endpoints/assets/assets.controller.ts @@ -0,0 +1,46 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { interpolate } from '@ghostfolio/common/helper'; + +import { + Controller, + Get, + Param, + Res, + Version, + VERSION_NEUTRAL +} from '@nestjs/common'; +import { Response } from 'express'; +import { readFileSync } from 'fs'; +import { join } from 'path'; + +@Controller('assets') +export class AssetsController { + private webManifest = ''; + + public constructor( + public readonly configurationService: ConfigurationService + ) { + try { + this.webManifest = readFileSync( + join(__dirname, 'assets', 'site.webmanifest'), + 'utf8' + ); + } catch {} + } + + @Get('/:languageCode/site.webmanifest') + @Version(VERSION_NEUTRAL) + public getWebManifest( + @Param('languageCode') languageCode: string, + @Res() response: Response + ): void { + const rootUrl = this.configurationService.get('ROOT_URL'); + const webManifest = interpolate(this.webManifest, { + languageCode, + rootUrl + }); + + response.setHeader('Content-Type', 'application/json'); + response.send(webManifest); + } +} diff --git a/apps/api/src/app/endpoints/assets/assets.module.ts b/apps/api/src/app/endpoints/assets/assets.module.ts new file mode 100644 index 00000000..51d330e5 --- /dev/null +++ b/apps/api/src/app/endpoints/assets/assets.module.ts @@ -0,0 +1,11 @@ +import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; + +import { Module } from '@nestjs/common'; + +import { AssetsController } from './assets.controller'; + +@Module({ + controllers: [AssetsController], + providers: [ConfigurationService] +}) +export class AssetsModule {} diff --git a/apps/api/src/app/sitemap/sitemap.controller.ts b/apps/api/src/app/sitemap/sitemap.controller.ts index ea21906e..aad5e39a 100644 --- a/apps/api/src/app/sitemap/sitemap.controller.ts +++ b/apps/api/src/app/sitemap/sitemap.controller.ts @@ -9,8 +9,8 @@ import { personalFinanceTools } from '@ghostfolio/common/personal-finance-tools' import { Controller, Get, Res, VERSION_NEUTRAL, Version } from '@nestjs/common'; import { format } from 'date-fns'; import { Response } from 'express'; -import * as fs from 'fs'; -import * as path from 'path'; +import { readFileSync } from 'fs'; +import { join } from 'path'; @Controller('sitemap.xml') export class SitemapController { @@ -20,8 +20,8 @@ export class SitemapController { private readonly configurationService: ConfigurationService ) { try { - this.sitemapXml = fs.readFileSync( - path.join(__dirname, 'assets', 'sitemap.xml'), + this.sitemapXml = readFileSync( + join(__dirname, 'assets', 'sitemap.xml'), 'utf8' ); } catch {} diff --git a/apps/client/src/assets/site.webmanifest b/apps/api/src/assets/site.webmanifest similarity index 92% rename from apps/client/src/assets/site.webmanifest rename to apps/api/src/assets/site.webmanifest index 8f1eceef..a2871962 100644 --- a/apps/client/src/assets/site.webmanifest +++ b/apps/api/src/assets/site.webmanifest @@ -25,7 +25,7 @@ "name": "Ghostfolio", "orientation": "portrait", "short_name": "Ghostfolio", - "start_url": "/en/", + "start_url": "/${languageCode}/", "theme_color": "#FFFFFF", - "url": "https://ghostfol.io" + "url": "${rootUrl}" } diff --git a/apps/api/src/environments/environment.prod.ts b/apps/api/src/environments/environment.prod.ts index 81b32496..6d4cbb4b 100644 --- a/apps/api/src/environments/environment.prod.ts +++ b/apps/api/src/environments/environment.prod.ts @@ -1,4 +1,7 @@ +import { DEFAULT_HOST, DEFAULT_PORT } from '@ghostfolio/common/config'; + export const environment = { production: true, + rootUrl: `http://${DEFAULT_HOST}:${DEFAULT_PORT}`, version: `${require('../../../../package.json').version}` }; diff --git a/apps/api/src/environments/environment.ts b/apps/api/src/environments/environment.ts index c0ae2e7e..05476646 100644 --- a/apps/api/src/environments/environment.ts +++ b/apps/api/src/environments/environment.ts @@ -1,4 +1,7 @@ +import { DEFAULT_HOST } from '@ghostfolio/common/config'; + export const environment = { production: false, + rootUrl: `https://${DEFAULT_HOST}:4200`, version: 'dev' }; diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index 7cd5953b..73502525 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -1,4 +1,8 @@ -import { STORYBOOK_PATH } from '@ghostfolio/common/config'; +import { + DEFAULT_HOST, + DEFAULT_PORT, + STORYBOOK_PATH +} from '@ghostfolio/common/config'; import { Logger, @@ -75,8 +79,8 @@ async function bootstrap() { app.use(HtmlTemplateMiddleware); - const HOST = configService.get('HOST') || '0.0.0.0'; - const PORT = configService.get('PORT') || 3333; + const HOST = configService.get('HOST') || DEFAULT_HOST; + const PORT = configService.get('PORT') || DEFAULT_PORT; await app.listen(PORT, HOST, () => { logLogo(); diff --git a/apps/api/src/middlewares/html-template.middleware.ts b/apps/api/src/middlewares/html-template.middleware.ts index 25687695..403b0961 100644 --- a/apps/api/src/middlewares/html-template.middleware.ts +++ b/apps/api/src/middlewares/html-template.middleware.ts @@ -2,7 +2,6 @@ import { environment } from '@ghostfolio/api/environments/environment'; import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service'; import { DEFAULT_LANGUAGE_CODE, - DEFAULT_ROOT_URL, STORYBOOK_PATH, SUPPORTED_LANGUAGE_CODES } from '@ghostfolio/common/config'; @@ -126,7 +125,7 @@ export const HtmlTemplateMiddleware = async ( } const currentDate = format(new Date(), DATE_FORMAT); - const rootUrl = process.env.ROOT_URL || DEFAULT_ROOT_URL; + const rootUrl = process.env.ROOT_URL || environment.rootUrl; if ( path.startsWith('/api/') || diff --git a/apps/api/src/services/configuration/configuration.service.ts b/apps/api/src/services/configuration/configuration.service.ts index 3dfe5d5c..473d909e 100644 --- a/apps/api/src/services/configuration/configuration.service.ts +++ b/apps/api/src/services/configuration/configuration.service.ts @@ -1,11 +1,13 @@ +import { environment } from '@ghostfolio/api/environments/environment'; import { Environment } from '@ghostfolio/api/services/interfaces/environment.interface'; import { CACHE_TTL_NO_CACHE, + DEFAULT_HOST, + DEFAULT_PORT, DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY, DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY, DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY, - DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT, - DEFAULT_ROOT_URL + DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT } from '@ghostfolio/common/config'; import { Injectable } from '@nestjs/common'; @@ -49,11 +51,11 @@ export class ConfigurationService { GOOGLE_SHEETS_ACCOUNT: str({ default: '' }), GOOGLE_SHEETS_ID: str({ default: '' }), GOOGLE_SHEETS_PRIVATE_KEY: str({ default: '' }), - HOST: host({ default: '0.0.0.0' }), + HOST: host({ default: DEFAULT_HOST }), JWT_SECRET_KEY: str({}), MAX_ACTIVITIES_TO_IMPORT: num({ default: Number.MAX_SAFE_INTEGER }), MAX_CHART_ITEMS: num({ default: 365 }), - PORT: port({ default: 3333 }), + PORT: port({ default: DEFAULT_PORT }), PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY: num({ default: DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY }), @@ -71,7 +73,9 @@ export class ConfigurationService { REDIS_PASSWORD: str({ default: '' }), REDIS_PORT: port({ default: 6379 }), REQUEST_TIMEOUT: num({ default: ms('3 seconds') }), - ROOT_URL: url({ default: DEFAULT_ROOT_URL }), + ROOT_URL: url({ + default: environment.rootUrl + }), STRIPE_PUBLIC_KEY: str({ default: '' }), STRIPE_SECRET_KEY: str({ default: '' }), TWITTER_ACCESS_TOKEN: str({ default: 'dummyAccessToken' }), diff --git a/apps/client/ngsw-config.json b/apps/client/ngsw-config.json index c0f03a13..56e1cfd6 100644 --- a/apps/client/ngsw-config.json +++ b/apps/client/ngsw-config.json @@ -6,13 +6,7 @@ "name": "app", "installMode": "prefetch", "resources": { - "files": [ - "/favicon.ico", - "/index.html", - "/assets/site.webmanifest", - "/*.css", - "/*.js" - ] + "files": ["/favicon.ico", "/index.html", "/*.css", "/*.js"] } }, { diff --git a/apps/client/project.json b/apps/client/project.json index 160a27ea..b2144d7b 100644 --- a/apps/client/project.json +++ b/apps/client/project.json @@ -146,9 +146,6 @@ { "command": "shx cp apps/client/src/assets/robots.txt dist/apps/client" }, - { - "command": "shx cp apps/client/src/assets/site.webmanifest dist/apps/client" - }, { "command": "shx cp node_modules/ionicons/dist/index.js dist/apps/client" }, diff --git a/apps/client/src/index.html b/apps/client/src/index.html index 47f2c3d1..e11bd157 100644 --- a/apps/client/src/index.html +++ b/apps/client/src/index.html @@ -45,7 +45,10 @@ sizes="16x16" type="image/png" /> - + diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.ts index 696ca86d..b8588fd0 100644 --- a/libs/common/src/lib/config.ts +++ b/libs/common/src/lib/config.ts @@ -48,13 +48,14 @@ export const PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE_PRIORITY_LOW = export const DEFAULT_CURRENCY = 'USD'; export const DEFAULT_DATE_FORMAT_MONTH_YEAR = 'MMM yyyy'; +export const DEFAULT_HOST = '0.0.0.0'; export const DEFAULT_LANGUAGE_CODE = 'en'; export const DEFAULT_PAGE_SIZE = 50; +export const DEFAULT_PORT = 3333; export const DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY = 1; export const DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY = 1; export const DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY = 1; export const DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT = 30000; -export const DEFAULT_ROOT_URL = 'https://localhost:4200'; // USX is handled separately export const DERIVED_CURRENCIES = [ From 5ecdb5fb7a0b5f019946261075935a0d9094eabd Mon Sep 17 00:00:00 2001 From: Omer Faruk Gormel Date: Sat, 22 Mar 2025 10:20:30 +0100 Subject: [PATCH 02/16] Feature/improve language localization for tr 20250322 (#4467) * Update translations * Update changelog --- CHANGELOG.md | 1 + apps/client/src/locales/messages.tr.xlf | 74 ++++++++++++------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83e0bec1..b5d72f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Improved the symbol validation in the _Yahoo Finance_ service (get asset profiles) - Refactored `lodash.uniq` with `Array.from(new Set(...))` - Refreshed the cryptocurrencies list +- Improved the language localization for Turkish (`tr`) ### Fixed diff --git a/apps/client/src/locales/messages.tr.xlf b/apps/client/src/locales/messages.tr.xlf index 2e385d88..6e3f5bb9 100644 --- a/apps/client/src/locales/messages.tr.xlf +++ b/apps/client/src/locales/messages.tr.xlf @@ -3556,7 +3556,7 @@ What our users are saying - What our users are saying + Kullanıcılarımızın görüşleri apps/client/src/app/pages/landing/landing-page.html 327 @@ -3620,7 +3620,7 @@ Are you ready? - Are you ready? + Hazır mısınız? apps/client/src/app/pages/landing/landing-page.html 431 @@ -6204,7 +6204,7 @@ Permission - Permission + Yetki apps/client/src/app/components/access-table/access-table.component.html 18 @@ -6216,7 +6216,7 @@ Restricted view - Restricted view + Kısıtlı görünüm apps/client/src/app/components/access-table/access-table.component.html 26 @@ -6228,7 +6228,7 @@ Oops! Could not grant access. - Oops! Could not grant access. + Hay Allah! Erişim izni verilemedi. apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts 91 @@ -6236,7 +6236,7 @@ Private - Private + Özel apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html 24 @@ -6244,7 +6244,7 @@ Job Queue - Job Queue + İş Kuyruğu apps/client/src/app/pages/admin/admin-page-routing.module.ts 25 @@ -6264,7 +6264,7 @@ Investment - Investment + Yatırım apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts 56 @@ -6280,7 +6280,7 @@ Absolute Asset Performance - Absolute Asset Performance + Mutlak Varlık Performansı apps/client/src/app/pages/portfolio/analysis/analysis-page.html 102 @@ -6640,7 +6640,7 @@ Join now or check out the example account - Join now or check out the example account + Hemen katıl ya da örnek hesabı incele apps/client/src/app/pages/landing/landing-page.html 434 @@ -7128,7 +7128,7 @@ Oops! Invalid currency. - Oops! Invalid currency. + Hay Allah! Geçersiz para birimi. apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html 49 @@ -7136,7 +7136,7 @@ This page has been archived. - This page has been archived. + Bu sayfa arşivlendi. apps/client/src/app/pages/resources/personal-finance-tools/product-page.html 14 @@ -7144,7 +7144,7 @@ is Open Source Software - is Open Source Software + , Açık Kaynak Kodlu Yazılımdır apps/client/src/app/pages/resources/personal-finance-tools/product-page.html 139 @@ -7152,7 +7152,7 @@ is not Open Source Software - is not Open Source Software + , Açık Kaynak Kodlu Yazılımdır apps/client/src/app/pages/resources/personal-finance-tools/product-page.html 146 @@ -7160,7 +7160,7 @@ is Open Source Software - is Open Source Software + , Açık Kaynak Kodlu Yazılımdır apps/client/src/app/pages/resources/personal-finance-tools/product-page.html 156 @@ -7168,7 +7168,7 @@ is not Open Source Software - is not Open Source Software + , Açık Kaynak Kodlu Yazılım değildir apps/client/src/app/pages/resources/personal-finance-tools/product-page.html 163 @@ -7578,7 +7578,7 @@ Please enter your Ghostfolio API key. - Please enter your Ghostfolio API key. + Lütfen Ghostfolio API anahtarınızı girin. apps/client/src/app/components/admin-settings/ghostfolio-premium-api-dialog/ghostfolio-premium-api-dialog.component.ts 57 @@ -7586,7 +7586,7 @@ AI prompt has been copied to the clipboard - AI prompt has been copied to the clipboard + Yapay zeka istemi panoya kopyalandı apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts 173 @@ -7594,7 +7594,7 @@ Link has been copied to the clipboard - Link has been copied to the clipboard + Bağlantı panoya kopyalandı apps/client/src/app/components/access-table/access-table.component.ts 65 @@ -7602,7 +7602,7 @@ Early Access - Early Access + Erken Erişim apps/client/src/app/components/admin-settings/admin-settings.component.html 16 @@ -7666,7 +7666,7 @@ end of day - end of day + gün sonu apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts 93 @@ -7674,7 +7674,7 @@ real-time - real-time + gerçek zamanlı apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts 97 @@ -7682,7 +7682,7 @@ Open Duck.ai - Open Duck.ai + Duck.ai'yi aç apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts 174 @@ -7690,7 +7690,7 @@ Create - Create + Oluştur libs/ui/src/lib/tags-selector/tags-selector.component.html 50 @@ -7698,7 +7698,7 @@ Market Data - Market Data + Piyasa Verileri apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html 374 @@ -7706,7 +7706,7 @@ Change - Change + Değişim libs/ui/src/lib/treemap-chart/treemap-chart.component.ts 365 @@ -7714,7 +7714,7 @@ Performance - Performance + Performans libs/ui/src/lib/treemap-chart/treemap-chart.component.ts 365 @@ -7726,7 +7726,7 @@ Copy portfolio data to clipboard for AI prompt - Copy portfolio data to clipboard for AI prompt + Yapay zeka istemi için portföy verilerini panoya kopyalayın apps/client/src/app/pages/portfolio/analysis/analysis-page.html 42 @@ -7734,7 +7734,7 @@ Copy AI prompt to clipboard for analysis - Copy AI prompt to clipboard for analysis + Yapay zeka istemini analiz için panoya kopyala apps/client/src/app/pages/portfolio/analysis/analysis-page.html 67 @@ -7742,7 +7742,7 @@ Armenia - Armenia + Ermenistan libs/ui/src/lib/i18n.ts 73 @@ -7750,7 +7750,7 @@ British Virgin Islands - British Virgin Islands + Britanya Virjin Adaları libs/ui/src/lib/i18n.ts 77 @@ -7758,7 +7758,7 @@ Singapore - Singapore + Singapur libs/ui/src/lib/i18n.ts 91 @@ -7766,7 +7766,7 @@ Terms and Conditions - Terms and Conditions + Hükümler ve Koşullar apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html 10 @@ -7774,7 +7774,7 @@ Please keep your security token safe. If you lose it, you will not be able to recover your account. - Please keep your security token safe. If you lose it, you will not be able to recover your account. + Lütfen güvenlik tokenınızı güvende tutun. Kaybetmeniz halinde hesabınızı kurtarmanız mümkün olmayacaktır. apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html 13 @@ -7782,7 +7782,7 @@ I understand that if I lose my security token, I cannot recover my account. - I understand that if I lose my security token, I cannot recover my account. + Güvenlik belirtecimi kaybedersem hesabımı kurtaramayacağımı anlıyorum. apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html 23 @@ -7790,7 +7790,7 @@ Continue - Continue + Devam et apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html 38 @@ -7798,7 +7798,7 @@ Here is your security token. It is only visible once, please store and keep it in a safe place. - Here is your security token. It is only visible once, please store and keep it in a safe place. + İşte güvenlik belirteciniz. Yalnızca bir kez görülebilir, lütfen saklayın ve güvenli bir yerde muhafaza edin. apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html 47 From 6c624fefc9bfb63ea61993c1b2b8816c83f959d4 Mon Sep 17 00:00:00 2001 From: Sayed Murtadha Ahmed Date: Sat, 22 Mar 2025 12:21:28 +0300 Subject: [PATCH 03/16] Feature/eliminate firstOrderDate in favor of dateOfFirstActivity in portfolio summary component (#4462) * Eliminate firstOrderDate in favor of dateOfFirstActivity in portfolio summary component * Update changelog --- CHANGELOG.md | 1 + apps/api/src/app/portfolio/portfolio.service.ts | 1 - apps/api/src/helper/object.helper.spec.ts | 2 -- .../portfolio-summary/portfolio-summary.component.ts | 4 ++-- apps/client/src/app/services/data.service.ts | 6 ------ .../src/lib/interfaces/portfolio-summary.interface.ts | 1 - 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5d72f98..d0b69880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Improved the export functionality by applying filters on accounts and tags - Improved the symbol validation in the _Yahoo Finance_ service (get asset profiles) +- Eliminated `firstOrderDate` from the summary of the portfolio details endpoint in favor of using `dateOfFirstActivity` from the user endpoint - Refactored `lodash.uniq` with `Array.from(new Set(...))` - Refreshed the cryptocurrencies list - Improved the language localization for Turkish (`tr`) diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index a3d9e3c4..c7eff27d 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -1918,7 +1918,6 @@ export class PortfolioService { annualizedPerformancePercentWithCurrencyEffect, cash, excludedAccountsAndActivities, - firstOrderDate, netPerformance, netPerformancePercentage, netPerformancePercentageWithCurrencyEffect, diff --git a/apps/api/src/helper/object.helper.spec.ts b/apps/api/src/helper/object.helper.spec.ts index 85fb8f4e..b0370fa3 100644 --- a/apps/api/src/helper/object.helper.spec.ts +++ b/apps/api/src/helper/object.helper.spec.ts @@ -1519,7 +1519,6 @@ describe('redactAttributes', () => { annualizedPerformancePercentWithCurrencyEffect: 0.1694019484552876, cash: null, excludedAccountsAndActivities: null, - firstOrderDate: '2017-01-02T23:00:00.000Z', netPerformance: null, netPerformancePercentage: 2.3039314216696174, netPerformancePercentageWithCurrencyEffect: 2.3589806001456606, @@ -3023,7 +3022,6 @@ describe('redactAttributes', () => { annualizedPerformancePercentWithCurrencyEffect: 0.1694019484552876, cash: null, excludedAccountsAndActivities: null, - firstOrderDate: '2017-01-02T23:00:00.000Z', netPerformance: null, netPerformancePercentage: 2.3039314216696174, netPerformancePercentageWithCurrencyEffect: 2.3589806001456606, diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts index 25f7d930..a44eacc9 100644 --- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts +++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts @@ -40,8 +40,8 @@ export class PortfolioSummaryComponent implements OnChanges { public ngOnChanges() { if (this.summary) { - if (this.summary.firstOrderDate) { - this.timeInMarket = formatDistanceToNow(this.summary.firstOrderDate, { + if (this.user.dateOfFirstActivity) { + this.timeInMarket = formatDistanceToNow(this.user.dateOfFirstActivity, { locale: getDateFnsLocale(this.language) }); } else { diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts index 4eba3fff..5ee49d63 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -529,12 +529,6 @@ export class DataService { }) .pipe( map((response) => { - if (response.summary?.firstOrderDate) { - response.summary.firstOrderDate = parseISO( - response.summary.firstOrderDate - ); - } - if (response.holdings) { for (const symbol of Object.keys(response.holdings)) { response.holdings[symbol].assetClassLabel = translate( diff --git a/libs/common/src/lib/interfaces/portfolio-summary.interface.ts b/libs/common/src/lib/interfaces/portfolio-summary.interface.ts index 5b27f4c7..42496b22 100644 --- a/libs/common/src/lib/interfaces/portfolio-summary.interface.ts +++ b/libs/common/src/lib/interfaces/portfolio-summary.interface.ts @@ -16,7 +16,6 @@ export interface PortfolioSummary extends PortfolioPerformance { filteredValueInBaseCurrency?: number; filteredValueInPercentage?: number; fireWealth: number; - firstOrderDate: Date; grossPerformance: number; grossPerformanceWithCurrencyEffect: number; interest: number; From 4842c347a9c893b3629ce0749bb71243e6989129 Mon Sep 17 00:00:00 2001 From: csehatt741 <77381875+csehatt741@users.noreply.github.com> Date: Sat, 22 Mar 2025 10:56:01 +0100 Subject: [PATCH 04/16] Feature/generate new security token for user via admin control panel (#4458) * Generate new security token for user via admin control panel * Update changelog --------- Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> --- CHANGELOG.md | 1 + apps/api/src/app/auth/auth.service.ts | 8 ++-- apps/api/src/app/user/user.controller.ts | 35 ++++++++++++--- apps/api/src/app/user/user.service.ts | 35 +++++++++++---- .../admin-users/admin-users.component.ts | 45 +++++++++++++++---- .../components/admin-users/admin-users.html | 11 ++++- apps/client/src/app/services/data.service.ts | 8 ++++ .../src/app/services/user/user.service.ts | 4 +- libs/common/src/lib/interfaces/index.ts | 2 + .../access-token-response.interface.ts | 3 ++ 10 files changed, 123 insertions(+), 29 deletions(-) create mode 100644 libs/common/src/lib/interfaces/responses/access-token-response.interface.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index d0b69880..8ec1fd9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added support for filtering in the _Copy AI prompt to clipboard_ actions on the analysis page (experimental) +- Added support for generating a new _Security Token_ via the users table of the admin control panel - Added an endpoint to localize the `site.webmanifest` - Added the _Storybook_ path to the `sitemap.xml` file diff --git a/apps/api/src/app/auth/auth.service.ts b/apps/api/src/app/auth/auth.service.ts index edfb22b6..ceff492a 100644 --- a/apps/api/src/app/auth/auth.service.ts +++ b/apps/api/src/app/auth/auth.service.ts @@ -20,10 +20,10 @@ export class AuthService { public async validateAnonymousLogin(accessToken: string): Promise { return new Promise(async (resolve, reject) => { try { - const hashedAccessToken = this.userService.createAccessToken( - accessToken, - this.configurationService.get('ACCESS_TOKEN_SALT') - ); + const hashedAccessToken = this.userService.createAccessToken({ + password: accessToken, + salt: this.configurationService.get('ACCESS_TOKEN_SALT') + }); const [user] = await this.userService.users({ where: { accessToken: hashedAccessToken } diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.ts index 149e0628..868af505 100644 --- a/apps/api/src/app/user/user.controller.ts +++ b/apps/api/src/app/user/user.controller.ts @@ -1,8 +1,13 @@ import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator'; import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; +import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; import { PropertyService } from '@ghostfolio/api/services/property/property.service'; -import { User, UserSettings } from '@ghostfolio/common/interfaces'; +import { + AccessTokenResponse, + User, + UserSettings +} from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import type { RequestWithUser } from '@ghostfolio/common/types'; @@ -36,6 +41,7 @@ export class UserController { public constructor( private readonly configurationService: ConfigurationService, private readonly jwtService: JwtService, + private readonly prismaService: PrismaService, private readonly propertyService: PropertyService, @Inject(REQUEST) private readonly request: RequestWithUser, private readonly userService: UserService @@ -47,10 +53,10 @@ export class UserController { public async deleteOwnUser( @Body() data: DeleteOwnUserDto ): Promise { - const hashedAccessToken = this.userService.createAccessToken( - data.accessToken, - this.configurationService.get('ACCESS_TOKEN_SALT') - ); + const hashedAccessToken = this.userService.createAccessToken({ + password: data.accessToken, + salt: this.configurationService.get('ACCESS_TOKEN_SALT') + }); const [user] = await this.userService.users({ where: { accessToken: hashedAccessToken, id: this.request.user.id } @@ -85,6 +91,25 @@ export class UserController { }); } + @HasPermission(permissions.accessAdminControl) + @Post(':id/access-token') + @UseGuards(AuthGuard('jwt'), HasPermissionGuard) + public async generateAccessToken( + @Param('id') id: string + ): Promise { + const { accessToken, hashedAccessToken } = + this.userService.generateAccessToken({ + userId: id + }); + + await this.prismaService.user.update({ + data: { accessToken: hashedAccessToken }, + where: { id } + }); + + return { accessToken }; + } + @Get() @UseGuards(AuthGuard('jwt'), HasPermissionGuard) public async getUser( diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index 40bc1b2b..e9b8078b 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -67,13 +67,33 @@ export class UserService { return this.prismaService.user.count(args); } - public createAccessToken(password: string, salt: string): string { + public createAccessToken({ + password, + salt + }: { + password: string; + salt: string; + }): string { const hash = createHmac('sha512', salt); hash.update(password); return hash.digest('hex'); } + public generateAccessToken({ userId }: { userId: string }) { + const accessToken = this.createAccessToken({ + password: userId, + salt: getRandomString(10) + }); + + const hashedAccessToken = this.createAccessToken({ + password: accessToken, + salt: this.configurationService.get('ACCESS_TOKEN_SALT') + }); + + return { accessToken, hashedAccessToken }; + } + public async getUser( { Account, id, permissions, Settings, subscription }: UserWithSettings, aLocale = locale @@ -433,7 +453,7 @@ export class UserService { data.provider = 'ANONYMOUS'; } - let user = await this.prismaService.user.create({ + const user = await this.prismaService.user.create({ data: { ...data, Account: { @@ -464,14 +484,11 @@ export class UserService { } if (data.provider === 'ANONYMOUS') { - const accessToken = this.createAccessToken(user.id, getRandomString(10)); + const { accessToken, hashedAccessToken } = this.generateAccessToken({ + userId: user.id + }); - const hashedAccessToken = this.createAccessToken( - accessToken, - this.configurationService.get('ACCESS_TOKEN_SALT') - ); - - user = await this.prismaService.user.update({ + await this.prismaService.user.update({ data: { accessToken: hashedAccessToken }, where: { id: user.id } }); diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts index 50b8cb5f..e1cd3102 100644 --- a/apps/client/src/app/components/admin-users/admin-users.component.ts +++ b/apps/client/src/app/components/admin-users/admin-users.component.ts @@ -1,9 +1,4 @@ -import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type'; -import { NotificationService } from '@ghostfolio/client/core/notification/notification.service'; -import { AdminService } from '@ghostfolio/client/services/admin.service'; -import { DataService } from '@ghostfolio/client/services/data.service'; -import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; -import { UserService } from '@ghostfolio/client/services/user/user.service'; +import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service'; import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config'; import { getDateFormatString, getEmojiFlag } from '@ghostfolio/common/helper'; import { AdminUsers, InfoItem, User } from '@ghostfolio/common/interfaces'; @@ -26,11 +21,18 @@ import { import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; +import { ConfirmationDialogType } from '../../core/notification/confirmation-dialog/confirmation-dialog.type'; +import { NotificationService } from '../../core/notification/notification.service'; +import { AdminService } from '../../services/admin.service'; +import { DataService } from '../../services/data.service'; +import { ImpersonationStorageService } from '../../services/impersonation-storage.service'; +import { UserService } from '../../services/user/user.service'; + @Component({ selector: 'gf-admin-users', + standalone: false, styleUrls: ['./admin-users.scss'], - templateUrl: './admin-users.html', - standalone: false + templateUrl: './admin-users.html' }) export class AdminUsersComponent implements OnDestroy, OnInit { @ViewChild(MatPaginator) paginator: MatPaginator; @@ -55,6 +57,7 @@ export class AdminUsersComponent implements OnDestroy, OnInit { private dataService: DataService, private impersonationStorageService: ImpersonationStorageService, private notificationService: NotificationService, + private tokenStorageService: TokenStorageService, private userService: UserService ) { this.info = this.dataService.fetchInfo(); @@ -140,6 +143,32 @@ export class AdminUsersComponent implements OnDestroy, OnInit { }); } + public onGenerateAccessToken(aUserId: string) { + this.notificationService.confirm({ + confirmFn: () => { + this.dataService + .generateAccessToken(aUserId) + .pipe(takeUntil(this.unsubscribeSubject)) + .subscribe(({ accessToken }) => { + this.notificationService.alert({ + discardFn: () => { + if (aUserId === this.user.id) { + this.tokenStorageService.signOut(); + this.userService.remove(); + + document.location.href = `/${document.documentElement.lang}`; + } + }, + message: accessToken, + title: $localize`Security token` + }); + }); + }, + confirmType: ConfirmationDialogType.Warn, + title: $localize`Do you really want to generate a new security token for this user?` + }); + } + public onImpersonateUser(aId: string) { if (aId) { this.impersonationStorageService.setId(aId); diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html index ca8ef055..e8725e70 100644 --- a/apps/client/src/app/components/admin-users/admin-users.html +++ b/apps/client/src/app/components/admin-users/admin-users.html @@ -239,8 +239,17 @@ Impersonate User -
} + +