From 55360c3af0ba9972412f0b4155b193571d14c49e Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Fri, 17 Jan 2025 07:43:50 +0000 Subject: [PATCH] debugging --- app/controllers/api/account.php | 11 ++++++++++- src/Appwrite/Auth/OAuth2/Slack.php | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 6935029450..74b9bc1868 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -1346,7 +1346,16 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect') ); } - $oauth2ID = $oauth2->getUserID($accessToken); + $oauth2ID = ''; + try { + $oauth2ID = $oauth2->getUserID($accessToken); + } catch (Exception $ex) { + $failureRedirect( + $ex->getType(), + 'Failed to obtain user ID. The ' . $providerName . ' OAuth2 provider returned an error: ' . $ex->getMessage(), + ); + } + if (empty($oauth2ID)) { $failureRedirect(Exception::USER_MISSING_ID); } diff --git a/src/Appwrite/Auth/OAuth2/Slack.php b/src/Appwrite/Auth/OAuth2/Slack.php index 6f59e416d8..1d6ba17a46 100644 --- a/src/Appwrite/Auth/OAuth2/Slack.php +++ b/src/Appwrite/Auth/OAuth2/Slack.php @@ -66,8 +66,10 @@ class Slack extends OAuth2 ), true); if (!$this->tokens['ok']) { - throw new \Exception('Error in fetching access token.'); + throw new \Exception('Error in fetching access token: ' . $this->tokens['error']); } + + $this->tokens['access_token'] = $this->tokens['authed_user']['access_token']; } return $this->tokens; @@ -174,7 +176,7 @@ class Slack extends OAuth2 $this->user = \json_decode($user, true); if (!$this->user['ok']) { - throw new \Exception('Error in fetching user.'); + throw new \Exception('Error in fetching user: ' . $this->user['error']); } }