Revert "fix: fixing 401 problem (#800)" (#802)

This reverts commit b5789b1.
cognitedata · May 19, 2022 · 341b68d · 341b68d
1 parent 7c08a30
commit 341b68d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/packages/core/src/__tests__/cogniteClient.unit.spec.ts b/packages/core/src/__tests__/cogniteClient.unit.spec.ts
@@ -100,6 +100,27 @@ describe('CogniteClient', () => {
         expect(result.data).toEqual({ body: 'request ok' });
       });
 
+      test('401 handler should reject if the same token is returned', async () => {
+        const getToken = jest.fn().mockResolvedValue('401-test-token');
+
+        const scope = nock(mockBaseUrl).get('/test').twice().reply(401, {});
+
+        const client = new BaseCogniteClient({
+          project,
+          appId: 'unit-test',
+          baseUrl: mockBaseUrl,
+          getToken,
+        });
+
+        await expect(
+          async () => await client.get('/test')
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Request failed | status code: 401"`
+        );
+
+        scope.done();
+      });
+
       test('getToken rejection should reject sdk requests', async () => {
         const getToken = jest.fn().mockRejectedValue(new Error('auth error'));
 

diff --git a/packages/core/src/baseCogniteClient.ts b/packages/core/src/baseCogniteClient.ts
@@ -133,9 +133,10 @@ export default class BaseCogniteClient {
 
     this.httpClient.set401ResponseHandler(async (_, retry, reject) => {
       try {
-        const previousToken = this.retrieveTokenValueFromHeader(_.headers);
+        const previousToken = this.retrieveTokenValueFromHeader();
 
         const newToken = await this.authenticate();
+
         if (newToken && newToken !== previousToken) {
           retry();
         } else {
@@ -165,13 +166,15 @@ export default class BaseCogniteClient {
     }
   };
 
-  private retrieveTokenValueFromHeader(headers: HttpHeaders): string {
+  private retrieveTokenValueFromHeader(): string {
     let previousToken;
 
+    const defaultRequestHeaders = this.getDefaultRequestHeaders();
+
     if (this.apiKeyMode) {
-      previousToken = headers[API_KEY_HEADER];
+      previousToken = defaultRequestHeaders[API_KEY_HEADER];
     } else {
-      previousToken = headers[AUTHORIZATION_HEADER];
+      previousToken = defaultRequestHeaders[AUTHORIZATION_HEADER];
     }
     return previousToken;
   }

diff --git a/packages/stable/src/__tests__/api/documentsApi.int.spec.ts b/packages/stable/src/__tests__/api/documentsApi.int.spec.ts
@@ -2,7 +2,7 @@
 
 import CogniteClient from '../../cogniteClient';
 import { setupLoggedInClient } from '../testUtils';
-import { DocumentSearchResponse } from '@cognite/sdk-stable';
+import { DocumentSearchResponse } from '@cognite/sdk-stable/dist';
 import { TextEncoder } from 'util';
 
 const getFileId = async (