Skip to content

Commit d665864

Browse files
committed
Add missing prefix to user authentication response
1 parent 06b8d04 commit d665864

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

composer.phar

2.57 MB
Binary file not shown.

src/Pusher.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,9 +862,10 @@ public function authenticateUser(string $socket_id, array $user_data): string
862862
$this->validate_user_data($user_data);
863863
$serialized_user_data = json_encode($user_data, JSON_THROW_ON_ERROR);
864864
$signature = hash_hmac('sha256', "$socket_id::user::$serialized_user_data", $this->settings['secret'], false);
865+
$auth = $this->settings['auth_key'] . ':' . $signature;
865866

866867
return json_encode(
867-
['auth' => $signature, 'user_data' => $serialized_user_data],
868+
['auth' => $auth, 'user_data' => $serialized_user_data],
868869
JSON_THROW_ON_ERROR
869870
);
870871
}

tests/unit/AuthenticateUserTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function testAuthenticateUser(): void
2727
{
2828
$auth_string = $this->pusher->authenticateUser('12345.6789', ['id' => '123']);
2929
self::assertEquals(
30-
'{"auth":"fc713f433deb729d0d96f9e26ef054285cbc3e833ebe840b93722a2fa16a6a18","user_data":"{\"id\":\"123\"}"}',
30+
'{"auth":"thisisaauthkey:fc713f433deb729d0d96f9e26ef054285cbc3e833ebe840b93722a2fa16a6a18","user_data":"{\"id\":\"123\"}"}',
3131
$auth_string,
3232
'Auth string valid'
3333
);
@@ -37,7 +37,7 @@ public function testAuthenticateUserUserData(): void
3737
{
3838
$auth_string = $this->pusher->authenticateUser('12345.6789', ['id' => '123', 'name' => 'John Smith']);
3939
self::assertEquals(
40-
'{"auth":"0dddb208b53c7649f3fbbb86254a6e1986bc6f8b566423ea690c9ca773497373","user_data":"{\"id\":\"123\",\"name\":\"John Smith\"}"}',
40+
'{"auth":"thisisaauthkey:0dddb208b53c7649f3fbbb86254a6e1986bc6f8b566423ea690c9ca773497373","user_data":"{\"id\":\"123\",\"name\":\"John Smith\"}"}',
4141
$auth_string,
4242
'Auth string valid'
4343
);

0 commit comments

Comments
 (0)