Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/improve handling of encoded data source in user settings (#7521)
Thomas Kaul3eaba49f1985
diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.tsindex 7a1fc71dc8..2b679f34cc 100644--- a/apps/api/src/app/user/user.controller.ts+++ b/apps/api/src/app/user/user.controller.ts@@ -1,7 +1,9 @@import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';import { CustomThrottlerGuard } from '@ghostfolio/api/guards/custom-throttler.guard';import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';+import { decodeDataSource } from '@ghostfolio/api/helper/data-source.helper';import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor';+import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';@@ -119,6 +121,7 @@ export class UserController {@Get()@UseGuards(AuthGuard('jwt'), HasPermissionGuard)@UseInterceptors(RedactValuesInResponseInterceptor)+ @UseInterceptors(TransformDataSourceInResponseInterceptor)public async getUser(@Headers('accept-language') acceptLanguage: string,@Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId: string@@ -165,6 +168,7 @@ export class UserController {@Put('setting')@UseGuards(AuthGuard('jwt'), HasPermissionGuard)+ @UseInterceptors(TransformDataSourceInResponseInterceptor)public async updateUserSetting(@Body() data: UpdateUserSettingDto) {if (size(data) === 1 &&@@ -192,6 +196,12 @@ export class UserController {data);+ if (userSettings['filters.dataSource']) {+ userSettings['filters.dataSource'] = decodeDataSource(+ userSettings['filters.dataSource']+ );+ }+for (const key in userSettings) {if (userSettings[key] === false || userSettings[key] === null) {delete userSettings[key];diff --git a/apps/api/src/app/user/user.module.ts b/apps/api/src/app/user/user.module.tsindex 3f4e898fc5..1566309647 100644--- a/apps/api/src/app/user/user.module.ts+++ b/apps/api/src/app/user/user.module.ts@@ -1,6 +1,7 @@import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module';import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module';+import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module';import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';@@ -30,7 +31,8 @@ import { UserService } from './user.service';PropertyModule,RedactValuesInResponseModule,SubscriptionModule,- TagModule+ TagModule,+ TransformDataSourceInResponseModule],providers: [UserService]})diff --git a/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts b/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.tsindex 6b38b2d54b..81aabf4ae1 100644--- a/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts+++ b/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts@@ -78,6 +78,7 @@ export class TransformDataSourceInResponseInterceptor<valueMap,object: data,paths: [+ '["filters.dataSource"]','activities[*].assetProfile.dataSource','activities[*].dataSource','assetProfile.dataSource',@@ -88,6 +89,7 @@ export class TransformDataSourceInResponseInterceptor<'holdings[*].assetProfile.dataSource','holdings[*].dataSource','items[*].dataSource',+ 'settings["filters.dataSource"]','watchlist[*].dataSource']});