Respond to comments

Signed-off-by: Alan Cha <Alan.cha1@ibm.com>

Author: Alan-Cha

a2a/slack_researcher/slack_researcher/auth.py

@@ -48,7 +48,7 @@ def __init__(self):
         else:
             self.claims_options["aud"] = {"essential": True, "value": settings.CLIENT_ID}
         if settings.ISSUER is None:
-            logger.debug(f"ISSUER env var no set. No issuer check will be performed")
+            logger.debug(f"ISSUER env var not set. No issuer check will be performed")
         else:
             self.claims_options["iss"] = {"essential": True, "value": settings.ISSUER}
 

a2a/slack_researcher/slack_researcher/config.py

@@ -16,19 +16,21 @@ def get_client_id() -> str:
     try:
         with open(jwt_file_path, "r") as file:
             content = file.read()
-
     except FileNotFoundError:
-        print(f"Error: The file {jwt_file_path} was not found.")
-    except Exception as e:
-        print(f"An error occurred: {e}")
+        raise Exception(f"SVID JWT file {jwt_file_path} not found.")
 
     if content is None or content.strip() == "":
-        raise Exception(f"No content read from SVID JWT.")
+        raise Exception(f"No content in SVID JWT file {jwt_file_path}.")
+
+    try:
+        decoded = jwt.decode(content, options={"verify_signature": False})
+    except jwt.DecodeError:
+        raise ValueError(f"Failed to decode SVID JWT file {jwt_file_path}.")
 
-    decoded = jwt.decode(content, options={"verify_signature": False})
-    if "sub" not in decoded:
-        raise Exception('SVID JWT does not contain a "sub" claim.')
-    return decoded["sub"]
+    try:
+        return decoded["sub"]
+    except KeyError:
+        raise KeyError('SVID JWT is missing required "sub" claim.')
 
 class Settings(BaseSettings):
     # static path for client secret file

mcp/slack_tool/slack_tool.py

@@ -18,19 +18,21 @@ def get_client_id() -> str:
     try:
         with open(jwt_file_path, "r") as file:
             content = file.read()
-
     except FileNotFoundError:
-        print(f"Error: The file {jwt_file_path} was not found.")
-    except Exception as e:
-        print(f"An error occurred: {e}")
+        raise Exception(f"SVID JWT file {jwt_file_path} not found.")
 
     if content is None or content.strip() == "":
-        raise Exception(f"No content read from SVID JWT.")
+        raise Exception(f"No content in SVID JWT file {jwt_file_path}.")
 
-    decoded = jwt.decode(content, options={"verify_signature": False})
-    if "sub" not in decoded:
-        raise Exception('SVID JWT does not contain a "sub" claim.')
-    return decoded["sub"]
+    try:
+        decoded = jwt.decode(content, options={"verify_signature": False})
+    except jwt.DecodeError:
+        raise ValueError(f"Failed to decode SVID JWT file {jwt_file_path}.")
+
+    try:
+        return decoded["sub"]
+    except KeyError:
+        raise KeyError('SVID JWT is missing required "sub" claim.')
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=os.getenv("LOG_LEVEL", "DEBUG"), stream=sys.stdout, format='%(levelname)s: %(message)s')