Test fixes

Signed-off-by: Derek Ho <[email protected]>
opensearch-project · Feb 22, 2024 · 1c542fc · 1c542fc
1 parent 4c1e448
commit 1c542fc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 68 deletions.
diff --git a/server/auth/types/basic/basic_auth.test.ts b/server/auth/types/basic/basic_auth.test.ts
@@ -33,20 +33,11 @@ describe('Basic auth tests', () => {
   let sessionStorageFactory: SessionStorageFactory<SecuritySessionCookie>;
   let logger: Logger;
 
-  // Consistent with auth_handler_factory.test.ts
-  beforeEach(() => {});
-
-  const config = ({
-    saml: {
-      extra_storage: {
-        cookie_prefix: 'testcookie',
-        additional_cookies: 5,
-      },
-    },
+  const config = {
     session: {
       ttl: 1000,
     },
-  } as unknown) as SecurityPluginConfigType;
+  } as SecurityPluginConfigType;
 
   test('getKeepAliveExpiry', () => {
     const realDateNow = Date.now.bind(global.Date);

diff --git a/server/auth/types/jwt/jwt_helper.test.ts b/server/auth/types/jwt/jwt_helper.test.ts
@@ -244,13 +244,7 @@ describe('JWT Expiry Tests', () => {
   });
 
   test('JWT auth type sets expiryTime of cookie JWT exp less than ttl', async () => {
-    const keepAliveConfig = {
-      multitenancy: {
-        enabled: false,
-      },
-      auth: {
-        unauthenticated_routes: [] as string[],
-      },
+    const infiniteTTLConfig = {
       session: {
         keepalive: true,
         ttl: Infinity,
@@ -266,7 +260,7 @@ describe('JWT Expiry Tests', () => {
     } as SecurityPluginConfigType;
 
     const jwtAuth = new JwtAuthentication(
-      keepAliveConfig,
+      infiniteTTLConfig,
       sessionStorageFactory,
       router,
       esClient,
@@ -294,13 +288,7 @@ describe('JWT Expiry Tests', () => {
   });
 
   test('JWT auth type sets expiryTime of cookie ttl less than JWT exp', async () => {
-    const keepAliveConfig = {
-      multitenancy: {
-        enabled: false,
-      },
-      auth: {
-        unauthenticated_routes: [] as string[],
-      },
+    const lowTTLConfig = {
       session: {
         keepalive: true,
         ttl: 1000,
@@ -316,7 +304,7 @@ describe('JWT Expiry Tests', () => {
     } as SecurityPluginConfigType;
 
     const jwtAuth = new JwtAuthentication(
-      keepAliveConfig,
+      lowTTLConfig,
       sessionStorageFactory,
       router,
       esClient,
@@ -344,13 +332,7 @@ describe('JWT Expiry Tests', () => {
   });
 
   test('getKeepAliveExpiry', () => {
-    const keepAliveConfig = {
-      multitenancy: {
-        enabled: false,
-      },
-      auth: {
-        unauthenticated_routes: [] as string[],
-      },
+    const jwtConfig = {
       session: {
         keepalive: true,
         ttl: 100000,
@@ -366,7 +348,7 @@ describe('JWT Expiry Tests', () => {
     } as SecurityPluginConfigType;
 
     const jwtAuth = new JwtAuthentication(
-      keepAliveConfig,
+      jwtConfig,
       sessionStorageFactory,
       router,
       esClient,

diff --git a/server/auth/types/multiple/multi_auth.test.ts b/server/auth/types/multiple/multi_auth.test.ts
@@ -15,11 +15,8 @@
 
 import { httpServerMock } from '../../../../../../src/core/server/http/http_server.mocks';
 
-import { OpenSearchDashboardsRequest } from '../../../../../../src/core/server/http/router';
-
 import { SecurityPluginConfigType } from '../../../index';
 import { SecuritySessionCookie } from '../../../session/security_cookie';
-import { deflateValue } from '../../../utils/compression';
 import {
   IRouter,
   CoreSetup,
@@ -36,9 +33,6 @@ describe('Multi auth tests', () => {
   let sessionStorageFactory: SessionStorageFactory<SecuritySessionCookie>;
   let logger: Logger;
 
-  // Consistent with auth_handler_factory.test.ts
-  beforeEach(() => {});
-
   const config = ({
     session: {
       ttl: 1000,

diff --git a/server/auth/types/openid/openid_auth.test.ts b/server/auth/types/openid/openid_auth.test.ts
@@ -212,21 +212,14 @@ describe('test OpenId authHeaderValue', () => {
     const realDateNow = Date.now.bind(global.Date);
     const dateNowStub = jest.fn(() => 0);
     global.Date.now = dateNowStub;
-    const customConfig = {
+    const oidcConfig: unknown = {
       openid: {
-        pfx: 'test/certs/keyStore.p12',
-        certificate: 'test/certs/cert.pem',
-        private_key: 'test/certs/private-key.pem',
-        passphrase: '',
-        header: 'authorization',
         scope: [],
       },
     };
 
-    const openidConfig = (customConfig as unknown) as SecurityPluginConfigType;
-
     const openIdAuthentication = new OpenIdAuthentication(
-      openidConfig,
+      oidcConfig as SecurityPluginConfigType,
       sessionStorageFactory,
       router,
       esClient,
@@ -248,21 +241,14 @@ describe('test OpenId authHeaderValue', () => {
   });
 
   test('getKeepAliveExpiry', () => {
-    const customConfig = {
+    const oidcConfig: unknown = {
       openid: {
-        pfx: 'test/certs/keyStore.p12',
-        certificate: 'test/certs/cert.pem',
-        private_key: 'test/certs/private-key.pem',
-        passphrase: '',
-        header: 'authorization',
         scope: [],
       },
     };
 
-    const openidConfig = (customConfig as unknown) as SecurityPluginConfigType;
-
     const openIdAuthentication = new OpenIdAuthentication(
-      openidConfig,
+      oidcConfig as SecurityPluginConfigType,
       sessionStorageFactory,
       router,
       esClient,

diff --git a/server/auth/types/proxy/proxy_auth.test.ts b/server/auth/types/proxy/proxy_auth.test.ts
@@ -33,16 +33,7 @@ describe('Proxy auth tests', () => {
   let sessionStorageFactory: SessionStorageFactory<SecuritySessionCookie>;
   let logger: Logger;
 
-  // Consistent with auth_handler_factory.test.ts
-  beforeEach(() => {});
-
   const config = ({
-    saml: {
-      extra_storage: {
-        cookie_prefix: 'testcookie',
-        additional_cookies: 5,
-      },
-    },
     session: {
       ttl: 1000,
     },