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

Revert "fix: Read admin emails for migration from the docker.env file directly" (#40542)

Browse Source 
Reverts appsmithorg/appsmith#40520

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Improved how admin email environment variables are retrieved,
resulting in a simpler and more reliable setup process for super user
configuration. No changes to user-facing functionality.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Trisha Anand 2025-05-02 11:03:48 +05:30 committed by GitHub
parent 0cc104ed93
commit d0bfac3e8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration10000_UpdateSuperUser.java
View File

@ -1,7 +1,6 @@
package com.appsmith.server.migrations.db.ce;
import com.appsmith.server.acl.PolicyGenerator;
import com.appsmith.server.configurations.CommonConfig;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.Config;
import com.appsmith.server.domains.Organization;
@ -10,7 +9,6 @@ import com.appsmith.server.domains.User;
import com.appsmith.server.helpers.TextUtils;
import com.appsmith.server.migrations.solutions.UpdateSuperUserMigrationHelper;
import com.appsmith.server.repositories.CacheableRepositoryHelper;
import com.appsmith.server.solutions.EnvManager;
import com.appsmith.server.solutions.PolicySolution;
import io.mongock.api.annotations.ChangeUnit;
import io.mongock.api.annotations.Execution;
@ -20,11 +18,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@ -47,22 +40,16 @@ public class Migration10000_UpdateSuperUser {
private final PolicySolution policySolution;
private final PolicyGenerator policyGenerator;
private final UpdateSuperUserMigrationHelper updateSuperUserMigrationHelper;
private final CommonConfig commonConfig;
private final EnvManager envManager;
public Migration10000_UpdateSuperUser(
MongoTemplate mongoTemplate,
CacheableRepositoryHelper cacheableRepositoryHelper,
PolicySolution policySolution,
PolicyGenerator policyGenerator,
CommonConfig commonConfig,
EnvManager envManager) {
PolicyGenerator policyGenerator) {
this.mongoTemplate = mongoTemplate;
this.cacheableRepositoryHelper = cacheableRepositoryHelper;
this.policySolution = policySolution;
this.policyGenerator = policyGenerator;
this.commonConfig = commonConfig;
this.envManager = envManager;
this.updateSuperUserMigrationHelper = new UpdateSuperUserMigrationHelper();
}
@ -72,22 +59,7 @@ public class Migration10000_UpdateSuperUser {
@Execution
public void executeMigration() {
// Read the admin emails from the environment and update the super users accordingly
String originalContent = "";
try {
originalContent = Files.readString(Path.of(commonConfig.getEnvFilePath()));
} catch (NoSuchFileException e) {
log.error("Env file not found at " + commonConfig.getEnvFilePath(), e);
// No need to throw an exception here, as this is a non-critical migration
return;
} catch (IOException e) {
log.error("Unable to read env file " + commonConfig.getEnvFilePath(), e);
// No need to throw an exception here, as this is a non-critical migration
return;
}
Map<String, String> envVariableMap = envManager.parseToMap(originalContent);
// Get the admin emails from the environment variable
String adminEmailsStr = envVariableMap.get(APPSMITH_ADMIN_EMAILS.name());
String adminEmailsStr = System.getenv(String.valueOf(APPSMITH_ADMIN_EMAILS));
Set<String> adminEmails = TextUtils.csvToSet(adminEmailsStr);