Browse Source

reformat with prettier

pull/2771/head
Fares Eidi 2 years ago
committed by Thomas Kaul
parent
commit
07723bb583
  1. 5
      apps/api/src/app/access/access.controller.ts
  2. 5
      apps/api/src/app/account-balance/account-balance.controller.ts
  3. 3
      apps/api/src/app/account/account.controller.ts
  4. 10
      apps/api/src/app/admin/admin.controller.ts
  5. 4
      apps/api/src/app/app.module.ts
  6. 8
      apps/api/src/app/auth-device/auth-device.controller.ts
  7. 2
      apps/api/src/app/benchmark/benchmark.controller.ts
  8. 15
      apps/api/src/app/cache/cache.controller.ts
  9. 5
      apps/api/src/app/order/order.controller.ts
  10. 3
      apps/api/src/app/user/user.controller.ts
  11. 6
      apps/api/src/guards/has-permission.guard.ts

5
apps/api/src/app/access/access.controller.ts

@ -79,10 +79,7 @@ export class AccessController {
public async deleteAccess(@Param('id') id: string): Promise<AccessModel> {
const access = await this.accessService.access({ id });
if (
!access ||
access.userId !== this.request.user.id
) {
if (!access || access.userId !== this.request.user.id) {
throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN),
StatusCodes.FORBIDDEN

5
apps/api/src/app/account-balance/account-balance.controller.ts

@ -34,10 +34,7 @@ export class AccountBalanceController {
id
});
if (
!accountBalance ||
accountBalance.userId !== this.request.user.id
) {
if (!accountBalance || accountBalance.userId !== this.request.user.id) {
throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN),
StatusCodes.FORBIDDEN

3
apps/api/src/app/account/account.controller.ts

@ -132,7 +132,6 @@ export class AccountController {
public async createAccount(
@Body() data: CreateAccountDto
): Promise<AccountModel> {
if (data.platformId) {
const platformId = data.platformId;
delete data.platformId;
@ -164,7 +163,6 @@ export class AccountController {
public async transferAccountBalance(
@Body() { accountIdFrom, accountIdTo, balance }: TransferBalanceDto
) {
const accountsOfUser = await this.accountService.getAccounts(
this.request.user.id
);
@ -217,7 +215,6 @@ export class AccountController {
@UseGuards(AuthGuard('jwt'))
@HasPermission(permissions.updateAccount)
public async update(@Param('id') id: string, @Body() data: UpdateAccountDto) {
const originalAccount = await this.accountService.account({
id_userId: {
id,

10
apps/api/src/app/admin/admin.controller.ts

@ -70,14 +70,14 @@ export class AdminController {
@UseGuards(AuthGuard('jwt'))
@HasPermission(permissions.accessAdminControl)
public async gather7Days(): Promise<void> {
this.dataGatheringService.gather7Days();
this.dataGatheringService.gather7Days();
}
@Post('gather/max')
@UseGuards(AuthGuard('jwt'))
@HasPermission(permissions.accessAdminControl)
public async gatherMax(): Promise<void> {
const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
await this.dataGatheringService.addJobsToQueue(
uniqueAssets.map(({ dataSource, symbol }) => {
@ -161,7 +161,7 @@ export class AdminController {
@Param('dateString') dateString: string,
@Param('symbol') symbol: string
): Promise<MarketData> {
const date = parseISO(dateString);
const date = parseISO(dateString);
if (!isDate(date)) {
throw new HttpException(
@ -189,7 +189,7 @@ export class AdminController {
@Query('sortDirection') sortDirection?: Prisma.SortOrder,
@Query('take') take?: number
): Promise<AdminMarketData> {
const filters = this.apiService.buildFiltersFromQueryParams({
const filters = this.apiService.buildFiltersFromQueryParams({
filterByAssetSubClasses,
filterBySearchQuery
});
@ -222,7 +222,7 @@ export class AdminController {
@Param('dataSource') dataSource: DataSource,
@Param('symbol') symbol: string
) {
const dataBulkUpdate: Prisma.MarketDataUpdateInput[] = data.marketData.map(
const dataBulkUpdate: Prisma.MarketDataUpdateInput[] = data.marketData.map(
({ date, marketPrice }) => ({
dataSource,
marketPrice,

4
apps/api/src/app/app.module.ts

@ -93,7 +93,7 @@ import { HasPermissionGuard } from '../guards/has-permission.guard';
if (SUPPORTED_LANGUAGE_CODES.includes(code)) {
languageCode = code;
}
} catch { }
} catch {}
res.set('Location', `/${languageCode}`);
res.statusCode = StatusCodes.MOVED_PERMANENTLY;
@ -117,4 +117,4 @@ import { HasPermissionGuard } from '../guards/has-permission.guard';
}
]
})
export class AppModule { }
export class AppModule {}

8
apps/api/src/app/auth-device/auth-device.controller.ts

@ -2,13 +2,7 @@ import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.s
import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
import { permissions } from '@ghostfolio/common/permissions';
import type { RequestWithUser } from '@ghostfolio/common/types';
import {
Controller,
Delete,
Inject,
Param,
UseGuards
} from '@nestjs/common';
import { Controller, Delete, Inject, Param, UseGuards } from '@nestjs/common';
import { REQUEST } from '@nestjs/core';
import { AuthGuard } from '@nestjs/passport';

2
apps/api/src/app/benchmark/benchmark.controller.ts

@ -52,7 +52,7 @@ export class BenchmarkController {
}
return benchmark;
} catch {
} catch {
throw new HttpException(
getReasonPhrase(StatusCodes.INTERNAL_SERVER_ERROR),
StatusCodes.INTERNAL_SERVER_ERROR

15
apps/api/src/app/cache/cache.controller.ts

@ -2,27 +2,20 @@ import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.s
import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
import { permissions } from '@ghostfolio/common/permissions';
import type { RequestWithUser } from '@ghostfolio/common/types';
import {
Controller,
Inject,
Post,
UseGuards
} from '@nestjs/common';
import { Controller, Inject, Post, UseGuards } from '@nestjs/common';
import { REQUEST } from '@nestjs/core';
import { AuthGuard } from '@nestjs/passport';
@Controller('cache')
export class CacheController {
public constructor(
private readonly redisCacheService: RedisCacheService,
@Inject(REQUEST) private readonly request: RequestWithUser
) { }
private readonly redisCacheService: RedisCacheService,
@Inject(REQUEST) private readonly request: RequestWithUser
) {}
@Post('flush')
@UseGuards(AuthGuard('jwt'))
@HasPermission(permissions.accessAdminControl) // permission needed
public async flushCache(): Promise<void> {
return this.redisCacheService.reset();
}

5
apps/api/src/app/order/order.controller.ts

@ -164,10 +164,7 @@ export class OrderController {
id
});
if (
!originalOrder ||
originalOrder.userId !== this.request.user.id
) {
if (!originalOrder || originalOrder.userId !== this.request.user.id) {
throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN),
StatusCodes.FORBIDDEN

3
apps/api/src/app/user/user.controller.ts

@ -40,8 +40,7 @@ export class UserController {
@UseGuards(AuthGuard('jwt'))
@HasPermission(permissions.deleteUser)
public async deleteUser(@Param('id') id: string): Promise<UserModel> {
if (id === this.request.user.id
) {
if (id === this.request.user.id) {
throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN),
StatusCodes.FORBIDDEN

6
apps/api/src/guards/has-permission.guard.ts

@ -11,11 +11,9 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes';
@Injectable()
export class HasPermissionGuard implements CanActivate {
public constructor(private reflector: Reflector) {
}
public constructor(private reflector: Reflector) {}
public canActivate(context: ExecutionContext): boolean {
const { user } = context.switchToHttp().getRequest();
const requiredPermission = this.reflector.get<string>(
HAS_PERMISSION_KEY,
@ -26,8 +24,6 @@ export class HasPermissionGuard implements CanActivate {
return true; // No specific permissions required
}
if (!user || !hasPermission(user.permissions, requiredPermission)) {
throw new HttpException(
getReasonPhrase(StatusCodes.FORBIDDEN),

Loading…
Cancel
Save