Merge pull request lowcoder-org#1079 from goldants/fix/expire

FalkWolsky · web-flow · commit c7a425e40991 · 2024-08-12T19:26:09.000+02:00
Fix 500 issue when cookie expires
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java
@@ -19,6 +19,7 @@
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 import java.time.Instant;
 import java.util.Optional;
@@ -121,7 +122,8 @@ private Mono<User> refreshOauthToken(Triple<User, Connection, String> triple) {
                     oAuth2RequestContext.setAuthConfig(findAuthConfig.authConfig());
 
                     return authRequestFactory.build(oAuth2RequestContext);
-                }).flatMap(authRequest -> {
+                })
+                .publishOn(Schedulers.boundedElastic()).flatMap(authRequest -> {
                     if(authRequest == null) {
                         return Mono.just(user);
                     }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
@@ -39,6 +39,7 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 
+import java.time.Instant;
 import java.util.Set;
 
 import static org.lowcoder.domain.util.QueryDslUtils.fieldName;
@@ -246,7 +247,31 @@ public void processDocument(Document document) {
         });
     }
 
-    @ChangeSet(order = "024", id = "add-gid-indexes-unique", author = "")
+    @ChangeSet(order = "024", id = "fill-create-at", author = "")
+    public void fillCreateAt(MongockTemplate mongoTemplate) {
+        // Create a query to match all documents
+        Query query = new Query();
+
+        // Use a DocumentCallbackHandler to iterate through each document
+        mongoTemplate.executeQuery(query, "folder", new DocumentCallbackHandler() {
+            @Override
+            public void processDocument(Document document) {
+                Object object = document.get("createdAt");
+                if (object != null) return;
+                // Create an update object to add the 'gid' field
+                Update update = new Update();
+                update.set("createdAt", Instant.now());
+
+                // Create a query to match the current document by its _id
+                Query idQuery = new Query(Criteria.where("_id").is(document.getObjectId("_id")));
+
+                // Update the document with the new 'gid' field
+                mongoTemplate.updateFirst(idQuery, update, "folder");
+            }
+        });
+    }
+  
+    @ChangeSet(order = "025", id = "add-gid-indexes-unique", author = "")
     public void addGidIndexesUnique(MongockTemplate mongoTemplate) {
         // collections to add gid
         String[] collectionNames = {"group", "organization"};
