Uses enum instead of magic constant

Signed-off-by: Darshit Chanpura <[email protected]>
DarshitChanpura · Apr 9, 2024 · 2a1289d · 2a1289d
1 parent 7b68f1c
commit 2a1289d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/server/auth/types/authentication_type.ts b/server/auth/types/authentication_type.ts
@@ -31,7 +31,7 @@ import { SecuritySessionCookie } from '../../session/security_cookie';
 import { SecurityClient } from '../../backend/opensearch_security_client';
 import { resolveTenant, isValidTenant } from '../../multitenancy/tenant_resolver';
 import { UnauthenticatedError } from '../../errors';
-import { GLOBAL_TENANT_SYMBOL } from '../../../common';
+import { AuthType, GLOBAL_TENANT_SYMBOL } from '../../../common';
 
 export interface IAuthenticationType {
   type: string;
@@ -210,7 +210,7 @@ export abstract class AuthenticationType implements IAuthenticationType {
       }
     }
     if (!authInfo) {
-      const authRequestType = cookie.isAnonymousAuth ? 'anonymous' : cookie.authType;
+      const authRequestType = cookie.isAnonymousAuth ? AuthType.ANONYMOUS : cookie.authType;
       authInfo = await this.securityClient.authinfo(request, authRequestType, authHeaders);
     }
     authState.authInfo = authInfo;
@@ -244,7 +244,7 @@ export abstract class AuthenticationType implements IAuthenticationType {
     authHeader: any,
     authInfo: any
   ): Promise<string | undefined> {
-    const authType = cookie.isAnonymousAuth ? 'anonymous' : cookie.authType;
+    const authType = cookie.isAnonymousAuth ? AuthType.ANONYMOUS : cookie.authType;
     if (!authInfo) {
       try {
         authInfo = await this.securityClient.authinfo(request, authType, authHeader);

diff --git a/server/auth/types/basic/routes.ts b/server/auth/types/basic/routes.ts
@@ -186,7 +186,11 @@ export class BasicAuthRoutes {
           }
           context.security_plugin.logger.info('The Redirect Path is ' + redirectUrl);
           try {
-            user = await this.securityClient.authenticateWithHeaders(request, 'anonymous', {});
+            user = await this.securityClient.authenticateWithHeaders(
+              request,
+              AuthType.ANONYMOUS,
+              {}
+            );
           } catch (error) {
             context.security_plugin.logger.error(
               `Failed authentication: ${error}. Redirecting to Login Page`

diff --git a/server/readonly/readonly_service.ts b/server/readonly/readonly_service.ts
@@ -24,6 +24,7 @@ import {
   isPrivateTenant,
   LOGIN_PAGE_URI,
   CUSTOM_ERROR_PAGE_URI,
+  AuthType,
 } from '../../common';
 import { SecurityClient } from '../backend/opensearch_security_client';
 import { IAuthenticationType, OpenSearchAuthInfo } from '../auth/types/authentication_type';
@@ -104,7 +105,11 @@ export class ReadonlyService extends BaseReadonlyService {
         return false;
       }
 
-      const authType = cookie ? (cookie.isAnonymousAuth ? 'anonymous' : cookie.authType) : '';
+      const authType = cookie
+        ? cookie.isAnonymousAuth
+          ? AuthType.ANONYMOUS
+          : cookie.authType
+        : '';
       const authInfo = await this.securityClient.authinfo(request, authType, headers);
 
       if (!authInfo.user_requested_tenant && cookie) {