From f695c32536716e7c0f361a9c9e2b216c92e05065 Mon Sep 17 00:00:00 2001 From: MahdiBM Date: Tue, 26 Sep 2023 09:54:38 +0330 Subject: [PATCH] more refinements --- Lambdas/GHOAuth/OAuthLambda.swift | 36 +++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/Lambdas/GHOAuth/OAuthLambda.swift b/Lambdas/GHOAuth/OAuthLambda.swift index 4ae612fa..d6960b53 100644 --- a/Lambdas/GHOAuth/OAuthLambda.swift +++ b/Lambdas/GHOAuth/OAuthLambda.swift @@ -68,12 +68,15 @@ struct GHOAuthHandler: LambdaHandler { logger.debug("Received event: \(event)") guard let code = event.queryStringParameters?["code"] else { + logger.error("Missing code query parameter") + await logErrorToDiscord("Missing code query parameter") return .init(statusCode: .badRequest, body: "Missing code query parameter") } guard let state = event.queryStringParameters?["state"] else { - logger.error("No state found") - return .init(statusCode: .badRequest, body: "Error getting state query parameter") + logger.error("Missing state query parameter") + await logErrorToDiscord("Missing state query parameter") + return .init(statusCode: .badRequest, body: "Missing state query parameter") } logger.trace("Got code and state", metadata: [ @@ -91,6 +94,7 @@ struct GHOAuthHandler: LambdaHandler { "error": "\(String(reflecting: error))", "state": .string(event.queryStringParameters?["state"] ?? "") ]) + await logErrorToDiscord("Error verifying state") return .init(statusCode: .badRequest, body: "Error verifying state") } @@ -104,14 +108,18 @@ struct GHOAuthHandler: LambdaHandler { )]) ).guardSuccess() } catch { - logger.warning("Received Discord error while updating interaction", metadata: [ + await logErrorToDiscord( + "Received Discord error while updating interaction: \(String(reflecting: error))" + ) + logger.error("Received Discord error while updating interaction", metadata: [ "error": "\(String(reflecting: error))" ]) } } func failure(_ error: String) async -> APIGatewayV2Response { - await updateInteraction(color: .red, description: error ) + await logErrorToDiscord(error) + await updateInteraction(color: .red, description: error) return .init(statusCode: .badRequest, body: error) } @@ -234,4 +242,24 @@ struct GHOAuthHandler: LambdaHandler { return user } + + func logErrorToDiscord(_ error: String) async { + do { + try await discordClient.createMessage( + channelId: Constants.Channels.logs.id, + payload: .init(embeds: [.init( + description: """ + Error in GHHooks Lambda: + + >>> \(error) + """, + color: .red + )]) + ).guardSuccess() + } catch { + logger.warning("Received Discord error while logging", metadata: [ + "error": "\(String(reflecting: error))" + ]) + } + } }