Add generateJwtToken() method (#44)

fre5h · Dec 6, 2024 · 67ab273 · 67ab273
1 parent 543c394
commit 67ab273
Show file tree

Hide file tree

Showing 41 changed files with 162 additions and 101 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 
 ## Features 🎁
 
-- [x] Compatible with latest [Centrifugo 5.4.5](https://github.com/centrifugal/centrifugo/releases/tag/v5.4.5) 🚀
+- [x] Compatible with latest [Centrifugo 5.4.7](https://github.com/centrifugal/centrifugo/releases/tag/v5.4.7) 🚀
 - [x] Wrapper over [Centrifugo HTTP API](https://centrifugal.dev/docs/server/server_api#http-api) 🔌
 - [X] Authentication with JWT token (HMAC algorithm) for [anonymous](./Resources/docs/authentication.md#anonymous), [authenticated user](./Resources/docs/authentication.md#authenticated-user) and [private channel](./Resources/docs/authentication.md#private-channel) 🗝️
 - [x] [Batch request](./Resources/docs/centrifugo_service_methods.md#batch-request) in [JSON streaming format](https://en.wikipedia.org/wiki/JSON_streaming) 💪
@@ -35,7 +35,7 @@ $ composer req fresh/centrifugo-bundle
 
 | Bundle Version (X.Y.Z) |   PHP    | Symfony |       Comment       |
 |:----------------------:|:--------:|:-------:|:--------------------|
-|        `6.1.*`         | `>= 8.3` | `7.*`   | **Current version** |
+|        `6.2.*`         | `>= 8.3` | `7.*`   | **Current version** |
 |        `5.3.*`         | `>= 8.2` | `7.*`   | Previous version    |
 
 By default, [Symfony Flex](https://symfony.com/doc/current/setup/flex.html) adds this bundle to the `config/bundles.php` file and adds required environment variables into `.env` file.

diff --git a/Service/Credentials/CredentialsGenerator.php b/Service/Credentials/CredentialsGenerator.php
@@ -57,6 +57,29 @@ public function generateJwtTokenForUser(CentrifugoUserInterface|CentrifugoUserMe
         return $this->jwtGenerator->generateToken($jwtPayload);
     }
 
+    /**
+     * @param string      $subject
+     * @param array       $info
+     * @param array       $meta
+     * @param string|null $base64info
+     * @param array       $channels
+     *
+     * @return string
+     */
+    public function generateJwtToken(string $subject, array $info = [], array $meta = [], ?string $base64info = null, array $channels = []): string
+    {
+        $jwtPayload = new JwtPayload(
+            subject: $subject,
+            info: $info,
+            meta: $meta,
+            expirationTime: $this->getExpirationTime(),
+            base64info: $base64info,
+            channels: $channels,
+        );
+
+        return $this->jwtGenerator->generateToken($jwtPayload);
+    }
+
     /**
      * @param string|null $base64info
      * @param array       $channels

diff --git a/Tests/Command/Argument/ArgumentChannelTraitTest.php b/Tests/Command/Argument/ArgumentChannelTraitTest.php
@@ -31,8 +31,8 @@
  */
 final class ArgumentChannelTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Argument/ArgumentChannelsTraitTest.php b/Tests/Command/Argument/ArgumentChannelsTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class ArgumentChannelsTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Argument/ArgumentDataTraitTest.php b/Tests/Command/Argument/ArgumentDataTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class ArgumentDataTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Argument/ArgumentUserTraitTest.php b/Tests/Command/Argument/ArgumentUserTraitTest.php
@@ -29,7 +29,7 @@
  */
 final class ArgumentUserTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/BroadcastCommandTest.php b/Tests/Command/BroadcastCommandTest.php
@@ -29,8 +29,8 @@
  */
 final class BroadcastCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/ChannelsCommandTest.php b/Tests/Command/ChannelsCommandTest.php
@@ -28,7 +28,7 @@
  */
 final class ChannelsCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/DisconnectCommandTest.php b/Tests/Command/DisconnectCommandTest.php
@@ -30,7 +30,7 @@
  */
 final class DisconnectCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/HistoryCommandTest.php b/Tests/Command/HistoryCommandTest.php
@@ -30,8 +30,8 @@
  */
 final class HistoryCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/HistoryRemoveCommandTest.php b/Tests/Command/HistoryRemoveCommandTest.php
@@ -29,8 +29,8 @@
  */
 final class HistoryRemoveCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/InfoCommandTest.php b/Tests/Command/InfoCommandTest.php
@@ -28,7 +28,7 @@
  */
 final class InfoCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionBase64DataTraitTest.php b/Tests/Command/Option/OptionBase64DataTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class OptionBase64DataTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionBase64InfoTraitTest.php b/Tests/Command/Option/OptionBase64InfoTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class OptionBase64InfoTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionDataTraitTest.php b/Tests/Command/Option/OptionDataTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class OptionDataTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionDisconnectCodeTraitTest.php b/Tests/Command/Option/OptionDisconnectCodeTraitTest.php
@@ -29,7 +29,7 @@
  */
 final class OptionDisconnectCodeTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionDisconnectReasonTraitTest.php b/Tests/Command/Option/OptionDisconnectReasonTraitTest.php
@@ -28,7 +28,7 @@
  */
 final class OptionDisconnectReasonTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionEpochTraitTest.php b/Tests/Command/Option/OptionEpochTraitTest.php
@@ -29,8 +29,8 @@
  */
 final class OptionEpochTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionExpireAtTraitTest.php b/Tests/Command/Option/OptionExpireAtTraitTest.php
@@ -29,7 +29,7 @@
  */
 final class OptionExpireAtTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionExpiredTraitTest.php b/Tests/Command/Option/OptionExpiredTraitTest.php
@@ -28,7 +28,7 @@
  */
 final class OptionExpiredTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionInfoTraitTest.php b/Tests/Command/Option/OptionInfoTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class OptionInfoTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionLimitTraitTest.php b/Tests/Command/Option/OptionLimitTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class OptionLimitTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionOffsetTraitTest.php b/Tests/Command/Option/OptionOffsetTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class OptionOffsetTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionReverseTraitTest.php b/Tests/Command/Option/OptionReverseTraitTest.php
@@ -29,8 +29,8 @@
  */
 final class OptionReverseTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionSkipHistoryTraitTest.php b/Tests/Command/Option/OptionSkipHistoryTraitTest.php
@@ -29,8 +29,8 @@
  */
 final class OptionSkipHistoryTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/Option/OptionTagsTraitTest.php b/Tests/Command/Option/OptionTagsTraitTest.php
@@ -30,8 +30,8 @@
  */
 final class OptionTagsTraitTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/PresenceCommandTest.php b/Tests/Command/PresenceCommandTest.php
@@ -29,8 +29,8 @@
  */
 final class PresenceCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/PresenceStatsCommandTest.php b/Tests/Command/PresenceStatsCommandTest.php
@@ -29,8 +29,8 @@
  */
 final class PresenceStatsCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/PublishCommandTest.php b/Tests/Command/PublishCommandTest.php
@@ -29,8 +29,8 @@
  */
 final class PublishCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/RefreshCommandTest.php b/Tests/Command/RefreshCommandTest.php
@@ -28,7 +28,7 @@
  */
 final class RefreshCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
+    private CentrifugoInterface&MockObject $centrifugo;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/SubscribeCommandTest.php b/Tests/Command/SubscribeCommandTest.php
@@ -30,8 +30,8 @@
  */
 final class SubscribeCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/Command/UnsubscribeCommandTest.php b/Tests/Command/UnsubscribeCommandTest.php
@@ -29,8 +29,8 @@
  */
 final class UnsubscribeCommandTest extends TestCase
 {
-    private CentrifugoInterface|MockObject $centrifugo;
-    private CentrifugoChecker|MockObject $centrifugoChecker;
+    private CentrifugoInterface&MockObject $centrifugo;
+    private CentrifugoChecker&MockObject $centrifugoChecker;
     private Command $command;
     private Application $application;
     private CommandTester $commandTester;

diff --git a/Tests/DataCollector/CommandCollectorTest.php b/Tests/DataCollector/CommandCollectorTest.php
@@ -27,7 +27,7 @@
  */
 final class CommandCollectorTest extends TestCase
 {
-    private CommandHistoryLogger|MockObject $commandHistoryLogger;
+    private CommandHistoryLogger&MockObject $commandHistoryLogger;
     private CentrifugoCollector $centrifugoCollector;
 
     protected function setUp(): void

diff --git a/Tests/DependencyInjection/Compiler/RegisterCentrifugoPassTest.php b/Tests/DependencyInjection/Compiler/RegisterCentrifugoPassTest.php
@@ -32,7 +32,7 @@ final class RegisterCentrifugoPassTest extends TestCase
 {
     use ConsecutiveParams;
 
-    private ContainerBuilder|MockObject $containerBuilder;
+    private ContainerBuilder&MockObject $containerBuilder;
     private RegisterCentrifugoPass $registerCentrifugoPass;
 
     protected function setUp(): void

diff --git a/Tests/Exception/CentrifugoErrorExceptionTest.php b/Tests/Exception/CentrifugoErrorExceptionTest.php
@@ -29,8 +29,8 @@
 final class CentrifugoErrorExceptionTest extends TestCase
 {
     private CentrifugoErrorException $exception;
-    private CommandInterface|MockObject $command;
-    private ResponseInterface|MockObject $response;
+    private CommandInterface&MockObject $command;
+    private ResponseInterface&MockObject $response;
 
     protected function setUp(): void
     {

diff --git a/Tests/Exception/CentrifugoExceptionTest.php b/Tests/Exception/CentrifugoExceptionTest.php
@@ -27,7 +27,7 @@
 final class CentrifugoExceptionTest extends TestCase
 {
     private CentrifugoException $exception;
-    private ResponseInterface|MockObject $response;
+    private ResponseInterface&MockObject $response;
 
     protected function setUp(): void
     {