Merge branch 'main' into Task/refresh-cryptocurrencies-list-20251121

CHANGELOG.md

@@ -7,8 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Extended the user detail dialog of the admin control panel’s users section by the authentication method
+
 ### Changed
 
+- Resolved the data source of the `GHOSTFOLIO` data provider in the export functionality
+- Resolved the data source of the `GHOSTFOLIO` data provider in the import functionality
 - Refreshed the cryptocurrencies list
 
 ## 2.218.0 - 2025-11-20

apps/api/src/app/admin/admin.service.ts

@@ -876,6 +876,7 @@ export class AdminService {
         },
         createdAt: true,
         id: true,
+        provider: true,
         role: true,
         subscriptions: {
           orderBy: {
@@ -892,7 +893,7 @@ export class AdminService {
     });
 
     return usersWithAnalytics.map(
-      ({ _count, analytics, createdAt, id, role, subscriptions }) => {
+      ({ _count, analytics, createdAt, id, provider, role, subscriptions }) => {
         const daysSinceRegistration =
           differenceInDays(new Date(), createdAt) + 1;
         const engagement = analytics
@@ -909,6 +910,7 @@ export class AdminService {
           createdAt,
           engagement,
           id,
+          provider,
           role,
           subscription,
           accountCount: _count.accounts || 0,

apps/api/src/app/export/export.controller.ts

@@ -1,5 +1,6 @@
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';
+import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor';
 import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { ExportResponse } from '@ghostfolio/common/interfaces';
 import type { RequestWithUser } from '@ghostfolio/common/types';
@@ -28,6 +29,7 @@ export class ExportController {
   @Get()
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async export(
     @Query('accounts') filterByAccounts?: string,
     @Query('activityIds') filterByActivityIds?: string,

apps/api/src/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor.ts

@@ -27,9 +27,23 @@ export class TransformDataSourceInRequestInterceptor<T>
 
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
       if (request.body?.activities) {
+        const dataSourceGhostfolioDataProvider = this.configurationService.get(
+          'DATA_SOURCES_GHOSTFOLIO_DATA_PROVIDER'
+        )?.[0];
+
         request.body.activities = request.body.activities.map((activity) => {
           if (DataSource[activity.dataSource]) {
-            return activity;
+            if (
+              activity.dataSource === 'GHOSTFOLIO' &&
+              dataSourceGhostfolioDataProvider
+            ) {
+              return {
+                ...activity,
+                dataSource: dataSourceGhostfolioDataProvider
+              };
+            } else {
+              return activity;
+            }
           } else {
             return {
               ...activity,

apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts

@@ -16,36 +16,56 @@ import { map } from 'rxjs/operators';
 export class TransformDataSourceInResponseInterceptor<T>
   implements NestInterceptor<T, any>
 {
+  private encodedDataSourceMap: {
+    [dataSource: string]: string;
+  } = {};
+
   public constructor(
     private readonly configurationService: ConfigurationService
-  ) {}
+  ) {
+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+      this.encodedDataSourceMap = Object.keys(DataSource).reduce(
+        (encodedDataSourceMap, dataSource) => {
+          if (!['GHOSTFOLIO', 'MANUAL'].includes(dataSource)) {
+            encodedDataSourceMap[dataSource] = encodeDataSource(
+              DataSource[dataSource]
+            );
+          }
+
+          return encodedDataSourceMap;
+        },
+        {}
+      );
+    }
+  }
 
   public intercept(
-    _context: ExecutionContext,
+    context: ExecutionContext,
     next: CallHandler<T>
   ): Observable<any> {
+    const isExportMode = context.getClass().name === 'ExportController';
+
     return next.handle().pipe(
       map((data: any) => {
         if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+          const valueMap = this.encodedDataSourceMap;
+
+          if (isExportMode) {
+            for (const dataSource of this.configurationService.get(
+              'DATA_SOURCES_GHOSTFOLIO_DATA_PROVIDER'
+            )) {
+              valueMap[dataSource] = 'GHOSTFOLIO';
+            }
+          }
+
           data = redactAttributes({
+            object: data,
             options: [
               {
-                attribute: 'dataSource',
+                valueMap,
-                valueMap: Object.keys(DataSource).reduce(
+                attribute: 'dataSource'
-                  (valueMap, dataSource) => {
-                    if (!['MANUAL'].includes(dataSource)) {
-                      valueMap[dataSource] = encodeDataSource(
-                        DataSource[dataSource]
-                      );
-                    }
-
-                    return valueMap;
-                  },
-                  {}
-                )
               }
-            ],
+            ]
-            object: data
           });
         }
 

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

@@ -23,17 +23,38 @@
     </div>
 
     <div class="mb-3 row">
+      <div class="col-6 mb-3">
+        <gf-value
+          i18n
+          size="medium"
+          [locale]="data.locale"
+          [value]="user?.provider"
+          >Authentication</gf-value
+        >
+      </div>
       <div class="col-6 mb-3">
         <gf-value i18n size="medium" [value]="user?.role">Role</gf-value>
       </div>
-      @if (data.hasPermissionForSubscription) {
+    </div>
+
+    @if (data.hasPermissionForSubscription) {
+      <div class="mb-3 row">
+        <div class="col-6 mb-3">
+          <gf-value
+            i18n
+            size="medium"
+            [locale]="data.locale"
+            [value]="user?.subscription ? 'Premium' : 'Basic'"
+            >Membership</gf-value
+          >
+        </div>
         <div class="col-6 mb-3">
           <gf-value i18n size="medium" [value]="user?.country"
             >Country</gf-value
           >
         </div>
-      }
+      </div>
-    </div>
+    }
 
     <div class="mb-3 row">
       <div class="col-6 mb-3">

libs/common/src/lib/interfaces/admin-user.interface.ts

@@ -1,4 +1,4 @@
-import { Role } from '@prisma/client';
+import { Provider, Role, Subscription } from '@prisma/client';
 
 export interface AdminUser {
   accountCount: number;
@@ -9,5 +9,7 @@ export interface AdminUser {
   engagement: number;
   id: string;
   lastActivity: Date;
+  provider: Provider;
   role: Role;
+  subscription?: Subscription;
 }