Ham 8 backend implementation

packages/apps/human-app/server/.env.example

@@ -10,7 +10,7 @@ HCAPTCHA_LABELING_STATS_API_URL= # string
 HCAPTCHA_LABELING_VERIFY_API_URL= # string
 HCAPTCHA_LABELING_API_KEY= # string
 IS_AXIOS_REQUEST_LOGGING_ENABLED= #string, true if enabled, disabled otherwise
-# CACHE TTL VALUES
+# CACHE TTL VALUES - in seconds
 CACHE_TTL_ORACLE_DISCOVERY= # number, example: 43200
 CACHE_TTL_ORACLE_STATS= # number, example: 900
 CACHE_TTL_USER_STATS= # number, example: 86400
@@ -27,3 +27,4 @@ E2E_TESTING_ESCROW_CHAIN_ID= # number
 CORS_ALLOWED_ORIGIN= # string example: http://localhost:5173
 CORS_ALLOWED_HEADERS= # string, example: 'Content-Type,Authorization,X-Requested-With,Accept,Origin'
 CORS_ENABLED= # boolean, example: true
+IS_CACHE_TO_RESTART= # boolean, example: false

packages/apps/human-app/server/src/common/config/environment-config.service.ts

@@ -71,7 +71,7 @@ export class EnvironmentConfigService {
     return this.configService.getOrThrow<string>('RPC_URL');
   }
   get isCorsEnabled(): boolean {
-    return this.configService.get<boolean>('CORS_ENABLED', false);
+    return this.configService.get<string>('CORS_ENABLED') === 'true';
   }
   get corsEnabledOrigin(): string {
     return this.configService.get<string>(
@@ -107,4 +107,7 @@ export class EnvironmentConfigService {
     const chainIds = this.configService.getOrThrow<string>('CHAIN_IDS_ENABLED');
     return chainIds.split(',').map((id) => id.trim());
   }
+  get isCacheToRestart(): boolean {
+    return this.configService.get('IS_CACHE_TO_RESTART') === 'true';
+  }
 }

packages/apps/human-app/server/src/common/config/params-decorators.ts

@@ -1,4 +1,9 @@
-import { createParamDecorator, ExecutionContext, HttpException, UnauthorizedException } from '@nestjs/common';
+import {
+  BadRequestException,
+  createParamDecorator,
+  ExecutionContext,
+  UnauthorizedException,
+} from '@nestjs/common';
 import { jwtDecode } from 'jwt-decode';
 import { JwtUserData } from '../utils/jwt-token.model';
 
@@ -24,7 +29,7 @@ export const JwtPayload = createParamDecorator(
       return decoded as JwtUserData;
     } catch (error) {
       console.error('Error in decoding token: ', error);
-      return null;
+      throw new BadRequestException();
     }
   },
 );

packages/apps/human-app/server/src/common/utils/jwt-token.model.ts

@@ -4,7 +4,7 @@ export class JwtUserData {
   @AutoMap()
   userId: string;
   @AutoMap()
-  address: string;
+  wallet_address: string;
   @AutoMap()
   email: string;
   @AutoMap()

packages/apps/human-app/server/src/integrations/kv-store/kv-store.gateway.ts

@@ -48,11 +48,9 @@ export class KvStoreGateway {
         400,
       );
     } else {
-      await this.cacheManager.set(
-        this.cachePrefix + address,
-        fetchedUrl,
-        this.configService.cacheTtlExchangeOracleUrl,
-      );
+      await this.cacheManager.set(this.cachePrefix + address, fetchedUrl, {
+        ttl: this.configService.cacheTtlExchangeOracleUrl,
+      } as any);
       return fetchedUrl;
     }
   }

packages/apps/human-app/server/src/integrations/kv-store/spec/kv-store.gateway.spec.ts

@@ -96,7 +96,7 @@ describe('KvStoreGateway', () => {
       expect(cacheManager.set).toHaveBeenCalledWith(
         service.cachePrefix + testAddress,
         expectedUrl,
-        configService.cacheTtlExchangeOracleUrl,
+        { ttl: configService.cacheTtlExchangeOracleUrl },
       );
       expect(cacheManager.get).toHaveBeenCalledWith(service.cachePrefix + testAddress);
       expect(result).toBe(expectedUrl);

packages/apps/human-app/server/src/integrations/reputation-oracle/reputation-oracle.mapper.profile.ts

@@ -77,11 +77,23 @@ export class ReputationOracleProfile extends AutomapperProfile {
       createMap(mapper, PrepareSignatureCommand, PrepareSignatureData);
       createMap(mapper, SigninOperatorCommand, SigninOperatorData);
       createMap(mapper, DisableOperatorParams, DisableOperatorData);
-      createMap(mapper, ForgotPasswordCommand, ForgotPasswordData);
+      createMap(
+        mapper,
+        ForgotPasswordCommand,
+        ForgotPasswordData,
+        namingConventions({
+          source: new CamelCaseNamingConvention(),
+          destination: new SnakeCaseNamingConvention(),
+        }),
+      );
       createMap(
         mapper,
         ResendEmailVerificationParams,
         ResendEmailVerificationData,
+        namingConventions({
+          source: new CamelCaseNamingConvention(),
+          destination: new SnakeCaseNamingConvention(),
+        }),
       );
       createMap(mapper, EmailVerificationCommand, EmailVerificationData);
       createMap(

packages/apps/human-app/server/src/integrations/reputation-oracle/spec/reputation-oracle.gateway.spec.ts

@@ -21,7 +21,7 @@ import {
 import {
   emailVerificationCommandFixture,
   emailVerificationDataFixture,
-  resendEmailVerificationCommandFixture,
+  resendEmailVerificationCommandFixture, resendEmailVerificationDataFixture,
 } from '../../../modules/email-confirmation/spec/email-verification.fixtures';
 import {
   ResendEmailVerificationCommand,
@@ -358,9 +358,8 @@ describe('ReputationOracleGateway', () => {
     it('should successfully call the reputation oracle endpoint', async () => {
       const command: ResendEmailVerificationCommand =
         resendEmailVerificationCommandFixture;
-      const data: ResendEmailVerificationData = {
-        ...command.data,
-      };
+      const data: ResendEmailVerificationData =
+        resendEmailVerificationDataFixture;
       nock('https://example.com')
         .post('/auth/resend-email-verification', {
           ...data,

packages/apps/human-app/server/src/main.ts

@@ -5,6 +5,8 @@ import { ConfigService } from '@nestjs/config';
 import { Logger, ValidationPipe } from '@nestjs/common';
 import { EnvironmentConfigService } from './common/config/environment-config.service';
 import { GlobalExceptionsFilter } from './common/filter/global-exceptions.filter';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Cache } from 'cache-manager';
 
 async function bootstrap() {
   const logger = new Logger('bootstrap');
@@ -30,7 +32,10 @@ async function bootstrap() {
 
   const host = envConfigService.host;
   const port = envConfigService.port;
-
+  if (envConfigService.isCacheToRestart) {
+    const cacheManager: Cache = app.get<Cache>(CACHE_MANAGER);
+    await cacheManager.reset();
+  }
   app.useGlobalFilters(new GlobalExceptionsFilter());
   app.useGlobalPipes(new ValidationPipe({ transform: true }));
 

packages/apps/human-app/server/src/modules/email-confirmation/email-confirmation.mapper.profile.ts

@@ -1,6 +1,14 @@
 import { Injectable } from '@nestjs/common';
 import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import { createMap, forMember, Mapper, mapWith } from '@automapper/core';
+import {
+  CamelCaseNamingConvention,
+  createMap,
+  forMember,
+  Mapper,
+  mapWith,
+  namingConventions,
+  SnakeCaseNamingConvention,
+} from '@automapper/core';
 import {
   EmailVerificationCommand,
   EmailVerificationData,
@@ -41,6 +49,10 @@ export class EmailConfirmationProfile extends AutomapperProfile {
         mapper,
         ResendEmailVerificationDto,
         ResendEmailVerificationParams,
+        namingConventions({
+          destination: new CamelCaseNamingConvention(),
+          source: new SnakeCaseNamingConvention(),
+        }),
       );
       createMap(
         mapper,

packages/apps/human-app/server/src/modules/email-confirmation/model/resend-email-verification.model.ts

@@ -1,17 +1,23 @@
 import { AutoMap } from '@automapper/classes';
-import { IsEmail } from 'class-validator';
+import { IsEmail, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class ResendEmailVerificationDto {
   @AutoMap()
   @IsEmail()
   @ApiProperty({ example: 'string' })
   email: string;
+  @AutoMap()
+  @IsString()
+  @ApiProperty({ example: 'string' })
+  h_captcha_token: string;
 }
 
 export class ResendEmailVerificationParams {
   @AutoMap()
   email: string;
+  @AutoMap()
+  hCaptchaToken: string;
 }
 export class ResendEmailVerificationCommand {
   @AutoMap()
@@ -22,4 +28,6 @@ export class ResendEmailVerificationCommand {
 export class ResendEmailVerificationData {
   @AutoMap()
   email: string;
+  @AutoMap()
+  h_captcha_token: string;
 }

packages/apps/human-app/server/src/modules/email-confirmation/spec/email-verification.fixtures.ts

@@ -1,5 +1,5 @@
 import {
-  ResendEmailVerificationCommand,
+  ResendEmailVerificationCommand, ResendEmailVerificationData,
   ResendEmailVerificationDto,
   ResendEmailVerificationParams,
 } from '../model/resend-email-verification.model';
@@ -25,13 +25,19 @@ export const emailVerificationDataFixture: EmailVerificationData = {
 export const emailVerificationToken = TOKEN;
 export const resendEmailVerificationDtoFixture: ResendEmailVerificationDto = {
   email: EMAIL,
+  h_captcha_token: TOKEN,
 };
 export const resendEmailVerificationParamsFixture: ResendEmailVerificationParams =
   {
     email: EMAIL,
+    hCaptchaToken: TOKEN,
   };
 export const resendEmailVerificationCommandFixture: ResendEmailVerificationCommand =
   {
     data: resendEmailVerificationParamsFixture,
     token: TOKEN,
   };
+export const resendEmailVerificationDataFixture: ResendEmailVerificationData = {
+  email: EMAIL,
+  h_captcha_token: TOKEN,
+};

packages/apps/human-app/server/src/modules/h-captcha/h-captcha.mapper.profile.ts

@@ -51,7 +51,7 @@ export class HCaptchaMapperProfile extends AutomapperProfile {
         ),
         forMember(
           (destination) => destination.secret,
-          mapFrom((source) => source.address),
+          mapFrom((source) => source.wallet_address),
         ),
       );
     };

packages/apps/human-app/server/src/modules/h-captcha/h-captcha.service.ts

@@ -74,15 +74,16 @@ export class HCaptchaService {
   ): Promise<DailyHmtSpentResponse> {
     this.checkIfHcaptchaSitekeyPresent(command.siteKey);
     let dailyHmtSpent = await this.cacheManager.get<DailyHmtSpentResponse>(
-      this.dailyHmtSpentCacheKey
+      this.dailyHmtSpentCacheKey,
     );
     if (!dailyHmtSpent) {
       dailyHmtSpent = await this.hCaptchaLabelingGateway.fetchDailyHmtSpent();
       await this.cacheManager.set(
         this.dailyHmtSpentCacheKey,
         dailyHmtSpent,
-        this.configService.cacheTtlDailyHmtSpent,
-      );
+        {
+          ttl: this.configService.cacheTtlDailyHmtSpent,
+        } as any);
     }
     return dailyHmtSpent;
   }
@@ -97,7 +98,9 @@ export class HCaptchaService {
     await this.cacheManager.set(
       command.email,
       stats,
-      this.configService.cacheTtlHCaptchaUserStats,
+      {
+        ttl: this.configService.cacheTtlHCaptchaUserStats
+      } as any,
     );
     return stats;
   }

packages/apps/human-app/server/src/modules/h-captcha/spec/h-captcha.fixtures.ts

@@ -46,7 +46,7 @@ const EARNINGS_DATA_2 = { date: '2021-01-22', value: 209 } as DateValue;
 const SUCCESSFULLY_ENABLED = 'Enabled labeling for this account successfully';
 export const jwtUserDataFixture: JwtUserData = {
   userId: ID,
-  address: POLYGON_WALLET_ADDR,
+  wallet_address: POLYGON_WALLET_ADDR,
   email: EMAIL,
   kyc_status: 'APPROVED',
   site_key: H_CAPTCHA_SITE_KEY,

packages/apps/human-app/server/src/modules/h-captcha/spec/h-captcha.service.spec.ts

@@ -195,7 +195,7 @@ describe('HCaptchaService', () => {
       expect(cacheManager.set).toHaveBeenCalledWith(
         service.dailyHmtSpentCacheKey,
         dailyHmtSpentResponseFixture,
-        configService.cacheTtlDailyHmtSpent,
+        { ttl: configService.cacheTtlDailyHmtSpent },
       );
     });
   });
@@ -224,7 +224,7 @@ describe('HCaptchaService', () => {
       expect(cacheManager.set).toHaveBeenCalledWith(
         command.email,
         userStatsResponseFixture,
-        configService.cacheTtlHCaptchaUserStats,
+        { ttl: configService.cacheTtlHCaptchaUserStats },
       );
     });
   });

packages/apps/human-app/server/src/modules/oracle-discovery/oracle-discovery.service.ts

@@ -56,7 +56,9 @@ export class OracleDiscoveryService {
       await this.cacheManager.set(
         chainId,
         filteredOracles,
-        this.configService.cacheTtlOracleDiscovery,
+        {
+          ttl: this.configService.cacheTtlOracleDiscovery
+        } as any,
       );
       return filteredOracles;
     } catch (error) {

packages/apps/human-app/server/src/modules/oracle-discovery/spec/oracle-discovery.service.spec.ts

@@ -3,12 +3,16 @@ import { Cache } from 'cache-manager';
 import { OracleDiscoveryService } from '../oracle-discovery.service';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { OperatorUtils } from '@human-protocol/sdk';
-import { OracleDiscoveryCommand, OracleDiscoveryResponse } from '../model/oracle-discovery.model';
+import {
+  OracleDiscoveryCommand,
+  OracleDiscoveryResponse,
+} from '../model/oracle-discovery.model';
 import { EnvironmentConfigService } from '../../../common/config/environment-config.service';
 import { CommonConfigModule } from '../../../common/config/common-config.module';
 import { ConfigModule } from '@nestjs/config';
 import {
-  emptyCommandFixture, filledCommandFixture,
+  emptyCommandFixture,
+  filledCommandFixture,
   generateOracleDiscoveryResponseBody,
   notSetCommandFixture,
 } from './oracle-discovery.fixture';
@@ -101,11 +105,9 @@ describe('OracleDiscoveryService', () => {
     expect(result).toEqual([mockData[0]]);
     EXPECTED_CHAIN_IDS.forEach((chainId) => {
       expect(cacheManager.get).toHaveBeenCalledWith(chainId);
-      expect(cacheManager.set).toHaveBeenCalledWith(
-        chainId,
-        [mockData[0]],
-        TTL,
-      );
+      expect(cacheManager.set).toHaveBeenCalledWith(chainId, [mockData[0]], {
+        ttl: TTL,
+      });
       expect(OperatorUtils.getReputationNetworkOperators).toHaveBeenCalledWith(
         Number(chainId),
         REPUTATION_ORACLE_ADDRESS,

packages/apps/human-app/server/src/modules/password-reset/model/forgot-password.model.ts

@@ -1,20 +1,28 @@
 import { AutoMap } from '@automapper/classes';
-import { IsEmail } from 'class-validator';
+import { IsEmail, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class ForgotPasswordDto {
   @AutoMap()
   @IsEmail()
   @ApiProperty({ example: 'string' })
   email: string;
+  @AutoMap()
+  @IsString()
+  @ApiProperty({ example: 'string' })
+  h_captcha_token: string;
 }
 
 export class ForgotPasswordCommand {
   @AutoMap()
   email: string;
+  @AutoMap()
+  hCaptchaToken: string;
 }
 
 export class ForgotPasswordData {
   @AutoMap()
   email: string;
+  @AutoMap()
+  h_captcha_token: string;
 }

packages/apps/human-app/server/src/modules/password-reset/model/restore-password.model.ts

@@ -32,5 +32,5 @@ export class RestorePasswordData {
   @AutoMap()
   token: string;
   @AutoMap()
-  h_captcha_token: string;
+  hCaptchaToken: string;
 }

packages/apps/human-app/server/src/modules/password-reset/password-reset.controller.ts

@@ -48,9 +48,7 @@ export class PasswordResetController {
     summary: 'Endpoint to restore the user password after reset',
   })
   @UsePipes(new ValidationPipe())
-  public async restorePassword(
-    @Body() dto: RestorePasswordDto,
-  ): Promise<void> {
+  public async restorePassword(@Body() dto: RestorePasswordDto): Promise<void> {
     const command = this.mapper.map(
       dto,
       RestorePasswordDto,