From 971ab7f5c8ef0d7f47e99ef5c1da49e60bb0ac07 Mon Sep 17 00:00:00 2001
From: Aashir Siddiqui <aashir_sidiki@hotmail.com>
Date: Thu, 12 Sep 2024 16:35:47 +0100
Subject: [PATCH] Changed error message

Signed-off-by: Aashir Siddiqui <aashir_sidiki@hotmail.com>
---
 .../api/authentication/internal/routes/AuthTokensRoute.java   | 4 ++--
 .../api/authentication/routes/AuthTokensRouteTest.java        | 4 ++--
 .../dev/galasa/framework/api/common/ServletErrorMessage.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/galasa-parent/dev.galasa.framework.api.authentication/src/main/java/dev/galasa/framework/api/authentication/internal/routes/AuthTokensRoute.java b/galasa-parent/dev.galasa.framework.api.authentication/src/main/java/dev/galasa/framework/api/authentication/internal/routes/AuthTokensRoute.java
index 62182b956..2a1de0dd3 100644
--- a/galasa-parent/dev.galasa.framework.api.authentication/src/main/java/dev/galasa/framework/api/authentication/internal/routes/AuthTokensRoute.java
+++ b/galasa-parent/dev.galasa.framework.api.authentication/src/main/java/dev/galasa/framework/api/authentication/internal/routes/AuthTokensRoute.java
@@ -95,7 +95,7 @@ public HttpServletResponse handleGetRequest(String pathInfo, QueryParameters que
             String loginId = queryParams.getSingleString(QUERY_PARAM_LOGIN_ID, null);
             validateLoginId(loginId, pathInfo);
             authTokensFromAuthStore = getTokensByLoginId(loginId);
-            
+
         } else {
             authTokensFromAuthStore = getAllTokens();
         }
@@ -298,7 +298,7 @@ private List<AuthToken> convertAuthStoreTokenIntoTokenBeans(List<IInternalAuthTo
     private void validateLoginId(String loginId, String servletPath) throws InternalServletException {
 
         if (loginId == null || loginId.trim().length() == 0) {
-            ServletError error = new ServletError(GAL5067_ERROR_MALFORMED_LOGINID, servletPath);
+            ServletError error = new ServletError(GAL5067_ERROR_INVALID_LOGINID, servletPath);
             throw new InternalServletException(error, HttpServletResponse.SC_BAD_REQUEST);
         }
 
diff --git a/galasa-parent/dev.galasa.framework.api.authentication/src/test/java/dev/galasa/framework/api/authentication/routes/AuthTokensRouteTest.java b/galasa-parent/dev.galasa.framework.api.authentication/src/test/java/dev/galasa/framework/api/authentication/routes/AuthTokensRouteTest.java
index f5eae81da..039fe5d94 100644
--- a/galasa-parent/dev.galasa.framework.api.authentication/src/test/java/dev/galasa/framework/api/authentication/routes/AuthTokensRouteTest.java
+++ b/galasa-parent/dev.galasa.framework.api.authentication/src/test/java/dev/galasa/framework/api/authentication/routes/AuthTokensRouteTest.java
@@ -258,7 +258,7 @@ public void testTokenByLoginIdGetRequestWithNullLoginIdReturnsBadRequest() throw
 
         assertThat(servletResponse.getStatus()).isEqualTo(400);
         checkErrorStructure(outStream.toString(), 5057, "GAL5057E",
-                "Failed to validate loginId. This could be because loginId is null or an empty string. Please check the loginId in the query paramaters provided.");
+                "Invalid login ID provided. This could be because no value was given for the loginId query parameter. Please check your provided loginId query parameter value and try again.");
     }
 
     @Test
@@ -285,7 +285,7 @@ public void testTokenByLoginIdGetRequestWithBlankLoginIdReturnsBadRequest() thro
 
         assertThat(servletResponse.getStatus()).isEqualTo(400);
         checkErrorStructure(outStream.toString(), 5057, "GAL5057E",
-                "Failed to validate loginId. This could be because loginId is null or an empty string. Please check the loginId in the query paramaters provided.");
+                "Invalid login ID provided. This could be because no value was given for the loginId query parameter. Please check your provided loginId query parameter value and try again.");
     }
 
     @Test
diff --git a/galasa-parent/dev.galasa.framework.api.common/src/main/java/dev/galasa/framework/api/common/ServletErrorMessage.java b/galasa-parent/dev.galasa.framework.api.common/src/main/java/dev/galasa/framework/api/common/ServletErrorMessage.java
index 56f1dc9be..025b334a1 100644
--- a/galasa-parent/dev.galasa.framework.api.common/src/main/java/dev/galasa/framework/api/common/ServletErrorMessage.java
+++ b/galasa-parent/dev.galasa.framework.api.common/src/main/java/dev/galasa/framework/api/common/ServletErrorMessage.java
@@ -106,7 +106,7 @@ public enum ServletErrorMessage {
     GAL5064_FAILED_TO_REVOKE_TOKEN                    (5064, "E: Failed to revoke the token with the given ID. Please ensure that you have provided a valid ID representing an existing auth token in your request and try again"),
     GAL5065_FAILED_TO_GET_TOKEN_ID_FROM_URL           (5065, "E: Failed to retrieve a token ID from the request path. Please ensure that you have provided a valid ID representing an existing auth token in your request and try again"),
     GAL5066_ERROR_NO_SUCH_TOKEN_EXISTS                (5066, "E: No such token with the given ID exists. Please ensure that you have provided a valid ID representing an existing auth token in your request and try again"),
-    GAL5067_ERROR_MALFORMED_LOGINID                   (5057, "E: Failed to validate loginId. This could be because loginId is null or an empty string. Please check the loginId in the query paramaters provided."),
+    GAL5067_ERROR_INVALID_LOGINID                   (5057, "E: Invalid login ID provided. This could be because no value was given for the loginId query parameter. Please check your provided loginId query parameter value and try again."),
 
     // OpenAPI Servlet...
     GAL5071_FAILED_TO_PARSE_YAML_INTO_JSON            (5071, "E: Internal server error. Failed to convert OpenAPI specification from YAML into JSON. Report the problem to your Galasa Ecosystem owner"),