ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-11-27 01:02:06 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fix sessionserver/join endpoint: return empty response with 204 status code on success join

Browse Source
This commit is contained in:
ErickSkrauch 2023-11-16 20:21:26 +01:00
parent 984c6e7682
commit 47463d7435
No known key found for this signature in database
GPG Key ID: 669339FCBB30EE0E
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,19 +34,18 @@ class SessionController extends Controller {
} }
/** /**
* @return array
* @throws ForbiddenOperationException * @throws ForbiddenOperationException
* @throws IllegalArgumentException * @throws IllegalArgumentException
*/ */
public function actionJoin(): array { public function actionJoin(Response $response): void {
Yii::$app->response->format = Response::FORMAT_JSON;
$data = Yii::$app->request->post(); $data = Yii::$app->request->post();
$protocol = new ModernJoin($data['accessToken'] ?? '', $data['selectedProfile'] ?? '', $data['serverId'] ?? ''); $protocol = new ModernJoin($data['accessToken'] ?? '', $data['selectedProfile'] ?? '', $data['serverId'] ?? '');
$joinForm = new JoinForm($protocol); $joinForm = new JoinForm($protocol);
$joinForm->join(); // will throw an exception in case of any error $joinForm->join(); // will throw an exception in case of any error
return ['id' => 'OK']; $response->statusCode = 204;
$response->format = Response::FORMAT_RAW;
$response->content = '';
} }
public function actionJoinLegacy(): string { public function actionJoinLegacy(): string {

2
api/tests/functional/_steps/SessionServerSteps.php
View File

@ -30,7 +30,7 @@ class SessionServerSteps extends FunctionalTester {
'serverId' => $serverId, 'serverId' => $serverId,
]); ]);
$this->canSeeResponseContainsJson(['id' => 'OK']); $this->seeResponseCodeIs(204);
} }
return [$username, $serverId]; return [$username, $serverId];

9
api/tests/functional/sessionserver/JoinCest.php
View File

@ -150,12 +150,9 @@ class JoinCest {
]); ]);
} }
private function expectSuccessResponse(FunctionalTester $I) { private function expectSuccessResponse(FunctionalTester $I): void {
$I->seeResponseCodeIs(200); $I->seeResponseCodeIs(204);
$I->seeResponseIsJson(); $I->canSeeResponseEquals('');
$I->canSeeResponseContainsJson([
'id' => 'OK',
]);
} }
} }