@ripwords/myinvois-client 0.0.5 → 0.0.7

package/src/utils/MyInvoisClient.ts

@@ -1,5 +1,3 @@
-import { ofetch } from 'ofetch/node'
-
 interface TokenResponse {
   access_token: string
   expires_in: number
@@ -9,6 +7,7 @@ export class MyInvoisClient {
   private readonly baseUrl: string
   private readonly clientId: string
   private readonly clientSecret: string
+  private readonly debug: boolean
   private token = ''
   private tokenExpiration: Date | undefined
 
@@ -16,58 +15,63 @@ export class MyInvoisClient {
     clientId: string,
     clientSecret: string,
     environment: 'sandbox' | 'production',
+    debug: boolean = false,
   ) {
     this.clientId = clientId
     this.clientSecret = clientSecret
-
+    this.debug = debug
     if (environment === 'sandbox') {
-      this.baseUrl = 'https://preprod-mytax.hasil.gov.my'
+      this.baseUrl = 'https://preprod-api.myinvois.hasil.gov.my'
     } else {
-      this.baseUrl = 'https://mytax.hasil.gov.my'
+      this.baseUrl = 'https://api.myinvois.hasil.gov.my'
     }
   }
 
   private async refreshToken() {
-    const tokenResponse = await ofetch<TokenResponse>(
-      `${this.baseUrl}/connect/token`,
-      {
+    try {
+      const response = await fetch(`${this.baseUrl}/connect/token`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
         },
-        body: {
+        body: new URLSearchParams({
           grant_type: 'client_credentials',
           client_id: this.clientId,
           client_secret: this.clientSecret,
           scope: 'InvoicingAPI',
-        },
-      },
-    )
+        }),
+      })
+
+      const tokenResponse: TokenResponse = await response.json()
 
-    this.token = tokenResponse.access_token
-    this.tokenExpiration = new Date(
-      Date.now() + tokenResponse.expires_in * 1000,
-    )
+      this.token = tokenResponse.access_token
+      this.tokenExpiration = new Date(
+        Date.now() + tokenResponse.expires_in * 1000,
+      )
+    } catch (error) {
+      if (this.debug) {
+        console.error(error)
+      }
+    }
   }
 
   private async getToken() {
     if (!this.tokenExpiration || this.tokenExpiration < new Date()) {
+      if (this.debug) {
+        console.log('Refreshing token')
+      }
       await this.refreshToken()
     }
 
     return this.token
   }
 
-  private async fetch<T>(
-    path: string,
-    options: Parameters<typeof ofetch>[1] = {},
-  ) {
+  private async fetch(path: string, options: Parameters<typeof fetch>[1] = {}) {
     const token = await this.getToken()
 
-    return ofetch<T>(`${this.baseUrl}${path}`, {
+    return fetch(`${this.baseUrl}${path}`, {
       ...options,
       headers: { ...options.headers, Authorization: `Bearer ${token}` },
-      responseType: 'json',
     })
   }
 
@@ -80,15 +84,22 @@ export class MyInvoisClient {
    */
   async verifyTin(tin: string, nric: string) {
     try {
-      await this.fetch<void>(
+      const response = await this.fetch(
         `/api/v1.0/taxpayer/validate/${tin}?idType=NRIC&idValue=${nric}`,
         {
           method: 'GET',
         },
       )
 
-      return true
-    } catch {
+      if (response.status === 200) {
+        return true
+      }
+
+      return false
+    } catch (error) {
+      if (this.debug) {
+        console.error(error)
+      }
       return false
     }
   }

package/test/MyInvoiClientRealData.test.ts

@@ -0,0 +1,19 @@
+import { describe, it, expect } from 'vitest'
+import { MyInvoisClient } from '../src/utils/MyInvoisClient'
+
+describe('MyInvoisClientRealData', () => {
+  it('should verify TIN with real data', async () => {
+    const client = new MyInvoisClient(
+      process.env.CLIENT_ID!,
+      process.env.CLIENT_SECRET!,
+      'sandbox',
+    )
+    // @ts-ignore
+    await client.refreshToken()
+    const result = await client.verifyTin(
+      process.env.TIN_VALUE!,
+      process.env.NRIC_VALUE!,
+    )
+    expect(result).toBe(true)
+  })
+})

package/test/MyInvoisClient.test.ts

@@ -1,10 +1,9 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { MyInvoisClient } from '../src/utils/MyInvoisClient'
-import { ofetch } from 'ofetch/node'
 
-vi.mock('ofetch', () => ({
-  ofetch: vi.fn(),
-}))
+// Mock global fetch
+const mockFetch = vi.fn()
+vi.stubGlobal('fetch', mockFetch)
 
 vi.useFakeTimers()
 
@@ -13,28 +12,32 @@ describe('MyInvoisClient', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    client = new MyInvoisClient('test-id', 'test-secret', 'sandbox')
+    client = new MyInvoisClient('test-id', 'test-secret', 'sandbox', false)
   })
 
   describe('constructor', () => {
     it('should set sandbox URL when environment is sandbox', () => {
       const sandboxClient = new MyInvoisClient(
-        process.env.CLIENT_ID!,
-        process.env.CLIENT_SECRET!,
+        'test-id',
+        'test-secret',
         'sandbox',
+        true,
       )
       expect((sandboxClient as any).baseUrl).toBe(
-        'https://preprod-mytax.hasil.gov.my',
+        'https://preprod-api.myinvois.hasil.gov.my',
       )
     })
 
     it('should set production URL when environment is production', () => {
       const prodClient = new MyInvoisClient(
-        process.env.CLIENT_ID!,
-        process.env.CLIENT_SECRET!,
+        'test-id',
+        'test-secret',
         'production',
+        true,
+      )
+      expect((prodClient as any).baseUrl).toBe(
+        'https://api.myinvois.hasil.gov.my',
       )
-      expect((prodClient as any).baseUrl).toBe('https://mytax.hasil.gov.my')
     })
   })
 
@@ -45,12 +48,15 @@ describe('MyInvoisClient', () => {
         expires_in: 3600,
       }
 
-      vi.mocked(ofetch).mockResolvedValueOnce(mockToken)
+      mockFetch.mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve(mockToken),
+      } as Response)
 
       await client.verifyTin('123', '456')
 
-      expect(ofetch).toHaveBeenCalledWith(
-        'https://preprod-mytax.hasil.gov.my/connect/token',
+      expect(mockFetch).toHaveBeenCalledWith(
+        'https://preprod-api.myinvois.hasil.gov.my/connect/token',
         expect.any(Object),
       )
     })
@@ -60,41 +66,46 @@ describe('MyInvoisClient', () => {
         access_token: 'test-token',
         expires_in: 3600,
       }
-      vi.advanceTimersByTime(8000)
-      vi.mocked(ofetch)
-        .mockResolvedValueOnce(mockToken)
-        .mockResolvedValueOnce(undefined)
+
+      mockFetch
+        .mockResolvedValueOnce({
+          ok: true,
+          json: () => Promise.resolve(mockToken),
+        } as Response)
+        .mockResolvedValueOnce({
+          ok: true,
+          json: () => Promise.resolve(undefined),
+        } as Response)
 
       await client.verifyTin('123', '456')
 
       // Check first call (token request)
-      expect(ofetch).toHaveBeenNthCalledWith(
+      expect(mockFetch).toHaveBeenNthCalledWith(
         1,
-        'https://preprod-mytax.hasil.gov.my/connect/token',
+        'https://preprod-api.myinvois.hasil.gov.my/connect/token',
         {
           method: 'POST',
           headers: {
             'Content-Type': 'application/x-www-form-urlencoded',
           },
-          body: {
+          body: new URLSearchParams({
             grant_type: 'client_credentials',
             client_id: 'test-id',
             client_secret: 'test-secret',
             scope: 'InvoicingAPI',
-          },
+          }),
         },
       )
 
       // Check second call (verifyTin request)
-      expect(ofetch).toHaveBeenNthCalledWith(
+      expect(mockFetch).toHaveBeenNthCalledWith(
         2,
-        `https://preprod-mytax.hasil.gov.my/api/v1.0/taxpayer/validate/123?idType=NRIC&idValue=456`,
+        `https://preprod-api.myinvois.hasil.gov.my/api/v1.0/taxpayer/validate/123?idType=NRIC&idValue=456`,
         {
           method: 'GET',
           headers: {
             Authorization: `Bearer ${mockToken.access_token}`,
           },
-          responseType: 'json',
         },
       )
     })
@@ -105,7 +116,10 @@ describe('MyInvoisClient', () => {
         expires_in: 3600,
       }
 
-      vi.mocked(ofetch).mockResolvedValueOnce(mockToken)
+      mockFetch.mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve(mockToken),
+      } as Response)
 
       // First call to get token
       await client.verifyTin(process.env.TIN_VALUE!, process.env.NRIC_VALUE!)
@@ -116,8 +130,8 @@ describe('MyInvoisClient', () => {
       await client.verifyTin(process.env.TIN_VALUE!, process.env.NRIC_VALUE!)
 
       // Token endpoint should only be called once
-      expect(ofetch).toHaveBeenCalledWith(
-        'https://preprod-mytax.hasil.gov.my/connect/token',
+      expect(mockFetch).toHaveBeenCalledWith(
+        'https://preprod-api.myinvois.hasil.gov.my/connect/token',
         expect.any(Object),
       )
     })
@@ -130,15 +144,22 @@ describe('MyInvoisClient', () => {
         expires_in: 3600,
       }
 
-      vi.mocked(ofetch)
-        .mockResolvedValueOnce(mockToken) // Token call
-        .mockResolvedValueOnce(undefined) // Verify call
+      mockFetch
+        .mockResolvedValueOnce({
+          ok: true,
+          json: () => Promise.resolve(mockToken),
+        } as Response)
+        .mockResolvedValueOnce({
+          ok: true,
+          json: () => Promise.resolve(undefined),
+        } as Response)
 
-      const result = await client.verifyTin('123', '456')
-      expect(result).toBe(true)
+      await client.verifyTin('123', '456')
+      vi.setSystemTime(new Date(Date.now() + 1000 * 8000))
+      await client.verifyTin('123', '456')
 
-      expect(ofetch).toHaveBeenCalledWith(
-        `https://preprod-mytax.hasil.gov.my/api/v1.0/taxpayer/validate/123?idType=NRIC&idValue=456`,
+      expect(mockFetch).toHaveBeenCalledWith(
+        `https://preprod-api.myinvois.hasil.gov.my/api/v1.0/taxpayer/validate/123?idType=NRIC&idValue=456`,
         expect.objectContaining({
           method: 'GET',
           headers: {
@@ -154,9 +175,12 @@ describe('MyInvoisClient', () => {
         expires_in: 3600,
       }
 
-      vi.mocked(ofetch)
-        .mockResolvedValueOnce(mockToken) // Token call
-        .mockRejectedValueOnce(new Error('Invalid TIN')) // Verify call
+      mockFetch
+        .mockResolvedValueOnce({
+          ok: true,
+          json: () => Promise.resolve(mockToken),
+        } as Response)
+        .mockRejectedValueOnce(new Error('Invalid TIN'))
 
       const result = await client.verifyTin(
         process.env.TIN_VALUE!,

package/vitest.config.ts

@@ -2,4 +2,7 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   root: '.',
+  test: {
+    setupFiles: ['dotenv/config'],
+  },
 })