ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-11-09 23:12:20 +05:30
Code Issues Packages Projects Releases Wiki Activity

Добавлен запрос /session/profile

Browse Source
This commit is contained in:
ErickSkrauch 2016-09-08 13:07:43 +03:00
parent 8eb6a595c0
commit c2eee9b67d
7 changed files with 116 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/config/routes.php
View File

@ -12,4 +12,5 @@ return [
'/minecraft/session/legacy/join' => 'session/session/join-legacy',
'/minecraft/session/hasJoined' => 'session/session/has-joined',
'/minecraft/session/legacy/hasJoined' => 'session/session/has-joined-legacy',
'/minecraft/session/profile/<uuid>' => 'session/session/profile',
];

18
api/modules/session/controllers/SessionController.php
View File

@ -3,6 +3,7 @@ namespace api\modules\session\controllers;
use api\controllers\ApiController;
use api\modules\session\exceptions\ForbiddenOperationException;
use api\modules\session\exceptions\IllegalArgumentException;
use api\modules\session\exceptions\SessionServerException;
use api\modules\session\filters\RateLimiter;
use api\modules\session\models\HasJoinedForm;
@ -10,7 +11,9 @@ use api\modules\session\models\JoinForm;
use api\modules\session\models\protocols\LegacyJoin;
use api\modules\session\models\protocols\ModernHasJoined;
use api\modules\session\models\protocols\ModernJoin;
use common\models\Account;
use common\models\Textures;
use Ramsey\Uuid\Uuid;
use Yii;
use yii\web\Response;
@ -99,4 +102,19 @@ class SessionController extends ApiController {
return 'YES';
}
public function actionProfile($uuid) {
try {
$uuid = Uuid::fromString($uuid)->toString();
} catch(\InvalidArgumentException $e) {
throw new IllegalArgumentException('Invalid uuid format.');
}
$account = Account::findOne(['uuid' => $uuid]);
if ($account === null) {
throw new ForbiddenOperationException('Invalid uuid.');
}
return (new Textures($account))->getMinecraftResponse();
}
}

4
api/modules/session/exceptions/IllegalArgumentException.php
View File

@ -3,8 +3,8 @@ namespace api\modules\session\exceptions;
class IllegalArgumentException extends SessionServerException {
public function __construct($status = null, $message = null, $code = 0, \Exception $previous = null) {
parent::__construct(400, 'credentials can not be null.', $code, $previous);
public function __construct($message = 'credentials can not be null.', $code = 0, \Exception $previous = null) {
parent::__construct(400, $message, $code, $previous);
}
}

5
tests/codeception/api/_pages/SessionServerRoute.php
View File

@ -28,4 +28,9 @@ class SessionServerRoute extends BasePage {
$this->actor->sendGET($this->getUrl(), $params);
}
public function profile($profileUuid) {
$this->route = '/minecraft/session/profile/' . $profileUuid;
$this->actor->sendGET($this->getUrl());
}
}

28
tests/codeception/api/functional/_steps/SessionServerSteps.php
View File

@ -34,5 +34,33 @@ class SessionServerSteps extends \tests\codeception\api\FunctionalTester {
return [$username, $serverId];
}
public function canSeeValidTexturesResponse($expectedUsername, $expectedUuid) {
$this->seeResponseIsJson();
$this->canSeeResponseContainsJson([
'name' => $expectedUsername,
'id' => $expectedUuid,
'ely' => true,
'properties' => [
[
'name' => 'textures',
'signature' => 'Cg==',
],
],
]);
$this->canSeeResponseJsonMatchesJsonPath('$.properties[0].value');
$value = json_decode($this->grabResponse(), true)['properties'][0]['value'];
$decoded = json_decode(base64_decode($value), true);
$this->assertArrayHasKey('timestamp', $decoded);
$this->assertArrayHasKey('textures', $decoded);
$this->assertEquals($expectedUuid, $decoded['profileId']);
$this->assertEquals($expectedUsername, $decoded['profileName']);
$this->assertTrue($decoded['ely']);
$textures = $decoded['textures'];
$this->assertArrayHasKey('SKIN', $textures);
$skinTextures = $textures['SKIN'];
$this->assertArrayHasKey('url', $skinTextures);
$this->assertArrayHasKey('hash', $skinTextures);
}
}

26
tests/codeception/api/functional/sessionserver/HasJoinedCest.php
View File

@ -26,31 +26,7 @@ class HasJoinedCest {
'serverId' => $serverId,
]);
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->canSeeResponseContainsJson([
'name' => $username,
'id' => 'df936908b2e1544d96f82977ec213022',
'ely' => true,
'properties' => [
[
'name' => 'textures',
'signature' => 'Cg==',
],
],
]);
$I->canSeeResponseJsonMatchesJsonPath('$.properties[0].value');
$value = json_decode($I->grabResponse(), true)['properties'][0]['value'];
$decoded = json_decode(base64_decode($value), true);
$I->assertArrayHasKey('timestamp', $decoded);
$I->assertArrayHasKey('textures', $decoded);
$I->assertEquals('df936908b2e1544d96f82977ec213022', $decoded['profileId']);
$I->assertEquals('Admin', $decoded['profileName']);
$I->assertTrue($decoded['ely']);
$textures = $decoded['textures'];
$I->assertArrayHasKey('SKIN', $textures);
$skinTextures = $textures['SKIN'];
$I->assertArrayHasKey('url', $skinTextures);
$I->assertArrayHasKey('hash', $skinTextures);
$I->canSeeValidTexturesResponse($username, 'df936908b2e1544d96f82977ec213022');
}
public function wrongArguments(FunctionalTester $I) {

61
tests/codeception/api/functional/sessionserver/ProfileCest.php Normal file
View File

@ -0,0 +1,61 @@
<?php
namespace tests\codeception\api\functional\sessionserver;
use Faker\Provider\Uuid;
use tests\codeception\api\_pages\SessionServerRoute;
use tests\codeception\api\functional\_steps\SessionServerSteps;
use tests\codeception\api\FunctionalTester;
class ProfileCest {
/**
* @var SessionServerRoute
*/
private $route;
public function _before(FunctionalTester $I) {
$this->route = new SessionServerRoute($I);
}
public function getProfile(SessionServerSteps $I) {
$I->wantTo('get info about player textures by uuid');
$this->route->profile('df936908-b2e1-544d-96f8-2977ec213022');
$I->canSeeValidTexturesResponse('Admin', 'df936908b2e1544d96f82977ec213022');
}
public function getProfileByUuidWithoutDashes(SessionServerSteps $I) {
$I->wantTo('get info about player textures by uuid without dashes');
$this->route->profile('df936908b2e1544d96f82977ec213022');
$I->canSeeValidTexturesResponse('Admin', 'df936908b2e1544d96f82977ec213022');
}
public function directCallWithoutUuidPart(FunctionalTester $I) {
$I->wantTo('call profile route without passing uuid');
$this->route->profile('');
$I->canSeeResponseCodeIs(404);
}
public function callWithInvalidUuid(FunctionalTester $I) {
$I->wantTo('call profile route with invalid uuid string');
$this->route->profile('bla-bla-bla');
$I->canSeeResponseCodeIs(400);
$I->canSeeResponseIsJson();
$I->canSeeResponseContainsJson([
'error' => 'IllegalArgumentException',
'errorMessage' => 'Invalid uuid format.',
]);
}
public function getProfileWithNonexistentUuid(FunctionalTester $I) {
$I->wantTo('get info about nonexistent uuid');
$this->route->profile(Uuid::uuid());
$I->canSeeResponseCodeIs(401);
$I->canSeeResponseIsJson();
$I->seeResponseIsJson();
$I->canSeeResponseContainsJson([
'error' => 'ForbiddenOperationException',
'errorMessage' => 'Invalid uuid.',
]);
}
}