Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/remove environment variable web auth rp (#3115)
Thomas Kaul1f2f9f22f283
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 5da3b143bc..54764beb0c 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### Changed- Integrated dividend into the transaction point concept in the portfolio service+- Removed the environment variable `WEB_AUTH_RP_ID`## 2.61.1 - 2024-03-06diff --git a/apps/api/src/app/auth/web-auth.service.ts b/apps/api/src/app/auth/web-auth.service.tsindex a6e76ffbbd..961bbe9a75 100644--- a/apps/api/src/app/auth/web-auth.service.ts+++ b/apps/api/src/app/auth/web-auth.service.ts@@ -41,7 +41,7 @@ export class WebAuthService {) {}get rpID() {- return this.configurationService.get('WEB_AUTH_RP_ID');+ return new URL(this.configurationService.get('ROOT_URL')).hostname;}get expectedOrigin() {diff --git a/apps/api/src/services/configuration/configuration.service.ts b/apps/api/src/services/configuration/configuration.service.tsindex eb82be418b..507e4a375c 100644--- a/apps/api/src/services/configuration/configuration.service.ts+++ b/apps/api/src/services/configuration/configuration.service.ts@@ -3,7 +3,7 @@ import { DEFAULT_ROOT_URL } from '@ghostfolio/common/config';import { Injectable } from '@nestjs/common';import { DataSource } from '@prisma/client';-import { bool, cleanEnv, host, json, num, port, str } from 'envalid';+import { bool, cleanEnv, host, json, num, port, str, url } from 'envalid';@Injectable()export class ConfigurationService {@@ -48,14 +48,13 @@ export class ConfigurationService {REDIS_PASSWORD: str({ default: '' }),REDIS_PORT: port({ default: 6379 }),REQUEST_TIMEOUT: num({ default: 2000 }),- ROOT_URL: str({ default: DEFAULT_ROOT_URL }),+ ROOT_URL: url({ default: DEFAULT_ROOT_URL }),STRIPE_PUBLIC_KEY: str({ default: '' }),STRIPE_SECRET_KEY: str({ default: '' }),TWITTER_ACCESS_TOKEN: str({ default: 'dummyAccessToken' }),TWITTER_ACCESS_TOKEN_SECRET: str({ default: 'dummyAccessTokenSecret' }),TWITTER_API_KEY: str({ default: 'dummyApiKey' }),- TWITTER_API_SECRET: str({ default: 'dummyApiSecret' }),- WEB_AUTH_RP_ID: host({ default: 'localhost' })+ TWITTER_API_SECRET: str({ default: 'dummyApiSecret' })});}diff --git a/apps/api/src/services/interfaces/environment.interface.ts b/apps/api/src/services/interfaces/environment.interface.tsindex 09d0b0e5db..5d3145a28b 100644--- a/apps/api/src/services/interfaces/environment.interface.ts+++ b/apps/api/src/services/interfaces/environment.interface.ts@@ -42,5 +42,4 @@ export interface Environment extends CleanedEnvAccessors {TWITTER_ACCESS_TOKEN_SECRET: string;TWITTER_API_KEY: string;TWITTER_API_SECRET: string;- WEB_AUTH_RP_ID: string;}