Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Mapper } from '@automapper/core';
import { InjectMapper } from '@automapper/nestjs';
import { HttpService } from '@nestjs/axios';
import { Injectable } from '@nestjs/common';
import { AxiosRequestConfig } from 'axios';
import { AxiosError, AxiosRequestConfig } from 'axios';
import { lastValueFrom } from 'rxjs';
import { HttpMethod } from '../../common/enums/http-method';
import { toCleanObjParams } from '../../common/utils/gateway-common.utils';
Expand Down Expand Up @@ -61,12 +61,18 @@ export class ExchangeOracleGateway {
const response = await lastValueFrom(this.httpService.request(options));
return response.data as T;
} catch (error) {
this.logger.error('Error while executing exchange oracle API call', {
url: options.url,
method: options.method,
data: options.data,
error: errorUtils.formatError(error),
});
if (
error instanceof AxiosError &&
error.response?.status &&
error.response.status >= 500
) {
this.logger.error('Error while executing exchange oracle API call', {
url: options.url,
method: options.method,
data: options.data,
error: errorUtils.formatError(error),
});
}
throw error;
}
}
Expand Down
34 changes: 0 additions & 34 deletions packages/apps/reputation-oracle/server/.eslintrc.js

This file was deleted.

58 changes: 58 additions & 0 deletions packages/apps/reputation-oracle/server/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// @ts-check
import eslint from '@eslint/js';
import globals from 'globals';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import * as importPlugin from 'eslint-plugin-import';
import tseslint from 'typescript-eslint';

export default tseslint.config(
{
ignores: ['eslint.config.mjs', 'dist'],
},
eslint.configs.recommended,
tseslint.configs.recommended,
eslintPluginPrettierRecommended,
{
languageOptions: {
globals: {
...globals.node,
...globals.jest,
},
sourceType: 'module',
parserOptions: {
projectService: true,
tsconfigRootDir: import.meta.dirname,
},
},
plugins: {
'import': importPlugin,
},
rules: {
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-floating-promises': 'warn',
'@typescript-eslint/no-unsafe-argument': 'warn',
'@typescript-eslint/no-unused-vars': ['error', {
"args": "all",
"argsIgnorePattern": "^_",
"caughtErrors": "all",
"caughtErrorsIgnorePattern": "^noop",
"destructuredArrayIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"ignoreRestSiblings": true
}],
'import/order': [
'warn',
{
alphabetize: { order: 'asc', caseInsensitive: true },
'newlines-between': 'always',
groups: ['builtin', 'external', 'internal', ['parent', 'sibling', 'index']],
},
],
},
settings: {
'import/resolver': {
typescript: {},
},
},
},
);
15 changes: 7 additions & 8 deletions packages/apps/reputation-oracle/server/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
import { createDefaultPreset } from 'ts-jest';
import { createDefaultPreset, pathsToModuleNameMapper } from 'ts-jest';

import { compilerOptions } from './tsconfig.json';

process.env['GIT_HASH'] = 'test_value_hardcoded_in_jest_config';

const jestTsPreset = createDefaultPreset({});

module.exports = {
...jestTsPreset,
coverageDirectory: '../coverage',
collectCoverageFrom: ['**/*.(t|j)s'],
moduleFileExtensions: ['js', 'json', 'ts'],
rootDir: 'src',
roots: ['<rootDir>/src'],
testEnvironment: 'node',
testRegex: '.*\\.spec\\.ts$',
moduleNameMapper: {
'^uuid$': require.resolve('uuid'),
'^typeorm$': require.resolve('typeorm'),
},
modulePaths: [compilerOptions.baseUrl],

moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths),
clearMocks: true,
};
34 changes: 18 additions & 16 deletions packages/apps/reputation-oracle/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,20 @@
"start:dev": "nest start --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node dist/src/main",
"migration:create": "yarn build && typeorm-ts-node-commonjs migration:create",
"migration:generate": "yarn build && typeorm-ts-node-commonjs migration:generate -d typeorm-migrations-datasource.ts",
"migration:revert": "yarn build && typeorm-ts-node-commonjs migration:revert -d typeorm-migrations-datasource.ts",
"migration:run": "yarn build && typeorm-ts-node-commonjs migration:run -d typeorm-migrations-datasource.ts",
"migration:show": "yarn build && typeorm-ts-node-commonjs migration:show -d typeorm-migrations-datasource.ts",
"migration:create": "yarn typeorm migration:create",
"migration:generate": "yarn typeorm migration:generate -d typeorm-migrations-datasource.ts",
"migration:revert": "yarn typeorm migration:revert -d typeorm-migrations-datasource.ts",
"migration:run": "yarn typeorm migration:run -d typeorm-migrations-datasource.ts",
"migration:show": "yarn typeorm migration:show -d typeorm-migrations-datasource.ts",
"setup:local": "ts-node ./scripts/setup-staking.ts && LOCAL=true yarn setup:kvstore",
"setup:kvstore": "ts-node ./scripts/setup-kv-store.ts",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"lint": "eslint \"{src,test}/**/*.ts\" --fix",
"test": "jest",
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"generate-env-doc": "ts-node scripts/generate-env-doc.ts"
"generate-env-doc": "ts-node scripts/generate-env-doc.ts",
"typeorm": "typeorm-ts-node-commonjs"
},
"dependencies": {
"@human-protocol/core": "workspace:*",
Expand All @@ -39,7 +40,6 @@
"@nestjs/passport": "^10.0.0",
"@nestjs/platform-express": "^10.3.10",
"@nestjs/schedule": "^4.0.1",
"@nestjs/serve-static": "^4.0.2",
"@nestjs/swagger": "^7.4.2",
"@nestjs/terminus": "^11.0.0",
"@nestjs/typeorm": "^10.0.1",
Expand Down Expand Up @@ -71,6 +71,7 @@
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@eslint/js": "^9.33.0",
"@faker-js/faker": "^9.4.0",
"@golevelup/ts-jest": "^0.6.1",
"@nestjs/cli": "^10.3.2",
Expand All @@ -83,20 +84,21 @@
"@types/node": "22.10.5",
"@types/uuid": "^10.0.0",
"@types/zxcvbn": "4.4.5",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint": "^9.33.0",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-prettier": "^5.5.4",
"globals": "^16.3.0",
"jest": "29.7.0",
"nock": "^14.0.3",
"prettier": "^3.4.2",
"source-map-support": "^0.5.20",
"ts-jest": "29.2.5",
"ts-node": "^10.9.2",
"tsconfig-paths": "4.2.0",
"tsconfig-paths": "^4.2.0",
"type-fest": "^4.37.0",
"typescript": "^5.6.3"
"typescript": "^5.9.2",
"typescript-eslint": "^8.39.1"
},
"lint-staged": {
"*.ts": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Controller, Get, Redirect } from '@nestjs/common';
import { ApiExcludeEndpoint } from '@nestjs/swagger';

import { Public } from './common/decorators';

@Controller()
Expand Down
23 changes: 6 additions & 17 deletions packages/apps/reputation-oracle/server/src/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
import { ClassSerializerInterceptor, Module } from '@nestjs/common';
import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
import { ConfigModule } from '@nestjs/config';
import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
import { ScheduleModule } from '@nestjs/schedule';
import { ServeStaticModule } from '@nestjs/serve-static';
import { join } from 'path';

import { AppController } from './app.controller';
import { JwtAuthGuard } from './common/guards';
import { ExceptionFilter } from './common/filters/exception.filter';
import { JwtAuthGuard } from './common/guards';
import { TransformInterceptor } from './common/interceptors/transform.interceptor';
import { HttpValidationPipe } from './common/pipes';
import { envValidator, EnvConfigModule } from './config';
import { DatabaseModule } from './database';

import { AbuseModule } from './modules/abuse';
import { AuthModule } from './modules/auth';
import { CronJobModule } from './modules/cron-job';
import { EscrowCompletionModule } from './modules/escrow-completion';
import { HealthModule } from './modules/health';
import {
IncomingWebhookModule,
OutgoingWebhookModule,
} from './modules/webhook';
import { KycModule } from './modules/kyc';
import { NDAModule } from './modules/nda';
import { QualificationModule } from './modules/qualification';
import { ReputationModule } from './modules/reputation';
import { UserModule } from './modules/user';

import {
IncomingWebhookModule,
OutgoingWebhookModule,
} from './modules/webhook';
import Environment from './utils/environment';

@Module({
Expand Down Expand Up @@ -62,13 +58,6 @@ import Environment from './utils/environment';
],
imports: [
ScheduleModule.forRoot(),
ServeStaticModule.forRoot({
rootPath: join(
__dirname,
'../../../../../../',
'node_modules/swagger-ui-dist',
),
}),
ConfigModule.forRoot({
/**
* First value found takes precendece
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Reflector } from '@nestjs/core';
import { UserRole } from '../../modules/user';

import { UserRole } from '@/common/enums';

/**
* Decorator for HTTP endpoints to bypass JWT auth guard
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './collection';
export * from './http';
export * from './manifest';
export * from './user';
export * from './web3';
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,15 @@ export enum KycStatus {
EXPIRED = 'expired',
ABANDONED = 'abandoned',
}

export enum UserStatus {
ACTIVE = 'active',
PENDING = 'pending',
INACTIVE = 'inactive',
}

export enum UserRole {
OPERATOR = 'operator',
WORKER = 'worker',
ADMIN = 'admin',
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ import {
HttpException,
} from '@nestjs/common';
import { Request, Response } from 'express';
import { DatabaseError, isDuplicatedError } from '../../database';
import logger from '../../logger';
import { transformKeysFromCamelToSnake } from '../../utils/case-converters';

import { DatabaseError, isDuplicatedError } from '@/database';
import logger from '@/logger';
import { transformKeysFromCamelToSnake } from '@/utils/case-converters';

@Catch()
export class ExceptionFilter implements IExceptionFilter {
private readonly logger = logger.child({ context: ExceptionFilter.name });

catch(exception: any, host: ArgumentsHost) {
catch(exception: unknown, host: ArgumentsHost) {
const ctx = host.switchToHttp();
const response = ctx.getResponse<Response>();
const request = ctx.getRequest<Request>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import {
} from '@nestjs/common';
import { Reflector } from '@nestjs/core';
import { AuthGuard } from '@nestjs/passport';
import { JWT_STRATEGY_NAME } from '../constants';
import { Public } from '../decorators';

import { JWT_STRATEGY_NAME } from '@/common/constants';
import { Public } from '@/common/decorators';

@Injectable()
export class JwtAuthGuard extends AuthGuard(JWT_STRATEGY_NAME) {
Expand All @@ -28,6 +29,7 @@ export class JwtAuthGuard extends AuthGuard(JWT_STRATEGY_NAME) {
return super.canActivate(context);
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
handleRequest(error: any, user: any) {
if (error) {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import {
HttpException,
} from '@nestjs/common';
import { Reflector } from '@nestjs/core';
import { Roles } from '../decorators';

import { Roles } from '@/common/decorators';
import type { UserRole } from '@/common/enums';
import type { RequestWithUser } from '@/common/types';

@Injectable()
export class RolesAuthGuard implements CanActivate {
Expand All @@ -28,9 +31,9 @@ export class RolesAuthGuard implements CanActivate {
);
}

const { user } = context.switchToHttp().getRequest();
const { user } = context.switchToHttp().getRequest() as RequestWithUser;

if (allowedRoles.includes(user.role)) {
if (allowedRoles.includes(user.role as UserRole)) {
return true;
}

Expand Down
Loading
Loading