— Modification: HardwareMonitoringSubscriber created once based on ba…

…se JWT security or base on JWT+websockets security
tech1-agency · Jul 15, 2024 · 16b5058 · 16b5058
1 parent 8641507
commit 16b5058
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,3 @@
 ### Changelog [v3.0.4]
 — Modification: hardware monitoring store, CircularFifoQueue -> Deque
+— Modification: HardwareMonitoringSubscriber created once based on base JWT security or base on JWT+websockets security
diff --git a/...main/java/io/tech1/framework/foundation/configurations/ApplicationHardwareMonitoring.java b/...main/java/io/tech1/framework/foundation/configurations/ApplicationHardwareMonitoring.java
@@ -7,8 +7,6 @@
 import io.tech1.framework.foundation.services.hardware.resources.HardwareMonitoringResource;
 import io.tech1.framework.foundation.services.hardware.store.HardwareMonitoringStore;
 import io.tech1.framework.foundation.services.hardware.store.impl.HardwareMonitoringStoreImpl;
-import io.tech1.framework.foundation.services.hardware.subscribers.HardwareMonitoringSubscriber;
-import io.tech1.framework.foundation.services.hardware.subscribers.impl.BaseHardwareMonitoringSubscriber;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,13 +42,6 @@ HardwareMonitoringPublisher hardwareMonitoringPublisher() {
         );
     }
 
-    @Bean
-    HardwareMonitoringSubscriber hardwareMonitoringSubscriber() {
-        return new BaseHardwareMonitoringSubscriber(
-                this.hardwareMonitoringStore()
-        );
-    }
-
     @Bean
     HardwareMonitoringResource hardwareMonitoringResource() {
         return new HardwareMonitoringResource(

diff --git a/...mpl/BaseHardwareMonitoringSubscriber.java → ...ase/BaseHardwareMonitoringSubscriber.java b/...mpl/BaseHardwareMonitoringSubscriber.java → ...ase/BaseHardwareMonitoringSubscriber.java
@@ -1,14 +1,17 @@
-package io.tech1.framework.foundation.services.hardware.subscribers.impl;
+package io.tech1.framework.foundation.services.hardware.subscribers.base;
 
 import io.tech1.framework.foundation.domain.events.hardware.EventLastHardwareMonitoringDatapoint;
 import io.tech1.framework.foundation.domain.pubsub.AbstractEventSubscriber;
 import io.tech1.framework.foundation.services.hardware.store.HardwareMonitoringStore;
 import io.tech1.framework.foundation.services.hardware.subscribers.HardwareMonitoringSubscriber;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 @Slf4j
-@AllArgsConstructor
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class BaseHardwareMonitoringSubscriber extends AbstractEventSubscriber implements HardwareMonitoringSubscriber {
 
     private final HardwareMonitoringStore hardwareMonitoringStore;

diff --git a/...BaseHardwareMonitoringSubscriberTest.java → ...BaseHardwareMonitoringSubscriberTest.java b/...BaseHardwareMonitoringSubscriberTest.java → ...BaseHardwareMonitoringSubscriberTest.java
@@ -1,4 +1,4 @@
-package io.tech1.framework.foundation.services.hardware.subscribers.impl;
+package io.tech1.framework.foundation.services.hardware.subscribers.base;
 
 import io.tech1.framework.foundation.domain.events.hardware.EventLastHardwareMonitoringDatapoint;
 import io.tech1.framework.foundation.services.hardware.store.HardwareMonitoringStore;

diff --git a/...rver/src/main/java/io/tech1/framework/iam/server/configurations/ApplicationIamServer.java b/...rver/src/main/java/io/tech1/framework/iam/server/configurations/ApplicationIamServer.java
@@ -3,6 +3,7 @@
 import io.tech1.framework.foundation.domain.base.PropertyId;
 import io.tech1.framework.iam.configurations.AbstractApplicationSecurityJwtConfigurer;
 import io.tech1.framework.iam.configurations.ApplicationBaseSecurityJwt;
+import io.tech1.framework.iam.configurations.ApplicationBaseSecurityJwtWebsockets;
 import io.tech1.framework.iam.server.base.properties.ApplicationProperties;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +23,7 @@
         // -------------------------------------------------------------------------------------------------------------
 })
 @Import({
-        ApplicationBaseSecurityJwt.class
+        ApplicationBaseSecurityJwtWebsockets.class
 })
 @EnableConfigurationProperties({
         ApplicationProperties.class

diff --git a/tech1-framework-iam-server/src/main/resources/application.yml b/tech1-framework-iam-server/src/main/resources/application.yml
@@ -81,6 +81,23 @@ tech1:
         enabled: true
       session-refreshed:
         enabled: true
+  security-jwt-websockets-configs:
+    csrf-configs:
+      header-name: "t-csrf-header"
+      parameter-name: "_csrf"
+      token-key: "t-csrf-token"
+    stomp-configs:
+      endpoint: /t1f-iam-server-websockets
+    broker-configs:
+      application-destination-prefix: /app
+      simple-destination: /queue
+      user-destination-prefix: /user
+    template-configs:
+      enabled: true
+    features-configs:
+      hardware-configs:
+        enabled: true
+        user-destination: "/account"
 
 # Tech1 Server
 tech1-server:

diff --git a/...k-iam/src/main/java/io/tech1/framework/iam/configurations/ApplicationBaseSecurityJwt.java b/...k-iam/src/main/java/io/tech1/framework/iam/configurations/ApplicationBaseSecurityJwt.java
@@ -35,7 +35,10 @@
 @ComponentScan({
         // -------------------------------------------------------------------------------------------------------------
         "io.tech1.framework.iam.crons",
-        "io.tech1.framework.iam.events",
+        "io.tech1.framework.iam.events.publishers.base",
+        "io.tech1.framework.iam.events.publishers.impl",
+        "io.tech1.framework.iam.events.subscribers.base",
+        "io.tech1.framework.iam.events.subscribers.impl",
         "io.tech1.framework.iam.handlers.exceptions",
         "io.tech1.framework.iam.resources",
         "io.tech1.framework.iam.services.base",

diff --git a/...main/java/io/tech1/framework/iam/configurations/ApplicationBaseSecurityJwtWebsockets.java b/...main/java/io/tech1/framework/iam/configurations/ApplicationBaseSecurityJwtWebsockets.java
@@ -6,6 +6,7 @@
 import io.tech1.framework.iam.handshakes.SecurityHandshakeHandler;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -31,6 +32,7 @@
  * </a>
  */
 // idea - reconnect flow: https://stackoverflow.com/questions/53244720/spring-websocket-stomp-exception-handling
+@Slf4j
 @Configuration
 @Import({
         ApplicationBaseSecurityJwt.class

diff --git a/...1/framework/iam/events/subscribers/websockets/HardwareMonitoringSubscriberWebsockets.java b/...1/framework/iam/events/subscribers/websockets/HardwareMonitoringSubscriberWebsockets.java
@@ -3,15 +3,12 @@
 import io.tech1.framework.foundation.domain.events.hardware.EventLastHardwareMonitoringDatapoint;
 import io.tech1.framework.foundation.incidents.events.publishers.IncidentPublisher;
 import io.tech1.framework.foundation.services.hardware.store.HardwareMonitoringStore;
-import io.tech1.framework.foundation.services.hardware.subscribers.impl.BaseHardwareMonitoringSubscriber;
-import io.tech1.framework.iam.configurations.ApplicationBaseSecurityJwtWebsockets;
+import io.tech1.framework.foundation.services.hardware.subscribers.base.BaseHardwareMonitoringSubscriber;
 import io.tech1.framework.iam.tasks.HardwareBackPressureTimerTask;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.context.annotation.Primary;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-@Primary
-@ConditionalOnBean(ApplicationBaseSecurityJwtWebsockets.class)
+@Slf4j
 @Component
 public class HardwareMonitoringSubscriberWebsockets extends BaseHardwareMonitoringSubscriber {
 

diff --git a/...amework-iam/src/main/java/io/tech1/framework/iam/tasks/HardwareBackPressureTimerTask.java b/...amework-iam/src/main/java/io/tech1/framework/iam/tasks/HardwareBackPressureTimerTask.java
@@ -74,7 +74,6 @@ public void send() {
     }
 
     public boolean isAnyProblemOrFirstDatapoint() {
-        return this.hardwareMonitoringStore.getHardwareMonitoringWidget().datapoint().isAnyProblem() ||
-                this.hardwareMonitoringStore.containsOneElement();
+        return this.hardwareMonitoringStore.containsOneElement() || this.hardwareMonitoringStore.getHardwareMonitoringWidget().datapoint().isAnyProblem();
     }
 }