From 0f77169952385d42777d40bdeba14dc8bd5eae6e Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Mon, 1 Jul 2024 21:03:15 +0200 Subject: [PATCH 1/3] Fix wording (#3463) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd8af7af2..ba2b6bb9c 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ We provide official container images hosted on [Docker Hub](https://hub.docker.c | ------------------------ | ------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------- | | `ACCESS_TOKEN_SALT` | string | | A random string used as salt for access tokens | | `API_KEY_COINGECKO_DEMO` | string (`optional`) |   | The _CoinGecko_ Demo API key | -| `API_KEY_COINGECKO_PRO` | string (`optional`) | | The _CoinGecko_ Pro API | +| `API_KEY_COINGECKO_PRO` | string (`optional`) | | The _CoinGecko_ Pro API key | | `DATABASE_URL` | string | | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer` | | `HOST` | string (`optional`) | `0.0.0.0` | The host where the Ghostfolio application will run on | | `JWT_SECRET_KEY` | string | | A random string used for _JSON Web Tokens_ (JWT) | From 194aee97dbcacdd4b928c88b175e6bf2f2e9f748 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:58:13 +0200 Subject: [PATCH 2/3] Feature/update development instructions to control flow (#3466) --- DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 10323e640..19687e8dd 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -10,7 +10,7 @@ Remove permission in `UserService` using `without()` ### Frontend -Use `*ngIf="user?.settings?.isExperimentalFeatures"` in HTML template +Use `@if (user?.settings?.isExperimentalFeatures) {}` in HTML template ## Git From 8227a2d91adbca330c65a3997e05e5a5e6e06164 Mon Sep 17 00:00:00 2001 From: Chang-Yen Tseng <10328757+Summon528@users.noreply.github.com> Date: Wed, 3 Jul 2024 09:16:07 -0700 Subject: [PATCH 3/3] Feature/improve detection of json used via scraper configuration (#3539) * Improve detection of json * Update changelog --- CHANGELOG.md | 6 ++++++ .../api/src/services/data-provider/manual/manual.service.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7dc7abd4..850d2a7a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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 + +### Changed + +- Improved the detection of REST APIs (`JSON`) used via the scraper configuration + ## 2.92.0 - 2024-06-30 ### Added diff --git a/apps/api/src/services/data-provider/manual/manual.service.ts b/apps/api/src/services/data-provider/manual/manual.service.ts index d2e5bca85..0655d2318 100644 --- a/apps/api/src/services/data-provider/manual/manual.service.ts +++ b/apps/api/src/services/data-provider/manual/manual.service.ts @@ -257,7 +257,7 @@ export class ManualService implements DataProviderInterface { signal: abortController.signal }); - if (headers['content-type'] === 'application/json') { + if (headers['content-type'].includes('application/json')) { const data = JSON.parse(body); const value = String( jsonpath.query(data, scraperConfiguration.selector)[0]