Исправлена обработка ситуации, когда uuid selectedProfile при join операции передан без дефисов

This commit is contained in:
ErickSkrauch
2017-10-20 15:02:52 +03:00
parent da87d4bc86
commit b8e445b99f
2 changed files with 16 additions and 1 deletions

View File

@ -126,7 +126,7 @@ class JoinForm extends Model {
$selectedProfile = $this->selectedProfile;
$isUuid = StringHelper::isUuid($selectedProfile);
if ($isUuid && $account->uuid !== $selectedProfile) {
if ($isUuid && $account->uuid !== $this->normalizeUUID($selectedProfile)) {
Session::error(
"User with access_token = '{$accessToken}' trying to join with identity = '{$selectedProfile}'," .
" but access_token issued to account with id = '{$account->uuid}'."
@ -149,4 +149,8 @@ class JoinForm extends Model {
return $this->account;
}
private function normalizeUUID(string $uuid): string {
return Uuid::fromString($uuid)->toString();
}
}