sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Feature/improve api key management of ghostfolio data provider (#4069)

Browse Source 
* Improve API key management

* Add fallback for language code
This commit is contained in:
Thomas Kaul 2024-11-25 21:25:57 +01:00 committed by GitHub
parent cc88bd9069
commit 9ca901f6e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts
View File

@ -31,7 +31,6 @@ import got from 'got';
@Injectable() @Injectable()
export class GhostfolioService implements DataProviderInterface { export class GhostfolioService implements DataProviderInterface {
private apiKey: string;
private readonly URL = environment.production private readonly URL = environment.production
? 'https://ghostfol.io/api' ? 'https://ghostfol.io/api'
: `${this.configurationService.get('ROOT_URL')}/api`; : `${this.configurationService.get('ROOT_URL')}/api`;
@ -39,15 +38,7 @@ export class GhostfolioService implements DataProviderInterface {
public constructor( public constructor(
private readonly configurationService: ConfigurationService, private readonly configurationService: ConfigurationService,
private readonly propertyService: PropertyService private readonly propertyService: PropertyService
) { ) {}
void this.initialize();
}
public async initialize() {
this.apiKey = (await this.propertyService.getByKey(
PROPERTY_API_KEY_GHOSTFOLIO
)) as string;
}
public canHandle() { public canHandle() {
return true; return true;
@ -105,7 +96,7 @@ export class GhostfolioService implements DataProviderInterface {
DATE_FORMAT DATE_FORMAT
)}`, )}`,
{ {
headers: this.getRequestHeaders(), headers: await this.getRequestHeaders(),
// @ts-ignore // @ts-ignore
signal: abortController.signal signal: abortController.signal
} }
@ -154,7 +145,7 @@ export class GhostfolioService implements DataProviderInterface {
const { quotes } = await got( const { quotes } = await got(
`${this.URL}/v1/data-providers/ghostfolio/quotes?symbols=${symbols.join(',')}`, `${this.URL}/v1/data-providers/ghostfolio/quotes?symbols=${symbols.join(',')}`,
{ {
headers: this.getRequestHeaders(), headers: await this.getRequestHeaders(),
// @ts-ignore // @ts-ignore
signal: abortController.signal signal: abortController.signal
} }
@ -193,7 +184,7 @@ export class GhostfolioService implements DataProviderInterface {
searchResult = await got( searchResult = await got(
`${this.URL}/v1/data-providers/ghostfolio/lookup?query=${query}`, `${this.URL}/v1/data-providers/ghostfolio/lookup?query=${query}`,
{ {
headers: this.getRequestHeaders(), headers: await this.getRequestHeaders(),
// @ts-ignore // @ts-ignore
signal: abortController.signal signal: abortController.signal
} }
@ -213,9 +204,13 @@ export class GhostfolioService implements DataProviderInterface {
return searchResult; return searchResult;
} }
private getRequestHeaders() { private async getRequestHeaders() {
const apiKey = (await this.propertyService.getByKey(
PROPERTY_API_KEY_GHOSTFOLIO
)) as string;
return { return {
[HEADER_KEY_TOKEN]: `Bearer ${this.apiKey}` [HEADER_KEY_TOKEN]: `Bearer ${apiKey}`
}; };
} }
} }

10
apps/client/src/app/components/admin-settings/admin-settings.component.ts
View File

@ -3,7 +3,10 @@ import { NotificationService } from '@ghostfolio/client/core/notification/notifi
import { AdminService } from '@ghostfolio/client/services/admin.service'; import { AdminService } from '@ghostfolio/client/services/admin.service';
import { DataService } from '@ghostfolio/client/services/data.service'; import { DataService } from '@ghostfolio/client/services/data.service';
import { UserService } from '@ghostfolio/client/services/user/user.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 { import {
DataProviderGhostfolioStatusResponse, DataProviderGhostfolioStatusResponse,
User User
@ -56,8 +59,11 @@ export class AdminSettingsComponent implements OnDestroy, OnInit {
if (state?.user) { if (state?.user) {
this.user = state.user; this.user = state.user;
const languageCode =
this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE;
this.pricingUrl = this.pricingUrl =
`https://ghostfol.io/${this.user.settings.language}/` + `https://ghostfol.io/${languageCode}/` +
$localize`:snake-case:pricing`; $localize`:snake-case:pricing`;
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();