refactor: revert otplib update; add optional chaining wherever required

Author: nadeem-cs

.talismanrc

@@ -1,6 +1,4 @@
 fileignoreconfig:
-  - filename: test/unit/ContentstackClient-test.js
-    checksum: ffeb69822e7614a9ab14bb26f5f3ec8bdbbb6d3feb259064bda6c1379e3c7d37
   - filename: lib/contentstackClient.js
     checksum: f564f6eee5c17dc73abdeab4be226a3b37942893e149d907d2a4ef415c485c5e
   - filename: test/unit/globalField-test.js
@@ -13,7 +11,9 @@ fileignoreconfig:
     ignore_detectors:
       - filecontent
   - filename: package-lock.json
-    checksum: 93c75c1df186c336aea23c74bbefd98067d4509a42e867b0afe76e9dc65511b0
+    checksum: 92b88ce00603ede68344bac6bd6bf76bdb76f1e5f5ba8d1d0c79da2b72c5ecc0
+  - filename: test/unit/ContentstackClient-test.js
+    checksum: 5d8519b5b93c715e911a62b4033614cc4fb3596eabf31c7216ecb4cc08604a73
   - filename: .husky/pre-commit
     checksum: 52a664f536cf5d1be0bea19cb6031ca6e8107b45b6314fe7d47b7fad7d800632
   - filename: test/sanity-check/api/user-test.js

lib/contentstackClient.js

@@ -7,7 +7,7 @@ import cloneDeep from 'lodash/cloneDeep'
 import { User } from './user/index'
 import error from './core/contentstackError'
 import OAuthHandler from './core/oauthHandler'
-import { generateSync } from 'otplib'
+import { authenticator } from 'otplib'
 
 export default function contentstackClient ({ http }) {
   /**
@@ -43,7 +43,7 @@ export default function contentstackClient ({ http }) {
     requestBody = credentials
 
     if (!requestBody.tfa_token && mfaSecret) {
-      requestBody.tfa_token = generateSync({ secret: mfaSecret })
+      requestBody.tfa_token = authenticator.generate(mfaSecret)
     }
     return http.post('/user-session', { user: requestBody }, { params: params })
       .then((response) => {

lib/core/concurrency-queue.js

@@ -210,9 +210,7 @@ export function ConcurrencyQueue ({ axios, config, plugins = [] }) {
         safeAxiosRequest(requestConfig)
           .then((response) => {
             // On successful retry, call the original onComplete to properly clean up
-            if (error.config && error.config.onComplete) {
-              error.config.onComplete()
-            }
+            error?.config?.onComplete?.()
             shift() // Process next queued request
             resolve(response)
           })
@@ -224,17 +222,13 @@ export function ConcurrencyQueue ({ axios, config, plugins = [] }) {
                 .then(resolve)
                 .catch((finalError) => {
                   // On final failure, clean up the running queue
-                  if (error.config && error.config.onComplete) {
-                    error.config.onComplete()
-                  }
+                  error?.config?.onComplete?.()
                   shift() // Process next queued request
                   reject(finalError)
                 })
             } else {
               // On non-retryable error, clean up the running queue
-              if (error.config && error.config.onComplete) {
-                error.config.onComplete()
-              }
+              error?.config?.onComplete?.()
               shift() // Process next queued request
               reject(retryError)
             }
@@ -483,7 +477,7 @@ export function ConcurrencyQueue ({ axios, config, plugins = [] }) {
           ? error.message
           : 'Network request failed: error object missing request config'
       )
-      if (error && error.code) fallbackError.code = error.code
+      fallbackError.code = error?.code
       fallbackError.originalError = error
       return Promise.reject(runPluginOnResponseForError(fallbackError))
     }

package-lock.json

@@ -59,7 +59,7 @@
     "form-data": "^4.0.5",
     "husky": "^9.1.7",
     "lodash": "^4.17.23",
-    "otplib": "^13.2.1",
+    "otplib": "^12.0.1",
     "qs": "6.14.1",
     "stream-browserify": "^3.0.0"
   },

package.json

@@ -239,7 +239,7 @@ describe('Contentstack Client', () => {
     })
 
     it('should handle login with TOTP secret', done => {
-      const mfaSecret = 'JBSWY3DPEHPK3PXPJBSWY3DPEHPK3PXP'
+      const mfaSecret = 'MFASECRET'
 
       mock.onPost('/user-session').reply(config => {
         const data = JSON.parse(config.data)
@@ -416,7 +416,7 @@ describe('Contentstack Client', () => {
         .login({
           email: 'test@example.com',
           password: 'password123',
-          mfaSecret: 'JBSWY3DPEHPK3PXPJBSWY3DPEHPK3PXP'
+          mfaSecret: 'MFASECRET'
         })
         .then(response => {
           expect(response.user.authtoken).to.equal('Test Auth')