Merge pull request #10 from TogetherCrew/eas-sdk

Eas sdk

Author: Behzad-rabiei

.husky/pre-commit

@@ -1 +1 @@
-npx lint-staged
+npx lint - staged

.husky/pre-push

@@ -1,2 +1,2 @@
-npm test
-npx lint-staged
+npm test 
+npx lint - staged

src/auth-siwe/dto/verify-siwe.dto.ts

@@ -1,7 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger'
 import { IsString, IsNotEmpty, IsNumber, IsIn } from 'class-validator'
 import { SignMessageReturnType, Hex } from 'viem'
-import { SUPPORTED_CHAIN_IDS } from '../../shared/constants/chain.constants'
+import { SUPPORTED_CHAINS } from '../../shared/constants/chain.constants'
 
 export class VerifySiweDto {
     @ApiProperty({
@@ -24,10 +24,10 @@ export class VerifySiweDto {
         description: 'Chain Id',
         example: '1',
         required: true,
-        enum: SUPPORTED_CHAIN_IDS,
+        enum: SUPPORTED_CHAINS,
     })
     @IsNumber()
     @IsNotEmpty()
-    @IsIn(SUPPORTED_CHAIN_IDS)
+    @IsIn(SUPPORTED_CHAINS)
     readonly chainId: number
 }

src/auth-siwe/siwe.service.spec.ts

@@ -9,13 +9,11 @@ describe('SiweService', () => {
     let publicClientMock: { verifySiweMessage: jest.Mock }
     let loggerMock: PinoLogger
 
-    beforeEach(async () => {
+    beforeAll(async () => {
         publicClientMock = {
             verifySiweMessage: jest.fn(),
         }
 
-        loggerMock = { error: jest.fn() } as unknown as PinoLogger
-
         const module: TestingModule = await Test.createTestingModule({
             imports: [LoggerModule.forRoot()],
             providers: [

src/auth-siwe/siwe.service.ts

@@ -28,12 +28,7 @@ export class SiweService {
                 throw new Error()
             }
         } catch (error) {
-            this.logger.error(
-                {
-                    error,
-                },
-                `Siwe Verification Failed`
-            )
+            this.logger.error(error, `Siwe Verification Failed`)
             throw new HttpException(
                 `${AUTH_PROVIDERS.SIWE} verification Failed`,
                 HttpStatus.BAD_REQUEST

src/auth/auth.service.spec.ts

@@ -6,29 +6,35 @@ import { ConfigService } from '@nestjs/config'
 import * as moment from 'moment'
 import { JwtPayload } from './types/jwt-payload.type'
 import * as jwt from 'jsonwebtoken'
+import { PinoLogger, LoggerModule } from 'nestjs-pino'
+import { BadRequestException } from '@nestjs/common'
+
+const mockPublicKey =
+    '0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdef'
+const mockJwtSecret = 'jwtSecret'
+const mockJwtExpiresIn = '60'
+
+const mockConfigService = {
+    get: jest.fn((key: string) => {
+        if (key === 'wallet.publicKey') return mockPublicKey
+        if (key === 'jwt.secret') return mockJwtSecret
+        if (key === 'jwt.expiresIn') return mockJwtExpiresIn
+    }),
+}
 
 describe('AuthService', () => {
     let service: AuthService
-    const mockPublicKey =
-        '0xabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdef'
-    const mockJwtSecret = 'jwtSecret'
-    const mockJwtExpiresIn = '60'
+    let loggerMock: PinoLogger
 
     beforeAll(async () => {
         const module: TestingModule = await Test.createTestingModule({
+            imports: [LoggerModule.forRoot()],
             providers: [
                 AuthService,
                 JwtService,
-                {
-                    provide: ConfigService,
-                    useValue: {
-                        get: jest.fn((key: string) => {
-                            if (key === 'wallet.publicKey') return mockPublicKey
-                            if (key === 'jwt.secret') return mockJwtSecret
-                            if (key === 'jwt.expiresIn') return mockJwtExpiresIn
-                        }),
-                    },
-                },
+                { provide: ConfigService, useValue: mockConfigService },
+                { provide: ConfigService, useValue: mockConfigService },
+                { provide: PinoLogger, useValue: loggerMock },
             ],
         }).compile()
 
@@ -76,7 +82,7 @@ describe('AuthService', () => {
         it('should return null if token is invalid', async () => {
             await expect(
                 service.validateToken('invalid.token.here')
-            ).rejects.toThrow(jwt.JsonWebTokenError)
+            ).rejects.toThrow(BadRequestException)
         })
     })
 })

src/auth/auth.service.ts

@@ -1,12 +1,17 @@
-import { Injectable } from '@nestjs/common'
+import { Injectable, BadRequestException } from '@nestjs/common'
 import * as jwt from 'jsonwebtoken'
 import { JwtPayload } from './types/jwt-payload.type'
 import { ConfigService } from '@nestjs/config'
+import { PinoLogger, InjectPinoLogger } from 'nestjs-pino'
 import * as moment from 'moment'
 
 @Injectable()
 export class AuthService {
-    constructor(private readonly configService: ConfigService) {}
+    constructor(
+        private readonly configService: ConfigService,
+        @InjectPinoLogger(AuthService.name)
+        private readonly logger: PinoLogger
+    ) {}
 
     async signPayload(payload: JwtPayload): Promise<string> {
         return jwt.sign(payload, this.configService.get<string>('jwt.secret'), {
@@ -15,9 +20,18 @@ export class AuthService {
     }
 
     async validateToken(token: string): Promise<JwtPayload> {
-        return jwt.verify(token, this.configService.get<string>('jwt.secret'), {
-            algorithms: ['HS256'],
-        }) as JwtPayload
+        try {
+            return jwt.verify(
+                token,
+                this.configService.get<string>('jwt.secret'),
+                {
+                    algorithms: ['HS256'],
+                }
+            ) as JwtPayload
+        } catch (error) {
+            this.logger.error(error, `Failed to validtae token`)
+            throw new BadRequestException(error.message)
+        }
     }
 
     async generateJwt(identifier: string, provider: string): Promise<string> {

src/auth/oAuth.service.ts

@@ -83,12 +83,7 @@ export class OAuthService {
             return response.data
         } catch (error) {
             this.logger.error(
-                {
-                    message: error.message,
-                    name: error.name,
-                    stack: error.stack,
-                    response: error.response?.data,
-                },
+                error,
                 `Failed to exchange ${provider} code for token`
             )
             throw new BadRequestException(
@@ -112,12 +107,7 @@ export class OAuthService {
             return response.data
         } catch (error) {
             this.logger.error(
-                {
-                    message: error.message,
-                    name: error.name,
-                    stack: error.stack,
-                    response: error.response?.data,
-                },
+                error,
                 `Failed to retrieve user information from ${provider}`
             )
             throw new BadRequestException(

src/eas/constants/attestation.constants.ts

@@ -26,6 +26,4 @@ export const REVOKE_TYPE = [
     { name: 'nonce', type: 'uint256' },
     { name: 'deadline', type: 'uint64' },
 ]
-export const SCHEMA_TYPES = parseAbiParameters(
-    'bytes32 key, string provider, string secret'
-)
+export const SCHEMA_TYPES = 'bytes32 key, string provider, string secret'

src/eas/eas.service.spec.ts

@@ -1,28 +1,31 @@
 import { Test, TestingModule } from '@nestjs/testing'
 import { EasService } from './eas.service'
-import { ViemUtilsService } from '../utils/viem.utils.service'
 import { ConfigService } from '@nestjs/config'
 import { generatePrivateKey } from 'viem/accounts'
 // import { EAS_SEPOLIA_CONTRACT_ADDRESS } from './constants/sepolia'
 // import { sepolia } from 'viem/chains'
+import { PinoLogger, LoggerModule } from 'nestjs-pino'
+import { EthersUtilsService } from '../utils/ethers.utils.service'
+const mockPrivateKey = generatePrivateKey()
+
+const mockConfigService = {
+    get: jest.fn((key: string) => {
+        if (key === 'wallet.privateKey') return mockPrivateKey
+    }),
+}
 
 describe('EasService', () => {
     let service: EasService
-    const mockPrivateKey = generatePrivateKey()
+    let loggerMock: PinoLogger
+
     beforeAll(async () => {
         const module: TestingModule = await Test.createTestingModule({
+            imports: [LoggerModule.forRoot()],
             providers: [
                 EasService,
-                ViemUtilsService,
-                {
-                    provide: ConfigService,
-                    useValue: {
-                        get: jest.fn((key: string) => {
-                            if (key === 'wallet.privateKey')
-                                return mockPrivateKey
-                        }),
-                    },
-                },
+                EthersUtilsService,
+                { provide: ConfigService, useValue: mockConfigService },
+                { provide: PinoLogger, useValue: loggerMock },
             ],
         }).compile()