From 641c3baaefecb997ae974bae2d41a5ec21a32dfb Mon Sep 17 00:00:00 2001
From: csehatt741 <att741@gmail.com>
Date: Thu, 20 Mar 2025 15:35:35 +0100
Subject: [PATCH] Code review changes

---
 apps/api/src/app/user/user.controller.ts      | 32 +++++++++++--------
 apps/api/src/app/user/user.service.ts         |  8 +++--
 .../admin-users/admin-users.component.ts      |  9 +++---
 .../components/admin-users/admin-users.html   |  2 +-
 apps/client/src/app/services/data.service.ts  | 16 +++++-----
 .../lib/interfaces/access-token.interface.ts  |  3 --
 libs/common/src/lib/interfaces/index.ts       |  4 +--
 .../access-token-response.interface.ts        |  3 ++
 8 files changed, 41 insertions(+), 36 deletions(-)
 delete mode 100644 libs/common/src/lib/interfaces/access-token.interface.ts
 create mode 100644 libs/common/src/lib/interfaces/responses/access-token-response.interface.ts

diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.ts
index f7984074f..eacd57c83 100644
--- a/apps/api/src/app/user/user.controller.ts
+++ b/apps/api/src/app/user/user.controller.ts
@@ -2,7 +2,11 @@ import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorat
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { AccessToken, User, UserSettings } from '@ghostfolio/common/interfaces';
+import {
+  AccessTokenResponse,
+  User,
+  UserSettings
+} from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
 
@@ -85,6 +89,19 @@ export class UserController {
     });
   }
 
+  @Post(':id/access-token')
+  @HasPermission(permissions.accessAdminControl)
+  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  public async generateAccessToken(
+    @Param('id') id: string
+  ): Promise<AccessTokenResponse> {
+    const { accessToken } = await this.userService.generateAccessToken({
+      userId: id
+    });
+
+    return { accessToken };
+  }
+
   @Get()
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
   public async getUser(
@@ -123,19 +140,6 @@ export class UserController {
     };
   }
 
-  @Post(':id/security-token')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
-  public async generateSecurityToken(
-    @Param('id') id: string
-  ): Promise<AccessToken> {
-    const accessToken = await this.userService.generateAccessToken({
-      userId: id
-    });
-
-    return { accessToken };
-  }
-
   @Put('setting')
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
   public async updateUserSetting(@Body() data: UpdateUserSettingDto) {
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index 09d9b2184..fc1ebbd9f 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -464,7 +464,9 @@ export class UserService {
     }
 
     if (data.provider === 'ANONYMOUS') {
-      const accessToken = await this.generateAccessToken({ userId: user.id });
+      const { accessToken } = await this.generateAccessToken({
+        userId: user.id
+      });
 
       return { ...user, accessToken };
     }
@@ -576,7 +578,7 @@ export class UserService {
     userId
   }: {
     userId: string;
-  }): Promise<string> {
+  }): Promise<{ accessToken: string }> {
     const accessToken = this.createAccessToken(userId, getRandomString(10));
 
     const hashedAccessToken = this.createAccessToken(
@@ -589,6 +591,6 @@ export class UserService {
       where: { id: userId }
     });
 
-    return accessToken;
+    return { accessToken };
   }
 }
diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts
index 792e1f434..06bd8ef1a 100644
--- a/apps/client/src/app/components/admin-users/admin-users.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@@ -141,16 +141,15 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
     });
   }
 
-  public onGenerateSecurityToken(aId: string) {
+  public onGenerateAccessToken(aId: string) {
     this.notificationService.confirm({
       confirmFn: () => {
         this.dataService
-          .generateSecurityToken(aId)
+          .generateAccessToken(aId)
           .pipe(takeUntil(this.unsubscribeSubject))
           .subscribe(({ accessToken }) => {
-            this.notificationService.prompt({
-              confirmFn: () => undefined,
-              defaultValue: accessToken,
+            this.notificationService.alert({
+              message: accessToken,
               title: $localize`Security token`
             });
           });
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index 3424463e7..c70bbe0a1 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -243,7 +243,7 @@
                 }
                 <button
                   mat-menu-item
-                  (click)="onGenerateSecurityToken(element.id)"
+                  (click)="onGenerateAccessToken(element.id)"
                 >
                   <span class="align-items-center d-flex">
                     <ion-icon class="mr-2" name="key-outline" />
diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts
index 1621c6490..e8d94821d 100644
--- a/apps/client/src/app/services/data.service.ts
+++ b/apps/client/src/app/services/data.service.ts
@@ -22,7 +22,7 @@ import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import {
   Access,
-  AccessToken,
+  AccessTokenResponse,
   AccountBalancesResponse,
   Accounts,
   AiPromptResponse,
@@ -325,13 +325,6 @@ export class DataService {
     return this.http.delete<any>(`/api/v1/user/${aId}`);
   }
 
-  public generateSecurityToken(aId: string) {
-    return this.http.post<AccessToken>(
-      `/api/v1/user/${aId}/security-token`,
-      {}
-    );
-  }
-
   public fetchAccesses() {
     return this.http.get<Access[]>('/api/v1/access');
   }
@@ -699,6 +692,13 @@ export class DataService {
     return this.http.get<Tag[]>('/api/v1/tags');
   }
 
+  public generateAccessToken(aId: string) {
+    return this.http.post<AccessTokenResponse>(
+      `/api/v1/user/${aId}/access-token`,
+      {}
+    );
+  }
+
   public loginAnonymous(accessToken: string) {
     return this.http.post<OAuthResponse>('/api/v1/auth/anonymous', {
       accessToken
diff --git a/libs/common/src/lib/interfaces/access-token.interface.ts b/libs/common/src/lib/interfaces/access-token.interface.ts
deleted file mode 100644
index b5f37e2cf..000000000
--- a/libs/common/src/lib/interfaces/access-token.interface.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface AccessToken {
-  accessToken: string;
-}
diff --git a/libs/common/src/lib/interfaces/index.ts b/libs/common/src/lib/interfaces/index.ts
index 8663196fc..c93ab2d27 100644
--- a/libs/common/src/lib/interfaces/index.ts
+++ b/libs/common/src/lib/interfaces/index.ts
@@ -1,4 +1,3 @@
-import type { AccessToken } from './access-token.interface';
 import type { Access } from './access.interface';
 import type { AccountBalance } from './account-balance.interface';
 import type { Accounts } from './accounts.interface';
@@ -39,6 +38,7 @@ import type { PortfolioReportRule } from './portfolio-report-rule.interface';
 import type { PortfolioSummary } from './portfolio-summary.interface';
 import type { Position } from './position.interface';
 import type { Product } from './product';
+import type { AccessTokenResponse } from './responses/access-token-response.interface';
 import type { AccountBalancesResponse } from './responses/account-balances-response.interface';
 import type { AiPromptResponse } from './responses/ai-prompt-response.interface';
 import type { ApiKeyResponse } from './responses/api-key-response.interface';
@@ -70,7 +70,7 @@ import type { XRayRulesSettings } from './x-ray-rules-settings.interface';
 
 export {
   Access,
-  AccessToken,
+  AccessTokenResponse,
   AccountBalance,
   AccountBalancesResponse,
   Accounts,
diff --git a/libs/common/src/lib/interfaces/responses/access-token-response.interface.ts b/libs/common/src/lib/interfaces/responses/access-token-response.interface.ts
new file mode 100644
index 000000000..7aebaae27
--- /dev/null
+++ b/libs/common/src/lib/interfaces/responses/access-token-response.interface.ts
@@ -0,0 +1,3 @@
+export interface AccessTokenResponse {
+  accessToken: string;
+}