refactor: auth module

Author: Dzeranov

packages/apps/reputation-oracle/server/src/config/auth-config.service.ts

@@ -22,43 +22,47 @@ export class AuthConfigService {
   }
 
   /**
-   * The expiration time (in seconds) for access tokens.
-   * Default: 600
+   * The expiration time (in ms) for access tokens.
+   * Default: 600000
    */
   get accessTokenExpiresIn(): number {
-    return +this.configService.get<number>('JWT_ACCESS_TOKEN_EXPIRES_IN', 600);
+    return (
+      +this.configService.get<number>('JWT_ACCESS_TOKEN_EXPIRES_IN', 600) * 1000
+    );
   }
 
   /**
-   * The expiration time (in seconds) for refresh tokens.
-   * Default: 3600
+   * The expiration time (in ms) for refresh tokens.
+   * Default: 3600000
    */
   get refreshTokenExpiresIn(): number {
-    return +this.configService.get<number>(
-      'JWT_REFRESH_TOKEN_EXPIRES_IN',
-      3600,
+    return (
+      +this.configService.get<number>('JWT_REFRESH_TOKEN_EXPIRES_IN', 3600) *
+      1000
     );
   }
 
   /**
-   * The expiration time (in seconds) for email verification tokens.
-   * Default: 86400
+   * The expiration time (in ms) for email verification tokens.
+   * Default: 86400000
    */
   get verifyEmailTokenExpiresIn(): number {
-    return +this.configService.get<number>(
-      'VERIFY_EMAIL_TOKEN_EXPIRES_IN',
-      86400,
+    return (
+      +this.configService.get<number>('VERIFY_EMAIL_TOKEN_EXPIRES_IN', 86400) *
+      1000
     );
   }
 
   /**
-   * The expiration time (in seconds) for forgot password tokens.
-   * Default: 86400
+   * The expiration time (in ms) for forgot password tokens.
+   * Default: 86400000
    */
   get forgotPasswordExpiresIn(): number {
-    return +this.configService.get<number>(
-      'FORGOT_PASSWORD_TOKEN_EXPIRES_IN',
-      86400,
+    return (
+      +this.configService.get<number>(
+        'FORGOT_PASSWORD_TOKEN_EXPIRES_IN',
+        86400,
+      ) * 1000
     );
   }
 

packages/apps/reputation-oracle/server/src/modules/auth/auth.controller.ts

@@ -64,7 +64,7 @@ export class AuthController {
   @Post('/web2/signup')
   @HttpCode(200)
   async signup(@Body() data: Web2SignUpDto): Promise<void> {
-    await this.authService.signup(data);
+    await this.authService.signup(data.email, data.password);
   }
 
   @ApiOperation({
@@ -85,7 +85,10 @@ export class AuthController {
   @Post('/web3/signup')
   @HttpCode(200)
   async web3SignUp(@Body() data: Web3SignUpDto): Promise<SuccessAuthDto> {
-    const authTokens = await this.authService.web3Signup(data);
+    const authTokens = await this.authService.web3Signup(
+      data.signature,
+      data.address,
+    );
     return authTokens;
   }
 
@@ -104,7 +107,7 @@ export class AuthController {
   @Post('/web2/signin')
   @HttpCode(200)
   async signin(@Body() data: Web2SignInDto): Promise<SuccessAuthDto> {
-    const authTokens = await this.authService.signin(data);
+    const authTokens = await this.authService.signin(data.email, data.password);
     return authTokens;
   }
 
@@ -122,7 +125,10 @@ export class AuthController {
   @Post('/web3/signin')
   @HttpCode(200)
   async web3SignIn(@Body() data: Web3SignInDto): Promise<SuccessAuthDto> {
-    const authTokens = await this.authService.web3Signin(data);
+    const authTokens = await this.authService.web3Signin(
+      data.address,
+      data.signature,
+    );
     return authTokens;
   }
 
@@ -140,7 +146,7 @@ export class AuthController {
   @Post('/refresh')
   @HttpCode(200)
   async refreshToken(@Body() data: RefreshDto): Promise<SuccessAuthDto> {
-    const authTokens = await this.authService.refresh(data);
+    const authTokens = await this.authService.refresh(data.refreshToken);
     return authTokens;
   }
 
@@ -158,7 +164,7 @@ export class AuthController {
   @Post('/web2/forgot-password')
   @HttpCode(200)
   async forgotPassword(@Body() data: ForgotPasswordDto): Promise<void> {
-    await this.authService.forgotPassword(data);
+    await this.authService.forgotPassword(data.email);
   }
 
   @ApiOperation({
@@ -175,7 +181,7 @@ export class AuthController {
   @Post('/web2/restore-password')
   @HttpCode(200)
   async restorePassword(@Body() data: RestorePasswordDto): Promise<void> {
-    await this.authService.restorePassword(data);
+    await this.authService.restorePassword(data.password, data.token);
   }
 
   @ApiOperation({
@@ -191,7 +197,7 @@ export class AuthController {
   @Post('/web2/verify-email')
   @HttpCode(200)
   async emailVerification(@Body() data: VerifyEmailDto): Promise<void> {
-    await this.authService.emailVerification(data);
+    await this.authService.emailVerification(data.token);
   }
 
   @ApiOperation({
@@ -211,7 +217,7 @@ export class AuthController {
     @Req() request: RequestWithUser,
     @Body() data: ResendVerificationEmailDto,
   ): Promise<void> {
-    await this.authService.resendEmailVerification(request.user, data);
+    await this.authService.resendEmailVerification(request.user, data.email);
   }
 
   @ApiOperation({

packages/apps/reputation-oracle/server/src/modules/auth/auth.error.ts

@@ -19,7 +19,7 @@ export class AuthError extends BaseError {
 }
 
 export class InvalidOperatorSignupDataError extends BaseError {
-  constructor(public readonly detail: string) {
+  constructor(readonly detail: string) {
     super('Invalid operator signup data');
   }
 }
@@ -49,15 +49,15 @@ export class InvalidOperatorJobTypesError extends InvalidOperatorSignupDataError
 }
 
 export class DuplicatedUserEmailError extends BaseError {
-  constructor(public readonly email: string) {
+  constructor(readonly email: string) {
     super(
       'The email you are trying to use already exists. Please check that the email is correct or use a different email.',
     );
   }
 }
 
 export class DuplicatedUserAddressError extends BaseError {
-  constructor(public readonly address: string) {
+  constructor(readonly address: string) {
     super(
       'The address you are trying to use already exists. Please, use a different address.',
     );