Merge branch 'feat/oauth-support' into feat/DX-2264-oauth-test-cases

Author: aman19K

.eslintrc.js

@@ -1,8 +1,7 @@
 module.exports = {
-  // "env": {
-  //     "browser": true,
-  //     "amd": true
-  // },
+  env: {
+    "es2020": true
+  },
   extends: 'standard',
   // "globals": {
   //     "Atomics": "readonly",
@@ -15,6 +14,7 @@ module.exports = {
   //     "ecmaVersion": 2015,
   //     "sourceType": "module"
   // },
+  parser: "@babel/eslint-parser", // Use Babel parser to handle modern JS syntax
   plugins: [
     'standard',
     'promise'

.github/workflows/lint-check.yml

@@ -0,0 +1,25 @@
+name: Lint Check on PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '22.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run ESLint
+        run: npm run lint 

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [v1.19.5](https://github.com/contentstack/contentstack-management-javascript/tree/v1.19.5) (2025-03-17)
+ - Fix
+    - Added AuditLog in the stack class
+    - Fixed the Unit Test cases and added sanity test case for audit log
+
 ## [v1.19.4](https://github.com/contentstack/contentstack-management-javascript/tree/v1.19.4) (2025-03-10)
  - Fix
     - added fix for variants import

lib/app/installation/index.js

@@ -250,4 +250,4 @@ export function InstallationCollection (http, data) {
   return obj.map((installationData) => {
     return new Installation(http, { data: installationData })
   })
-}
+}

lib/contentstackClient.js

@@ -193,15 +193,15 @@ export default function contentstackClient ({ http }) {
    * .then(() => console.log('Logged in successfully'))
    *
    */
-  function oauth(params = {}) {
-    http.defaults.versioningStrategy = "path";
-    const appId = params.appId || '6400aa06db64de001a31c8a9';
-    const clientId = params.clientId || 'Ie0FEfTzlfAHL4xM';
-    const redirectUri = params.redirectUri || 'http://localhost:8184';
-    const responseType = params.responseType || 'code';
-    const scope = params.scope;
-    const clientSecret = params.clientSecret;
-    return new OAuthHandler(http, appId, clientId, redirectUri, clientSecret,responseType, scope);
+  function oauth (params = {}) {
+    http.defaults.versioningStrategy = 'path'
+    const appId = params.appId || '6400aa06db64de001a31c8a9'
+    const clientId = params.clientId || 'Ie0FEfTzlfAHL4xM'
+    const redirectUri = params.redirectUri || 'http://localhost:8184'
+    const responseType = params.responseType || 'code'
+    const scope = params.scope
+    const clientSecret = params.clientSecret
+    return new OAuthHandler(http, appId, clientId, redirectUri, clientSecret, responseType, scope)
   }
 
   return {
@@ -211,6 +211,6 @@ export default function contentstackClient ({ http }) {
     stack: stack,
     organization: organization,
     axiosInstance: http,
-    oauth,
+    oauth
   }
 }

lib/contentstackCollection.js

@@ -10,8 +10,8 @@ export default class ContentstackCollection {
     if (http?.httpClientParams?.headers?.includeResHeaders === true) {
       data.stackHeaders = {
         ...data.stackHeaders,
-        responseHeaders: response.headers,
-      };
+        responseHeaders: response.headers
+      }
     }
     if (wrapperCollection) {
       this.items = wrapperCollection(http, data)

lib/core/concurrency-queue.js

@@ -77,16 +77,16 @@ export function ConcurrencyQueue ({ axios, config }) {
       request.data = transformFormData(request)
     }
     if (axios?.oauth?.accessToken) {
-      const isTokenExpired = axios.oauth.tokenExpiryTime && Date.now() > axios.oauth.tokenExpiryTime;
+      const isTokenExpired = axios.oauth.tokenExpiryTime && Date.now() > axios.oauth.tokenExpiryTime
       if (isTokenExpired) {
         return refreshAccessToken().catch((error) => {
-            throw new Error('Failed to refresh access token: ' + error.message);
-          });
+          throw new Error('Failed to refresh access token: ' + error.message)
+        })
       }
-    } 
-    
+    }
+
     request.retryCount = request?.retryCount || 0
-    setAuthorizationHeaders(request);
+    setAuthorizationHeaders(request)
     if (request.cancelToken === undefined) {
       const source = Axios.CancelToken.source()
       request.cancelToken = source.token
@@ -121,32 +121,31 @@ export function ConcurrencyQueue ({ axios, config }) {
       request.authtoken = this.config.authtoken
     } else if (axios?.oauth?.accessToken) {
       // If OAuth access token is available in axios instance
-      request.headers.authorization = `Bearer ${axios.oauth.accessToken}`;
-      request.authorization = `Bearer ${axios.oauth.accessToken}`;
+      request.headers.authorization = `Bearer ${axios.oauth.accessToken}`
+      request.authorization = `Bearer ${axios.oauth.accessToken}`
       delete request.headers.authtoken
     }
   }
 
-    //Refresh Access Token 
+  // Refresh Access Token
   const refreshAccessToken = async () => {
     try {
       // Try to refresh the token
-      await new OAuthHandler(axios).refreshAccessToken();
-      this.paused = false; // Resume the request queue once the token is refreshed
+      await new OAuthHandler(axios).refreshAccessToken()
+      this.paused = false // Resume the request queue once the token is refreshed
 
       // Retry the requests that were pending due to token expiration
       this.running.forEach(({ request, resolve, reject }) => {
       // Retry the request
-        axios(request).then(resolve).catch(reject);
-      });
-      this.running = []; // Clear the running queue after retrying requests
+        axios(request).then(resolve).catch(reject)
+      })
+      this.running = [] // Clear the running queue after retrying requests
     } catch (error) {
-      this.paused = false; // stop queueing requests on failure
-      this.running.forEach(({ reject }) => reject(error)); // Reject all queued requests
-      this.running = []; // Clear the running queue
+      this.paused = false // stop queueing requests on failure
+      this.running.forEach(({ reject }) => reject(error)) // Reject all queued requests
+      this.running = [] // Clear the running queue
     }
   }
-  
 
   const delay = (time, isRefreshToken = false) => {
     if (!this.paused) {
@@ -196,7 +195,7 @@ export function ConcurrencyQueue ({ axios, config }) {
           message: 'Unable to refresh token',
           name: 'Token Error',
           config: queueItem.request,
-          stack: (error instanceof Error) ? error.stack : null,
+          stack: (error instanceof Error) ? error.stack : null
         })
       })
       this.queue = []

lib/core/contentstackHTTPClient.js

@@ -65,24 +65,24 @@ export default function contentstackHttpClient (options) {
     config.basePath = `/${config.basePath.split('/').filter(Boolean).join('/')}`
   }
   const baseURL = config.endpoint || `${protocol}://${hostname}:${port}${config.basePath}/{api-version}`
-  let uiHostName = hostname;
-  let developerHubBaseUrl = hostname;
+  let uiHostName = hostname
+  let developerHubBaseUrl = hostname
 
   if (hostname.endsWith('io')) {
-    uiHostName = hostname.replace('io', 'com');
+    uiHostName = hostname.replace('io', 'com')
   }
 
   if (hostname.startsWith('api')) {
-    uiHostName = uiHostName.replace('api', 'app');
+    uiHostName = uiHostName.replace('api', 'app')
   }
-  const uiBaseUrl = config.endpoint || `${protocol}://${uiHostName}`;
+  const uiBaseUrl = config.endpoint || `${protocol}://${uiHostName}`
 
   developerHubBaseUrl = developerHubBaseUrl
     ?.replace('api', 'developerhub-api')
     .replace(/^dev\d+/, 'dev') // Replaces any 'dev1', 'dev2', etc. with 'dev'
     .replace('io', 'com')
     .replace(/^http/, '') // Removing `http` if already present
-    .replace(/^/, 'https://'); // Adds 'https://' at the start if not already there
+    .replace(/^/, 'https://') // Adds 'https://' at the start if not already there
 
   // set ui host name
   const axiosOptions = {