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

chore: Disable default fallback when the form login enabled is null for org config (#40304)

Browse Source
This commit is contained in:
Abhijeet 2025-04-17 17:38:50 +05:30 committed by GitHub
parent 14c7a41ba5
commit 60d5bcd961
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public class OrganizationConfigurationCE implements Serializable {
googleMapsKey = ObjectUtils.defaultIfNull(organizationConfiguration.getGoogleMapsKey(), googleMapsKey);
isFormLoginEnabled =
getComputedValue(true, organizationConfiguration.getIsFormLoginEnabled(), isFormLoginEnabled);
ObjectUtils.defaultIfNull(organizationConfiguration.getIsFormLoginEnabled(), isFormLoginEnabled);
isSignupDisabled = ObjectUtils.defaultIfNull(organizationConfiguration.getIsSignupDisabled(), isSignupDisabled);
instanceName = ObjectUtils.defaultIfNull(organizationConfiguration.getInstanceName(), instanceName);
emailVerificationEnabled = ObjectUtils.defaultIfNull(

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

@ -20,6 +20,7 @@ import com.appsmith.server.solutions.EnvManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@ -172,8 +173,10 @@ class OrganizationServiceCETest {
.verify();
}
// TODO @Abhijeet: Fix the side-effect of having default fallback when form login is null and enable the test
@Test
@WithUserDetails("api_user")
@Disabled
void updateOrganizationConfiguration_updateFormLoginEnabled_success() {
// Ensure that default value for form login is enabled