Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Telegram resource owner #1966

Merged
merged 11 commits into from
Dec 5, 2023
Merged

Add Telegram resource owner #1966

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
957d65a
Create TelegramResourceOwner.php
zorn-v Nov 17, 2023
af50dbd
Fix TelegramResourceOwner class name
zorn-v Nov 17, 2023
6845703
Update TelegramResourceOwner.php
zorn-v Nov 30, 2023
1d2de05
Update src/OAuth/ResourceOwner/TelegramResourceOwner.php
zorn-v Nov 30, 2023
1879d5d
Telegram resource owner fixes
zorn-v Nov 30, 2023
25d89d0
Add telegram docs
zorn-v Nov 30, 2023
a0905de
Add telegram tests
zorn-v Nov 30, 2023
7292ef5
CS fix
zorn-v Nov 30, 2023
01f703d
Fix phpstan errors in test
zorn-v Nov 30, 2023
2905ff2
CS fix
zorn-v Nov 30, 2023
dc68c70
Fix phpstan error
zorn-v Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Telegram resource owner fixes
  • Loading branch information
@zorn-v
zorn-v committed Nov 30, 2023
commit 1879d5dff9eef477a4402ae8b1c85a6f5f743df4
9 changes: 6 additions & 3 deletions src/OAuth/ResourceOwner/TelegramResourceOwner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function handles(Request $request)

public function getAccessToken(Request $request, $redirectUri, array $extraParameters = [])
{
$token = $request->query->get('code');
$token = $request->query->get('code', '');
$token = str_pad(strtr($token, '-_', '+/'), strlen($token) % 4, '=', STR_PAD_RIGHT);
$authData = json_decode(base64_decode($token), true);
if (empty($authData['hash'])) {
Expand All @@ -70,8 +70,11 @@ public function getAccessToken(Request $request, $redirectUri, array $extraParam
$checkHash = $authData['hash'];
unset($authData['hash']);
ksort($authData);
array_walk($authData, function (&$value, $key) {$value = $key.'='.$value;});
$dataCheckStr = implode("\n", $authData);
$dataCheckStr = '';
foreach ($authData as $k => $v) {
$dataCheckStr .= sprintf("\n%s=%s", $k, $v);
}
$dataCheckStr = substr($dataCheckStr, 1);
$secretKey = hash('sha256', $botToken, true);
$hash = hash_hmac('sha256', $dataCheckStr, $secretKey);
if ($hash !== $checkHash) {
Expand Down