refactor: move setting of operation id for post session to SessionTok…

…enManager this change fixes pipeline issues caused by recent generator change
IBM · Feb 6, 2025 · 29a1b62 · 29a1b62
1 parent 587cfe3
commit 29a1b62
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/auth/sessionTokenManager.ts b/auth/sessionTokenManager.ts
@@ -22,6 +22,8 @@ import {
   validateInput,
 } from 'ibm-cloud-sdk-core';
 
+import { getSdkHeaders } from '../lib/common';
+
 /** Configuration options for CouchDB session token retrieval. */
 export interface SessionTokenManagerOptions extends UserOptions {
   /** The username portion of CouchDB session authentication. */
@@ -92,8 +94,15 @@ export class SessionTokenManager extends TokenManager {
    * @returns {Promise}
    */
   protected requestToken(): Promise<any> {
+    const newHeaders = getSdkHeaders(
+      'cloudant',
+      'v1',
+      'authenticatorPostSession'
+    );
     if (!this.options.headers) {
-      this.options.headers = {};
+      Object.assign(this.options, { 'headers': newHeaders });
+    } else {
+      Object.assign(this.options.headers, newHeaders);
     }
     // these cannot be overwritten
     const parameters = {

diff --git a/lib/cloudantBaseService.ts b/lib/cloudantBaseService.ts
@@ -24,7 +24,6 @@ import {
   errorResponseInterceptor,
   errorResponseStreamConverter,
 } from './errorResponseInterceptor';
-import { getSdkHeaders } from './common';
 
 /**
  * Set default timeout to 2.5 minutes (= 150 000 ms)
@@ -184,17 +183,6 @@ export default abstract class CloudantBaseService extends BaseService {
   private configureSessionAuthenticator() {
     const auth: Authenticator = this.getAuthenticator();
     if (auth instanceof CouchdbSessionAuthenticator) {
-      const serviceClass = this.constructor as typeof BaseService;
-      const newHeaders = getSdkHeaders(
-        serviceClass.DEFAULT_SERVICE_NAME,
-        'v1',
-        'authenticatorPostSession'
-      );
-      if (this.baseOptions.headers === undefined) {
-        Object.assign(this.baseOptions, { 'headers': newHeaders });
-      } else {
-        Object.assign(this.baseOptions.headers, newHeaders);
-      }
       (auth as CouchdbSessionAuthenticator).configure(this.baseOptions);
     }
   }

diff --git a/test/unit/sessionTokenManager.test.js b/test/unit/sessionTokenManager.test.js
@@ -18,6 +18,7 @@ const assert = require('assert');
 const sinon = require('sinon');
 const { CookieJar } = require('tough-cookie');
 const { SessionTokenManager } = require('../../auth/sessionTokenManager.ts');
+const { getSdkHeaders } = require('../../lib/common.ts');
 
 const OPTIONS = Object.freeze({
   username: 'username',
@@ -61,7 +62,7 @@ describe('SessionTokenManager tests', () => {
       const sessionUrl = 'cloudant.example/_session';
       const expectedParameters = {
         options: {
-          headers: {},
+          headers: getSdkHeaders('cloudant', 'v1', 'authenticatorPostSession'),
           url: sessionUrl,
           method: 'POST',
           body: {