Fix twitch auth

Author: FunixG

modules/twitch/auth/service/pom.xml

@@ -25,6 +25,12 @@
             <version>${com.funixproductions.api.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.funixproductions.api.twitch.eventsub.client</groupId>
+            <artifactId>funixproductions-twitch-eventsub-client</artifactId>
+            <version>${com.funixproductions.api.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.funixproductions.api.encryption.client</groupId>
             <artifactId>funixproductions-encryption-client</artifactId>

modules/twitch/auth/service/src/main/java/com/funixproductions/api/twitch/auth/service/FunixProductionsTwitchAuthApp.java

@@ -9,7 +9,8 @@
 @EnableFeignClients(basePackages = {
         "com.funixproductions.api.user",
         "com.funixproductions.api.twitch.auth.service",
-        "com.funixproductions.api.encryption"
+        "com.funixproductions.api.twitch.eventsub.client",
+        "com.funixproductions.api.encryption",
 })
 @SpringBootApplication(scanBasePackages = "com.funixproductions")
 public class FunixProductionsTwitchAuthApp {

modules/twitch/auth/service/src/main/java/com/funixproductions/api/twitch/auth/service/services/TwitchClientTokenService.java

@@ -12,6 +12,7 @@
 import com.funixproductions.api.twitch.auth.service.entities.TwitchClientToken;
 import com.funixproductions.api.twitch.auth.service.mappers.TwitchClientTokenMapper;
 import com.funixproductions.api.twitch.auth.service.repositories.TwitchClientTokenRepository;
+import com.funixproductions.api.twitch.eventsub.client.clients.TwitchEventSubInternalClient;
 import com.funixproductions.api.user.client.dtos.UserDTO;
 import com.funixproductions.api.user.client.security.CurrentSession;
 import com.funixproductions.core.exceptions.ApiBadRequestException;
@@ -46,6 +47,7 @@ public class TwitchClientTokenService {
     private final TwitchClientTokenMapper twitchClientTokenMapper;
     private final TwitchTokenAuthClient twitchTokenAuthClient;
     private final TwitchValidTokenClient validTokenClient;
+    private final TwitchEventSubInternalClient twitchEventSubInternalClient;
 
     private final PasswordGenerator passwordGenerator;
     private final CurrentSession currentSession;
@@ -67,14 +69,16 @@ public TwitchClientTokenService(TwitchAuthConfig twitchAuthConfig,
                                     TwitchTokenAuthClient twitchTokenAuthClient,
                                     CurrentSession currentSession,
                                     TwitchApiConfig twitchApiConfig,
-                                    TwitchValidTokenClient twitchValidTokenClient) {
+                                    TwitchValidTokenClient twitchValidTokenClient,
+                                    TwitchEventSubInternalClient twitchEventSubInternalClient) {
         this.twitchClientTokenRepository = twitchClientTokenRepository;
         this.twitchAuthConfig = twitchAuthConfig;
         this.twitchTokenAuthClient = twitchTokenAuthClient;
         this.twitchClientTokenMapper = twitchClientTokenMapper;
         this.currentSession = currentSession;
         this.validTokenClient = twitchValidTokenClient;
         this.twitchApiConfig = twitchApiConfig;
+        this.twitchEventSubInternalClient = twitchEventSubInternalClient;
 
         this.passwordGenerator = new PasswordGenerator();
         passwordGenerator.setSpecialCharsAmount(0);
@@ -361,7 +365,11 @@ private TwitchClientTokenDTO refreshToken(final TwitchClientToken token) {
     }
 
     private void createEventSub(final String streamerName) {
-
+        try {
+            this.twitchEventSubInternalClient.createSubscription(streamerName);
+        } catch (Exception e) {
+            log.error("Error while creating event sub for streamer {}", streamerName, new ApiException("Error while creating event sub for streamer " + streamerName, e));
+        }
     }
 
 }

modules/twitch/auth/service/src/test/java/com/funixproductions/api/twitch/auth/service/resources/TwitchAuthResourceTest.java

@@ -6,6 +6,7 @@
 import com.funixproductions.api.twitch.auth.service.clients.TwitchValidTokenClient;
 import com.funixproductions.api.twitch.auth.service.dtos.TwitchTokenResponseDTO;
 import com.funixproductions.api.twitch.auth.service.dtos.TwitchValidationTokenResponseDTO;
+import com.funixproductions.api.twitch.eventsub.client.clients.TwitchEventSubInternalClient;
 import com.funixproductions.api.user.client.clients.UserAuthClient;
 import com.funixproductions.api.user.client.dtos.UserDTO;
 import com.funixproductions.api.user.client.enums.UserRole;
@@ -48,6 +49,9 @@ class TwitchAuthResourceTest {
     @MockitoBean
     private EncryptionClient encryptionClient;
 
+    @MockitoBean
+    private TwitchEventSubInternalClient twitchEventSubInternalClient;
+
     @Autowired
     private MockMvc mockMvc;
 
@@ -80,6 +84,8 @@ void setupFeignClients() {
 
         Mockito.when(this.encryptionClient.decrypt(anyString())).thenReturn(UUID.randomUUID().toString());
         Mockito.when(this.encryptionClient.encrypt(anyString())).thenReturn(UUID.randomUUID().toString());
+
+        Mockito.doNothing().when(twitchEventSubInternalClient).createSubscription(anyString());
     }
 
     @Test

modules/twitch/eventsub/service/src/main/java/com/funixproductions/api/twitch/eventsub/service/services/TwitchEventSubReferenceService.java

@@ -76,7 +76,8 @@ public void createSubscription(@NonNull final TwitchSubscription request) throws
             } else if (statusCode == 429) {
                 throw new ApiException("Erreur 429 Too Many Requests (rate limit) de Twitch lors de la création d'une subscription Twitch.", e);
             } else if (statusCode == 409) {
-                throw new ApiException(String.format(
+                log.info("Erreur 409 Conflict de Twitch lors de la création d'une subscription Twitch. Event {} déjà existant.", request.getType());
+                throw new ApiBadRequestException(String.format(
                         "Erreur 409 Conflict de Twitch lors de la création d'une subscription Twitch. Event %s déjà existant.",
                         request.getType()
                 ), e);

modules/twitch/eventsub/service/src/main/java/com/funixproductions/api/twitch/eventsub/service/services/TwitchEventSubRegistrationService.java

@@ -57,6 +57,7 @@ public void handleOnePendingSubscriptionFromQueue() {
 
         if (subscription != null) {
             this.twitchEventSubReferenceService.createSubscription(subscription);
+            log.info("Subscription created for type {} with payload {}.", subscription.getType(), subscription.getPayload());
         }
     }
 
@@ -66,6 +67,7 @@ public void handleOnePendingUnsubscriptionFromQueue() {
 
         if (subscriptionId != null) {
             this.twitchEventSubReferenceService.deleteSubscription(subscriptionId);
+            log.info("Subscription deleted with id {}.", subscriptionId);
         }
     }