chore: Update instance variables via organization config update

app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/OrganizationConfigurationCE.java

@@ -10,6 +10,7 @@
 import lombok.Data;
 import lombok.experimental.FieldNameConstants;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.data.annotation.Transient;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -20,17 +21,20 @@
 @FieldNameConstants
 public class OrganizationConfigurationCE implements Serializable {
 
+    @Transient
     @Deprecated(forRemoval = true, since = "v1.65")
     private String googleMapsKey;
 
     private Boolean isFormLoginEnabled;
 
+    @Transient
     @Deprecated(forRemoval = true, since = "v1.65")
     private String instanceName;
 
     protected License license;
 
     // organization admin can toggle this field to enable/disable email verification
+    @Transient
     @Deprecated(forRemoval = true, since = "v1.65")
     private Boolean emailVerificationEnabled;
 
@@ -82,18 +86,14 @@ public void copyNonSensitiveValues(OrganizationConfiguration organizationConfigu
                 ObjectUtils.defaultIfNull(organizationConfiguration.getIsFormLoginEnabled(), isFormLoginEnabled);
         instanceName = ObjectUtils.defaultIfNull(organizationConfiguration.getInstanceName(), instanceName);
         emailVerificationEnabled = ObjectUtils.defaultIfNull(
-                organizationConfiguration.isEmailVerificationEnabled(), emailVerificationEnabled);
+                organizationConfiguration.getEmailVerificationEnabled(), emailVerificationEnabled);
 
         featuresWithPendingMigration = organizationConfiguration.getFeaturesWithPendingMigration();
         migrationStatus = organizationConfiguration.getMigrationStatus();
         isStrongPasswordPolicyEnabled = organizationConfiguration.getIsStrongPasswordPolicyEnabled();
         isAtomicPushAllowed = organizationConfiguration.getIsAtomicPushAllowed();
     }
 
-    public Boolean isEmailVerificationEnabled() {
-        return Boolean.TRUE.equals(this.emailVerificationEnabled);
-    }
-
     public static class Fields {
         public Fields() {
             // Public constructor for Fields class

app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceVariablesHelperCE.java

@@ -1,10 +1,15 @@
 package com.appsmith.server.helpers.ce;
 
 import com.appsmith.server.constants.Appsmith;
+import com.appsmith.server.domains.OrganizationConfiguration;
 import com.appsmith.server.services.ConfigService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Helper class for accessing instance variables from the instance config
  */
@@ -47,4 +52,47 @@ public Mono<String> getGoogleMapsKey() {
             return value != null ? value.toString() : "";
         });
     }
+
+    public OrganizationConfiguration populateOrgConfigWithInstanceVariables(
+            Map<String, Object> instanceVariables, OrganizationConfiguration organizationConfiguration) {
+        Object value = instanceVariables.getOrDefault("instanceName", Appsmith.DEFAULT_INSTANCE_NAME);
+        organizationConfiguration.setInstanceName(value != null ? value.toString() : Appsmith.DEFAULT_INSTANCE_NAME);
+
+        value = instanceVariables.getOrDefault("emailVerificationEnabled", false);
+        if (value instanceof Boolean) {
+            organizationConfiguration.setEmailVerificationEnabled((Boolean) value);
+        } else {
+            organizationConfiguration.setEmailVerificationEnabled(Boolean.FALSE);
+        }
+
+        value = instanceVariables.getOrDefault("googleMapsKey", "");
+        organizationConfiguration.setGoogleMapsKey(value != null ? value.toString() : "");
+
+        return organizationConfiguration;
+    }
+
+    // TODO @CloudBilling: Temporary method to update instance variables via organization configuration. This method
+    //  will be removed once the instance variables will be removed from organization configuration
+    public Mono<OrganizationConfiguration> updateInstanceVariables(OrganizationConfiguration orgConfig) {
+
+        Map<String, Object> updatedInstanceVariables = updateAllowedInstanceVariables(orgConfig);
+        return configService.getInstanceVariables().flatMap(instanceVariable -> {
+            instanceVariable.putAll(updatedInstanceVariables);
+            return configService.updateInstanceVariables(instanceVariable).thenReturn(orgConfig);
+        });
+    }
+
+    protected Map<String, Object> updateAllowedInstanceVariables(OrganizationConfiguration orgConfig) {
+        Map<String, Object> instanceVariables = new HashMap<>();
+        if (StringUtils.hasLength(orgConfig.getInstanceName())) {
+            instanceVariables.put("instanceName", orgConfig.getInstanceName());
+        }
+        if (orgConfig.getEmailVerificationEnabled() != null) {
+            instanceVariables.put("emailVerificationEnabled", orgConfig.getEmailVerificationEnabled());
+        }
+        if (StringUtils.hasLength(orgConfig.getGoogleMapsKey())) {
+            instanceVariables.put("googleMapsKey", orgConfig.getGoogleMapsKey());
+        }
+        return instanceVariables;
+    }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration069MigrateOrganizationConfigToInstanceConfig.java

@@ -70,7 +70,7 @@ public void migrateOrganizationConfigToInstanceConfig() {
             instanceVariables.put("instanceName", Appsmith.DEFAULT_INSTANCE_NAME);
         }
 
-        instanceVariables.put("emailVerificationEnabled", orgConfig.isEmailVerificationEnabled());
+        instanceVariables.put("emailVerificationEnabled", Boolean.TRUE.equals(orgConfig.getEmailVerificationEnabled()));
         instanceVariables.put("googleMapsKey", orgConfig.getGoogleMapsKey());
 
         // Add instanceVariables to config

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCE.java

@@ -3,7 +3,6 @@
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Config;
 import com.appsmith.server.domains.User;
-import net.minidev.json.JSONObject;
 import reactor.core.publisher.Mono;
 
 import java.util.Map;
@@ -37,5 +36,5 @@ public interface ConfigServiceCE {
      * @param instanceVariables JSONObject containing the instance variables to update
      * @return Updated Config object
      */
-    Mono<Config> updateInstanceVariables(JSONObject instanceVariables);
+    Mono<Config> updateInstanceVariables(Map<String, Object> instanceVariables);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConfigServiceCEImpl.java

@@ -114,13 +114,13 @@ public Mono<Map<String, Object>> getInstanceVariables() {
     }
 
     @Override
-    public Mono<Config> updateInstanceVariables(JSONObject instanceVariables) {
-        return getByName(FieldName.INSTANCE_CONFIG, AclPermission.MANAGE_INSTANCE_CONFIGURATION)
-                .flatMap(config -> {
-                    JSONObject configObj = config.getConfig();
-                    configObj.put(INSTANCE_VARIABLES, instanceVariables);
-                    config.setConfig(configObj);
-                    return repository.save(config);
-                });
+    public Mono<Config> updateInstanceVariables(Map<String, Object> instanceVariables) {
+        // TODO @CloudBilling add manage instance permission once the migration for variables is complete
+        return getByName(FieldName.INSTANCE_CONFIG).flatMap(config -> {
+            JSONObject configObj = config.getConfig();
+            configObj.put(INSTANCE_VARIABLES, instanceVariables);
+            config.setConfig(configObj);
+            return repository.save(config);
+        });
     }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/OrganizationServiceCEImpl.java

@@ -103,7 +103,7 @@ public Mono<Organization> updateOrganizationConfiguration(
                     }
                     Mono<Map<String, String>> envMono = Mono.empty();
                     // instance admin is setting the email verification to true but the SMTP settings are not configured
-                    if (organizationConfiguration.isEmailVerificationEnabled() == Boolean.TRUE) {
+                    if (Boolean.TRUE.equals(organizationConfiguration.getEmailVerificationEnabled())) {
                         envMono = envManager.getAllNonEmpty().flatMap(properties -> {
                             String mailHost = properties.get("APPSMITH_MAIL_HOST");
                             if (mailHost == null || mailHost == "") {
@@ -128,10 +128,12 @@ public Mono<Organization> updateOrganizationConfiguration(
                     Mono<Organization> updatedOrganizationMono = repository
                             .updateById(organizationId, organization, MANAGE_ORGANIZATION)
                             .cache();
+
                     // Firstly updating the Organization object in the database and then evicting the cache.
                     // returning the updatedOrganization, notice the updatedOrganizationMono is cached using .cache()
                     // hence it will not be evaluated again
                     return updatedOrganizationMono
+                            .then(instanceVariablesHelper.updateInstanceVariables(organizationConfiguration))
                             .then(Mono.defer(() -> evictOrganizationCache))
                             .then(Mono.defer(() -> allSideEffectsMono))
                             .then(updatedOrganizationMono);
@@ -154,21 +156,17 @@ public Mono<Organization> findById(String organizationId, AclPermission permissi
     @Override
     public Mono<Organization> getOrganizationConfiguration(Mono<Organization> dbOrganizationMono) {
         String adminEmailDomainHash = commonConfig.getAdminEmailDomainHash();
-        Mono<Organization> clientOrganizationMono = Mono.zip(
-                        configService.getInstanceId(), instanceVariablesHelper.getGoogleMapsKey())
-                .map(tuple -> {
-                    final String instanceId = tuple.getT1();
-                    final String googleMapsKey = tuple.getT2();
 
+        Mono<Organization> clientOrganizationMono = configService
+                .getInstanceId()
+                .flatMap(instanceId -> {
                     final Organization organization = new Organization();
                     organization.setInstanceId(instanceId);
                     organization.setAdminEmailDomainHash(adminEmailDomainHash);
 
                     final OrganizationConfiguration config = new OrganizationConfiguration();
                     organization.setOrganizationConfiguration(config);
 
-                    config.setGoogleMapsKey(googleMapsKey);
-
                     if (StringUtils.hasText(System.getenv("APPSMITH_OAUTH2_GOOGLE_CLIENT_ID"))) {
                         config.addThirdPartyAuth("google");
                     }
@@ -179,7 +177,14 @@ public Mono<Organization> getOrganizationConfiguration(Mono<Organization> dbOrga
 
                     config.setIsFormLoginEnabled(!"true".equals(System.getenv("APPSMITH_FORM_LOGIN_DISABLED")));
 
-                    return organization;
+                    return configService
+                            .getInstanceVariables()
+                            .map(instanceVariables -> instanceVariablesHelper.populateOrgConfigWithInstanceVariables(
+                                    instanceVariables, config))
+                            .map(organizationConfiguration -> {
+                                organization.setOrganizationConfiguration(organizationConfiguration);
+                                return organization;
+                            });
                 });
 
         return Mono.zip(dbOrganizationMono, clientOrganizationMono).flatMap(tuple -> {

app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/OrganizationServiceCETest.java

@@ -13,6 +13,7 @@
 import com.appsmith.server.repositories.CacheableRepositoryHelper;
 import com.appsmith.server.repositories.OrganizationRepository;
 import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.services.ConfigService;
 import com.appsmith.server.services.FeatureFlagService;
 import com.appsmith.server.services.OrganizationService;
 import com.appsmith.server.solutions.EnvManager;
@@ -81,6 +82,9 @@ class OrganizationServiceCETest {
     @MockBean
     FeatureFlagMigrationHelper featureFlagMigrationHelper;
 
+    @Autowired
+    ConfigService configService;
+
     OrganizationConfiguration originalOrganizationConfiguration;
 
     @BeforeEach
@@ -97,6 +101,7 @@ public void setup() throws IOException {
                         null)
                 .block();
 
+        configService.updateInstanceVariables(new HashMap<>()).block();
         // Make api_user super-user to test organization admin functionality
         // Todo change this to organization admin once we introduce multitenancy
         userRepository
@@ -230,7 +235,7 @@ void setEmailVerificationEnabled_WithValidSMTPHost_Success() {
 
         StepVerifier.create(resultMono)
                 .assertNext(organizationConfiguration -> {
-                    assertThat(organizationConfiguration.isEmailVerificationEnabled())
+                    assertThat(organizationConfiguration.getEmailVerificationEnabled())
                             .isTrue();
                 })
                 .verifyComplete();
@@ -249,7 +254,7 @@ void setEmailVerificationEnabledFalseAndGetItBack() {
 
         StepVerifier.create(resultMono)
                 .assertNext(organizationConfiguration -> {
-                    assertThat(organizationConfiguration.isEmailVerificationEnabled())
+                    assertThat(organizationConfiguration.getEmailVerificationEnabled())
                             .isFalse();
                 })
                 .verifyComplete();