fix(http): status 400 to 404 are allowed

Author: Fire-Dragon-DoL

examples/javascript/src/lib/api-service.mjs

@@ -4,14 +4,18 @@ import { URL } from "url";
 const headers = { 'Content-Type': 'application/json' }
 const defaultHost = "https://api.iheartjane.com"
 
+function validStatus(status) {
+  return (status >= 200 && status <= 299) ||
+    (status >= 400 || status <= 404);
+}
+
 const authenticateClient = async () => {
   const clientId = process.env.JANE_CLIENT_ID || ''
   const clientSecret = process.env.JANE_CLIENT_SECRET || ''
   const apiUrl = process.env.JANE_API_URL || defaultHost
 
   const resp = await request({
-    // Prevent exceptions when requests have status code different from 2xx
-    validateStatus: false,
+    validateStatus: validStatus,
     method: 'post',
     url: `${apiUrl}/oauth/token`,
     data: {
@@ -29,14 +33,11 @@ const authenticateClient = async () => {
 const makeRequest = async (options) => {
   const apiUrl = process.env.JANE_API_URL || defaultHost
 
-  if (!apiUrl) {
-    throw Error('No JANE_API_URL configured')
-  }
-
   const url = new URL(options.path, apiUrl);
 
   try {
     const response = await request({
+      validateStatus: validStatus,
       url: url.toString(),
       method: options.method || 'get',
       headers: {...headers, 'Authorization': `Bearer ${options.token}`},

examples/javascript/src/lib/api-service.spec.mjs

@@ -26,14 +26,16 @@ describe('api service', () => {
 
       await apiService.get('/api/path', token)
 
-      expect(requestMock).toHaveBeenCalledWith({
-        url: 'https://test.localhost/api/path',
-        method: 'get',
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': `Bearer ${token}`
-        }
-      })
+      expect(requestMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          url: 'https://test.localhost/api/path',
+          method: 'get',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${token}`
+          }
+        })
+      )
     })
 
     test('it returns statusCode, statusMessage, and body', async () => {
@@ -60,15 +62,17 @@ describe('api service', () => {
 
       await apiService.post('/api/path', data, token)
 
-      expect(requestMock).toHaveBeenCalledWith({
-        url: 'https://test.localhost/api/path',
-        method: 'post',
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': `Bearer ${token}`
-        },
-        data: JSON.stringify(data),
-      })
+      expect(requestMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          url: 'https://test.localhost/api/path',
+          method: 'post',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${token}`
+          },
+          data: JSON.stringify(data),
+        })
+      )
     })
 
     test('it returns statusCode, statusMessage, and body', async () => {
@@ -77,15 +81,17 @@ describe('api service', () => {
 
       const response = await apiService.post('/api/path', data)
 
-      expect(requestMock).toHaveBeenCalledWith({
-        url: 'https://test.localhost/api/path',
-        method: 'post',
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': `Bearer ${token}`
-        },
-        data: JSON.stringify(data),
-      })
+      expect(requestMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          url: 'https://test.localhost/api/path',
+          method: 'post',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${token}`
+          },
+          data: JSON.stringify(data),
+        })
+      )
     })
   })
 })