fix: auth user

This commit is contained in:
Chirag Aggarwal 2025-01-17 16:19:14 +00:00
parent 55360c3af0
commit 0517ebfb4e
2 changed files with 3 additions and 24 deletions

View file

@ -1346,16 +1346,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
); );
} }
$oauth2ID = ''; $oauth2ID = $oauth2->getUserID($accessToken);
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)) { if (empty($oauth2ID)) {
$failureRedirect(Exception::USER_MISSING_ID); $failureRedirect(Exception::USER_MISSING_ID);
} }

View file

@ -20,9 +20,7 @@ class Slack extends OAuth2
* @var array * @var array
*/ */
protected array $scopes = [ protected array $scopes = [
'openid', 'users:read',
'email',
'profile',
]; ];
/** /**
@ -63,13 +61,7 @@ class Slack extends OAuth2
'code' => $code, 'code' => $code,
'redirect_uri' => $this->callback 'redirect_uri' => $this->callback
]) ])
), true); ), true)['authed_user'];
if (!$this->tokens['ok']) {
throw new \Exception('Error in fetching access token: ' . $this->tokens['error']);
}
$this->tokens['access_token'] = $this->tokens['authed_user']['access_token'];
} }
return $this->tokens; return $this->tokens;
@ -174,10 +166,6 @@ class Slack extends OAuth2
); );
$this->user = \json_decode($user, true); $this->user = \json_decode($user, true);
if (!$this->user['ok']) {
throw new \Exception('Error in fetching user: ' . $this->user['error']);
}
} }
return $this->user; return $this->user;