Addresses feedback

Signed-off-by: Darshit Chanpura <[email protected]>
DarshitChanpura · Apr 1, 2024 · 4317901 · 4317901
1 parent 366f413
commit 4317901
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/public/apps/login/test/login-page.test.tsx b/public/apps/login/test/login-page.test.tsx
@@ -209,7 +209,7 @@ describe('Login page', () => {
       const config: ClientConfigType = {
         ui: configUI,
         auth: {
-          type: [AuthType.BASIC, 'openid', AuthType.SAML],
+          type: [AuthType.BASIC, AuthType.OPEN_ID, AuthType.SAML],
           logout_url: API_AUTH_LOGOUT,
         },
       };

diff --git a/server/auth/types/saml/routes.ts b/server/auth/types/saml/routes.ts
@@ -136,12 +136,12 @@ export class SamlAuthRoutes {
         }
 
         try {
-          const credentials = await this.securityClient.authToken(
+          const credentials = await this.securityClient.authToken({
             requestId,
-            request.body.SAMLResponse,
-            undefined,
-            SAML_AUTH_REQUEST_TYPE
-          );
+            samlResponse: request.body.SAMLResponse,
+            acsEndpoint: undefined,
+            authRequestType: SAML_AUTH_REQUEST_TYPE,
+          });
           const user = await this.securityClient.authenticateWithHeader(
             request,
             'authorization',
@@ -215,12 +215,12 @@ export class SamlAuthRoutes {
       async (context, request, response) => {
         const acsEndpoint = `${this.coreSetup.http.basePath.serverBasePath}/_opendistro/_security/saml/acs/idpinitiated`;
         try {
-          const credentials = await this.securityClient.authToken(
-            undefined,
-            request.body.SAMLResponse,
+          const credentials = await this.securityClient.authToken({
+            requestId: undefined,
+            samlResponse: request.body.SAMLResponse,
             acsEndpoint,
-            SAML_AUTH_REQUEST_TYPE
-          );
+            authRequestType: SAML_AUTH_REQUEST_TYPE,
+          });
           const user = await this.securityClient.authenticateWithHeader(
             request,
             'authorization',

diff --git a/server/backend/opensearch_security_client.ts b/server/backend/opensearch_security_client.ts
@@ -222,12 +222,12 @@ export class SecurityClient {
     throw new Error(`Invalid SAML configuration.`);
   }
 
-  public async authToken(
-    requestId: string | undefined,
-    samlResponse: any,
-    acsEndpoint: any | undefined = undefined,
-    authRequestType: string | undefined
-  ) {
+  public async authToken({
+    requestId,
+    samlResponse,
+    acsEndpoint = undefined,
+    authRequestType,
+  }: AuthTokenParams) {
     const body = {
       RequestId: requestId,
       SAMLResponse: samlResponse,
@@ -244,3 +244,10 @@ export class SecurityClient {
     }
   }
 }
+
+interface AuthTokenParams {
+  requestId?: string;
+  samlResponse: any;
+  acsEndpoint?: any;
+  authRequestType?: string;
+}