refactor(amazonq): addressing code review comments

Author: LokeshDogga13

server/aws-lsp-codewhisperer/src/language-server/securityScan/codeWhispererSecurityScanServer.ts

@@ -196,9 +196,7 @@ export const SecurityScanServerToken =
                 logging.log(`Security scan failed. ${error}`)
                 securityScanTelemetryEntry.result = 'Failed'
                 const err = getErrorMessage(error)
-                const exception = hasConnectionExpired(error as Error)
-                    ? new AmazonQServiceInvalidConnectionError(err)
-                    : null
+                const exception = hasConnectionExpired(error) ? new AmazonQServiceInvalidConnectionError(err) : error
 
                 return {
                     status: 'Failed',

server/aws-lsp-codewhisperer/src/shared/amazonQServiceManager/errors.ts

@@ -1,10 +1,12 @@
 // Base error class for Amazon Q
 export class AmazonQError extends Error {
     public code: string
+    override message: string
     constructor(message: string, code: string) {
         super(message)
         this.name = 'AmazonQError'
         this.code = code
+        this.message = message
     }
 }
 
@@ -65,10 +67,8 @@ export class AmazonQServiceNoProfileSupportError extends AmazonQError {
 }
 
 export class AmazonQServiceInvalidConnectionError extends AmazonQError {
-    override message: string
     constructor(message: string = 'Current authentication token is expired.') {
         super(message, 'E_AMAZON_Q_INVALID_CONNECTION')
         this.name = 'AmazonQServiceInvalidConnectionError'
-        this.message = 'Current authentication token is expired.'
     }
 }

server/aws-lsp-codewhisperer/src/shared/utils.ts

@@ -303,7 +303,10 @@ export function isStringOrNull(object: any): object is string | null {
     return typeof object === 'string' || object === null
 }
 
-export function hasConnectionExpired(error: Error) {
-    const authFollowType = getAuthFollowUpType(error)
-    return authFollowType == 're-auth'
+export function hasConnectionExpired(error: any) {
+    if (error instanceof Error) {
+        const authFollowType = getAuthFollowUpType(error)
+        return authFollowType == 're-auth'
+    }
+    return false
 }