flashii/hanyuu
1
0
Fork 0
Code Pull requests Releases Activity

Update auth RPC procedures.

Browse source
This commit is contained in:
flash 2024-08-25 21:53:34 +00:00
parent eafe5b3776
commit 7aa640364e
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/OAuth2/OAuth2RpcActions.php
View file

@ -47,16 +47,14 @@ final class OAuth2RpcActions extends RpcActionHandler {
return [ return [
'method' => 'basic', 'method' => 'basic',
'authed' => $authed, 'type' => $authed ? 'confapp' : 'pubapp',
'app_id' => $appInfo->getId(), 'app' => $appInfo->getId(),
'scope' => ['oauth2'],
]; ];
} }
#[RpcProcedure('hanyuu:oauth2:getTokenInfo')] #[RpcProcedure('hanyuu:oauth2:attemptBearerAuth')]
public function procGetTokenInfo(string $type, string $token): array { public function procAttemptBearerAuth(string $token): array {
if(strcasecmp($type, 'Bearer') !== 0)
return ['method' => 'bearer', 'error' => 'type'];
try { try {
$tokenInfo = $this->oauth2Ctx->getTokensData()->getAccessInfo($token, OAuth2TokensData::ACCESS_BY_TOKEN); $tokenInfo = $this->oauth2Ctx->getTokensData()->getAccessInfo($token, OAuth2TokensData::ACCESS_BY_TOKEN);
} catch(RuntimeException $ex) { } catch(RuntimeException $ex) {
@ -68,11 +66,11 @@ final class OAuth2RpcActions extends RpcActionHandler {
return [ return [
'method' => 'bearer', 'method' => 'bearer',
'authed' => true, 'type' => $tokenInfo->hasUserId() ? 'user' : 'app',
'app_id' => $tokenInfo->getAppId(), 'app' => $tokenInfo->getAppId(),
'user_id' => $tokenInfo->getUserId() ?? '0', 'user' => $tokenInfo->getUserId() ?? '0',
'scope' => $tokenInfo->getScope(), 'scope' => $tokenInfo->getScopes(),
'expires_in' => $tokenInfo->getRemainingLifetime(), 'expires' => $tokenInfo->getExpiresTime(),
]; ];
} }