Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Log users out to fix serialization error from upgrading Spring (#15314)

Browse Source
This commit is contained in:
Shrikant Sharat Kandula 2022-07-20 07:43:38 +05:30 committed by GitHub
parent 04ec2c99d6
commit 39ad73228c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
View File

@ -37,7 +37,6 @@ import com.appsmith.server.domains.NewAction;
import com.appsmith.server.domains.NewPage;
import com.appsmith.server.domains.Notification;
import com.appsmith.server.domains.Organization;
import com.appsmith.server.domains.WorkspacePlugin;
import com.appsmith.server.domains.Page;
import com.appsmith.server.domains.PasswordResetToken;
import com.appsmith.server.domains.Plugin;
@ -62,11 +61,12 @@ import com.appsmith.server.domains.Theme;
import com.appsmith.server.domains.User;
import com.appsmith.server.domains.UserData;
import com.appsmith.server.domains.UserRole;
import com.appsmith.server.domains.WorkspacePlugin;
import com.appsmith.server.dtos.ActionCollectionDTO;
import com.appsmith.server.dtos.ActionDTO;
import com.appsmith.server.dtos.DslActionDTO;
import com.appsmith.server.dtos.WorkspacePluginStatus;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.dtos.WorkspacePluginStatus;
import com.appsmith.server.helpers.GitDeployKeyGenerator;
import com.appsmith.server.helpers.TextUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -134,10 +134,10 @@ import static com.appsmith.external.helpers.PluginUtils.setValueSafelyInFormData
import static com.appsmith.server.acl.AclPermission.EXECUTE_ACTIONS;
import static com.appsmith.server.acl.AclPermission.EXPORT_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.MAKE_PUBLIC_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
import static com.appsmith.server.acl.AclPermission.READ_THEMES;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_EXPORT_APPLICATIONS;
import static com.appsmith.server.acl.AclPermission.WORKSPACE_INVITE_USERS;
import static com.appsmith.server.constants.FieldName.DEFAULT_RESOURCES;
import static com.appsmith.server.constants.FieldName.DYNAMIC_TRIGGER_PATH_LIST;
import static com.appsmith.server.helpers.CollectionUtils.isNullOrEmpty;
@ -4459,6 +4459,10 @@ public class DatabaseChangelog {
@ChangeSet(order = "102", id = "flush-spring-redis-keys", author = "")
public void clearRedisCache(ReactiveRedisOperations<String, String> reactiveRedisOperations) {
doClearRedisKeys(reactiveRedisOperations);
}
protected static void doClearRedisKeys(ReactiveRedisOperations<String, String> reactiveRedisOperations) {
final String script =
"for _,k in ipairs(redis.call('keys','spring:session:sessions:*'))" +
" do redis.call('del',k) " +

11
app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
View File

@ -82,8 +82,9 @@ import static org.springframework.data.mongodb.core.query.Query.query;
@ChangeLog(order = "002")
public class DatabaseChangelog2 {
public static ObjectMapper objectMapper = new ObjectMapper();
static Pattern sheetRangePattern = Pattern.compile("https://docs.google.com/spreadsheets/d/([^/]+)/?[^\"]*");
private static final ObjectMapper objectMapper = new ObjectMapper();
private static final Pattern sheetRangePattern = Pattern.compile("https://docs.google.com/spreadsheets/d/([^/]+)/?[^\"]*");
@ChangeSet(order = "001", id = "fix-plugin-title-casing", author = "")
public void fixPluginTitleCasing(MongockTemplate mongockTemplate) {
@ -1367,4 +1368,10 @@ public class DatabaseChangelog2 {
return newWhereClause;
}
@ChangeSet(order = "021", id = "flush-spring-redis-keys-2", author = "")
public void migrateGoogleSheetsToUqi(ReactiveRedisOperations<String, String> reactiveRedisOperations) {
DatabaseChangelog.doClearRedisKeys(reactiveRedisOperations);
}
}