Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/improve api key management of ghostfolio data provider (#4069)
Thomas Kaul9ca901f6e66c
diff --git a/apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts b/apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.tsindex a1ac6b6577..acd66b0af3 100644--- a/apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts+++ b/apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts@@ -31,7 +31,6 @@ import got from 'got';@Injectable()export class GhostfolioService implements DataProviderInterface {- private apiKey: string;private readonly URL = environment.production? 'https://ghostfol.io/api': `${this.configurationService.get('ROOT_URL')}/api`;@@ -39,15 +38,7 @@ export class GhostfolioService implements DataProviderInterface {public constructor(private readonly configurationService: ConfigurationService,private readonly propertyService: PropertyService- ) {- void this.initialize();- }-- public async initialize() {- this.apiKey = (await this.propertyService.getByKey(- PROPERTY_API_KEY_GHOSTFOLIO- )) as string;- }+ ) {}public canHandle() {return true;@@ -105,7 +96,7 @@ export class GhostfolioService implements DataProviderInterface {DATE_FORMAT)}`,{- headers: this.getRequestHeaders(),+ headers: await this.getRequestHeaders(),// @ts-ignoresignal: abortController.signal}@@ -154,7 +145,7 @@ export class GhostfolioService implements DataProviderInterface {const { quotes } = await got(`${this.URL}/v1/data-providers/ghostfolio/quotes?symbols=${symbols.join(',')}`,{- headers: this.getRequestHeaders(),+ headers: await this.getRequestHeaders(),// @ts-ignoresignal: abortController.signal}@@ -193,7 +184,7 @@ export class GhostfolioService implements DataProviderInterface {searchResult = await got(`${this.URL}/v1/data-providers/ghostfolio/lookup?query=${query}`,{- headers: this.getRequestHeaders(),+ headers: await this.getRequestHeaders(),// @ts-ignoresignal: abortController.signal}@@ -213,9 +204,13 @@ export class GhostfolioService implements DataProviderInterface {return searchResult;}- private getRequestHeaders() {+ private async getRequestHeaders() {+ const apiKey = (await this.propertyService.getByKey(+ PROPERTY_API_KEY_GHOSTFOLIO+ )) as string;+return {- [HEADER_KEY_TOKEN]: `Bearer ${this.apiKey}`+ [HEADER_KEY_TOKEN]: `Bearer ${apiKey}`};}}diff --git a/apps/client/src/app/components/admin-settings/admin-settings.component.ts b/apps/client/src/app/components/admin-settings/admin-settings.component.tsindex d25cdfbcdb..68256bf983 100644--- a/apps/client/src/app/components/admin-settings/admin-settings.component.ts+++ b/apps/client/src/app/components/admin-settings/admin-settings.component.ts@@ -3,7 +3,10 @@ import { NotificationService } from '@ghostfolio/client/core/notification/notifiimport { AdminService } from '@ghostfolio/client/services/admin.service';import { DataService } from '@ghostfolio/client/services/data.service';import { UserService } from '@ghostfolio/client/services/user/user.service';-import { PROPERTY_API_KEY_GHOSTFOLIO } from '@ghostfolio/common/config';+import {+ DEFAULT_LANGUAGE_CODE,+ PROPERTY_API_KEY_GHOSTFOLIO+} from '@ghostfolio/common/config';import {DataProviderGhostfolioStatusResponse,User@@ -56,8 +59,11 @@ export class AdminSettingsComponent implements OnDestroy, OnInit {if (state?.user) {this.user = state.user;+ const languageCode =+ this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE;+this.pricingUrl =- `https://ghostfol.io/${this.user.settings.language}/` ++ `https://ghostfol.io/${languageCode}/` +$localize`:snake-case:pricing`;this.changeDetectorRef.markForCheck();