Merge pull request #48 from Milesight-IoT/fix/user_context

fix(msc-integration): set up user context

Author: leonside

integrations/msc-integration/src/main/java/com/milesight/beaveriot/integration/msc/service/MscDataSyncService.java

@@ -10,6 +10,7 @@
 import com.milesight.beaveriot.context.constants.ExchangeContextKeys;
 import com.milesight.beaveriot.context.integration.model.Device;
 import com.milesight.beaveriot.context.integration.model.ExchangePayload;
+import com.milesight.beaveriot.context.security.SecurityUserContext;
 import com.milesight.beaveriot.context.security.TenantContext;
 import com.milesight.beaveriot.eventbus.annotations.EventSubscribe;
 import com.milesight.beaveriot.eventbus.api.Event;
@@ -92,8 +93,15 @@ private void updateScheduled(boolean enabled) {
 
     private Future<?> runSyncTask(boolean delta) {
         val tenantId = TenantContext.getTenantId();
+        val user = SecurityUserContext.getSecurityUser();
         return executor.submit(() -> {
             TenantContext.setTenantId(tenantId);
+            if (user != null) {
+                SecurityUserContext.setSecurityUser(user);
+            } else {
+                SecurityUserContext.clear();
+            }
+
             val lockConfiguration = ScopedLockConfiguration.builder(LockScope.TENANT)
                     .name("msc-integration:sync-all")
                     .lockAtLeastFor(Duration.ofSeconds(0))
@@ -143,6 +151,7 @@ public void disable(String tenantId) {
             enabledEntity = "msc-integration.integration.scheduled_data_fetch.enabled"
     )
     public void scheduledSync() {
+        SecurityUserContext.clear();
         runSyncTask(true);
     }
 
@@ -238,10 +247,18 @@ public CompletableFuture<Boolean> syncDeviceData(Task task) {
             log.info("Skip execution because device task is running: {}", task.identifier);
             return CompletableFuture.completedFuture(null);
         }
+
         val tenantId = TenantContext.getTenantId();
+        val user = SecurityUserContext.getSecurityUser();
         return CompletableFuture.supplyAsync(() -> {
             try {
                 TenantContext.setTenantId(tenantId);
+                if (user != null) {
+                    SecurityUserContext.setSecurityUser(user);
+                } else {
+                    SecurityUserContext.clear();
+                }
+
                 Device device = null;
                 switch (task.type) {
                     case ADD_LOCAL_DEVICE -> device = addLocalDevice(task);