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

Compare commits

base: flashii:926bd02bfcc8f2fdd0f23c05d36bc584e5f91598
Branches Tags
flashii:master
..
compare: flashii:eafe5b3776e28fac561d2ed9e185061c3178a256
Branches Tags
flashii:master

No commits in common. "926bd02bfcc8f2fdd0f23c05d36bc584e5f91598" and "eafe5b3776e28fac561d2ed9e185061c3178a256" have entirely different histories.
926bd02bfc ... eafe5b3776

1 changed files with 14 additions and 12 deletions
Show stats Expand all files Collapse all files

26
src/OAuth2/OAuth2RpcActions.php
View file

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