)}
*
* The update and retrieval are in different controllers because it would have been weird to fetch the configurations
@@ -38,15 +38,16 @@ public TenantControllerCE(TenantService service) {
*/
@JsonView(Views.Public.class)
@GetMapping("/current")
- public Mono> getTenantConfig() {
- log.debug("Attempting to retrieve tenant configuration ... ");
- return service.getTenantConfiguration()
+ public Mono> getOrganizationConfig() {
+ log.debug("Attempting to retrieve organization configuration ... ");
+ return service.getOrganizationConfiguration()
.map(resource -> new ResponseDTO<>(HttpStatus.OK.value(), resource, null));
}
@PutMapping("")
- public Mono> updateTenantConfiguration(@RequestBody TenantConfiguration tenantConfiguration) {
- return service.updateDefaultTenantConfiguration(tenantConfiguration)
- .map(tenant -> new ResponseDTO<>(HttpStatus.OK.value(), tenant, null));
+ public Mono> updateOrganizationConfiguration(
+ @RequestBody OrganizationConfiguration organizationConfiguration) {
+ return service.updateDefaultOrganizationConfiguration(organizationConfiguration)
+ .map(organization -> new ResponseDTO<>(HttpStatus.OK.value(), organization, null));
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
index 3bd7a58a0cd1..df7decf15976 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
@@ -31,9 +31,9 @@
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.DatasourceContextService;
import com.appsmith.server.services.FeatureFlagService;
+import com.appsmith.server.services.OrganizationService;
import com.appsmith.server.services.SequenceService;
import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.TenantService;
import com.appsmith.server.services.WorkspaceService;
import com.appsmith.server.solutions.DatasourcePermission;
import com.appsmith.server.solutions.EnvironmentPermission;
@@ -97,7 +97,7 @@ public class DatasourceServiceCEImpl implements DatasourceServiceCE {
private final RateLimitService rateLimitService;
private final FeatureFlagService featureFlagService;
private final ObservationRegistry observationRegistry;
- private final TenantService tenantService;
+ private final OrganizationService organizationService;
private final ConfigService configService;
// Defines blocking duration for test as well as connection created for query execution
@@ -126,7 +126,7 @@ public DatasourceServiceCEImpl(
RateLimitService rateLimitService,
FeatureFlagService featureFlagService,
ObservationRegistry observationRegistry,
- TenantService tenantService,
+ OrganizationService organizationService,
ConfigService configService) {
this.workspaceService = workspaceService;
@@ -146,7 +146,7 @@ public DatasourceServiceCEImpl(
this.rateLimitService = rateLimitService;
this.featureFlagService = featureFlagService;
this.observationRegistry = observationRegistry;
- this.tenantService = tenantService;
+ this.organizationService = organizationService;
this.configService = configService;
}
@@ -264,12 +264,12 @@ private Mono createEx(
}
private Mono setAdditionalMetadataInDatasourceStorage(DatasourceStorage datasourceStorage) {
- Mono tenantIdMono = tenantService.getDefaultTenantId();
+ Mono organizationIdMono = organizationService.getDefaultOrganizationId();
Mono instanceIdMono = configService.getInstanceId();
Map metadata = new HashMap<>();
- return tenantIdMono.zipWith(instanceIdMono).map(tuple -> {
+ return organizationIdMono.zipWith(instanceIdMono).map(tuple -> {
metadata.put(TENANT_ID, tuple.getT1());
metadata.put(INSTANCE_ID, tuple.getT2());
datasourceStorage.setMetadata(metadata);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
index 67a8e8f3d94f..adb06b2f3b3e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
@@ -11,9 +11,9 @@
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.DatasourceContextService;
import com.appsmith.server.services.FeatureFlagService;
+import com.appsmith.server.services.OrganizationService;
import com.appsmith.server.services.SequenceService;
import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.TenantService;
import com.appsmith.server.services.WorkspaceService;
import com.appsmith.server.solutions.DatasourcePermission;
import com.appsmith.server.solutions.EnvironmentPermission;
@@ -44,7 +44,7 @@ public DatasourceServiceImpl(
RateLimitService rateLimitService,
FeatureFlagService featureFlagService,
ObservationRegistry observationRegistry,
- TenantService tenantService,
+ OrganizationService organizationService,
ConfigService configService) {
super(
@@ -65,7 +65,7 @@ public DatasourceServiceImpl(
rateLimitService,
featureFlagService,
observationRegistry,
- tenantService,
+ organizationService,
configService);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java
new file mode 100644
index 000000000000..6740f279b216
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Organization.java
@@ -0,0 +1,38 @@
+package com.appsmith.server.domains;
+
+import com.appsmith.external.models.BaseDomain;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
+import org.checkerframework.common.aliasing.qual.Unique;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@Document
+@FieldNameConstants
+public class Organization extends BaseDomain implements Serializable {
+
+ @Unique String slug;
+
+ String displayName;
+
+ @Transient
+ String instanceId;
+
+ @Transient
+ String adminEmailDomainHash;
+
+ PricingPlan pricingPlan;
+
+ OrganizationConfiguration organizationConfiguration;
+
+ // TODO add SSO and other configurations here after migrating from environment variables to database configuration
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationConfiguration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationConfiguration.java
new file mode 100644
index 000000000000..5be0df072461
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OrganizationConfiguration.java
@@ -0,0 +1,9 @@
+package com.appsmith.server.domains;
+
+import com.appsmith.server.domains.ce.OrganizationConfigurationCE;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OrganizationConfiguration extends OrganizationConfigurationCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PermissionGroup.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PermissionGroup.java
index fcb44cdc2e4f..52729bd50e55 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PermissionGroup.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PermissionGroup.java
@@ -21,8 +21,12 @@ public class PermissionGroup extends BaseDomain {
@NotNull String name;
+ @Deprecated
+ // TODO: Remove this field once we have migrated the data to use organizationId instead of tenantId
String tenantId;
+ String organizationId;
+
String description;
// TODO: refactor this to defaultDocumentId, as we can use this to store associated document id for
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PricingPlan.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PricingPlan.java
index b216f0c78faf..3fc13de97019 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PricingPlan.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/PricingPlan.java
@@ -1,7 +1,7 @@
package com.appsmith.server.domains;
/**
- * Deprecated since we use plans based on the license and this information is stored inside license tenant pricingPlan is no longer used
+ * Deprecated since we use plans based on the license and this information is stored inside license organization pricingPlan is no longer used
*/
@Deprecated
public enum PricingPlan {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
index f4a005bbff76..53f97fae68b6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Tenant.java
@@ -12,6 +12,8 @@
import java.io.Serializable;
+@Deprecated
+// This class has been deprecated. Please use Organization instead.
@Getter
@Setter
@ToString
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/TenantConfiguration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/TenantConfiguration.java
index e4b293b814a7..ccae88485bd5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/TenantConfiguration.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/TenantConfiguration.java
@@ -4,6 +4,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+@Deprecated
@Data
@EqualsAndHashCode(callSuper = true)
public class TenantConfiguration extends TenantConfigurationCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UsagePulse.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UsagePulse.java
index 36ed0e074d83..03637199c319 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UsagePulse.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/UsagePulse.java
@@ -15,7 +15,11 @@ public class UsagePulse extends BaseDomain {
// Hashed user email
private String user;
private String instanceId;
- private String tenantId;
+ private String organizationId;
private Boolean viewMode;
private Boolean isAnonymousUser;
+
+ @Deprecated
+ // TODO: Remove this field once we have migrated the data to use organizationId instead of tenantId
+ private String tenantId;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java
index a2444c5ac74e..87b211f2cd03 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java
@@ -76,9 +76,14 @@ public class User extends BaseDomain implements UserDetails, OidcUser {
@JsonView(Views.Public.class)
Boolean isAnonymous = false;
+ @Deprecated
+ // TODO: Remove this field once we have migrated the data to use organizationId instead of tenantId
@JsonView(Views.Public.class)
private String tenantId;
+ @JsonView(Views.Public.class)
+ private String organizationId;
+
// Field to indicate if the user is system generated or not. Expected to be `true` for system generated users, null
// otherwise.
// e.g. AnonymousUser is created by the system migration during the first time startup.
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java
index 8e72b4b98d9c..49f8fc3afa82 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java
@@ -47,9 +47,14 @@ public class Workspace extends BaseDomain {
@JsonView(Views.Internal.class)
private String logoAssetId;
+ @Deprecated
+ // TODO: Remove this field once we have migrated the data to use organizationId instead of tenantId
@JsonView(Views.Public.class)
private String tenantId;
+ @JsonView(Views.Public.class)
+ private String organizationId;
+
@JsonView(Views.Internal.class)
private Boolean hasEnvironments;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/OrganizationConfigurationCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/OrganizationConfigurationCE.java
new file mode 100644
index 000000000000..a8cd697d5594
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/OrganizationConfigurationCE.java
@@ -0,0 +1,91 @@
+package com.appsmith.server.domains.ce;
+
+import com.appsmith.external.enums.FeatureFlagEnum;
+import com.appsmith.server.constants.FeatureMigrationType;
+import com.appsmith.server.constants.LicensePlan;
+import com.appsmith.server.constants.MigrationStatus;
+import com.appsmith.server.domains.License;
+import com.appsmith.server.domains.OrganizationConfiguration;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class OrganizationConfigurationCE implements Serializable {
+
+ private String googleMapsKey;
+
+ private Boolean isFormLoginEnabled;
+
+ private String instanceName;
+
+ protected License license;
+
+ // organization admin can toggle this field to enable/disable email verification
+ private Boolean emailVerificationEnabled;
+
+ // We add `JsonInclude` here, so that this field is included in the JSON response, even if it is `null`. Reason is,
+ // if this field is not present, then the existing value in client's state doesn't get updated. It's just the way
+ // the splat (`...`) operator works in the client. Evidently, we'll want this for all fields in this class.
+ // In that sense, this class is special, because organization configuration is cached in `localStorage`, and so it's
+ // state
+ // is preserved across browser refreshes.
+ @JsonInclude
+ private List thirdPartyAuths;
+
+ // Field to be used to track the status of migrations during upgrade and downgrade workflows. Downgrade migrations
+ // are gated by user consent whereas upgrade can be triggered immediately and depending upon the status client
+ // blocks the user access to the instance
+ MigrationStatus migrationStatus = MigrationStatus.COMPLETED;
+
+ // Field to store the list of features for which the migrations are pending. This will be used to store the diffs of
+ // the feature flags. This can happen for 2 reasons:
+ // 1. The license plan changes
+ // 2. Because of grandfathering via cron where organization level feature flags are fetched
+ Map featuresWithPendingMigration;
+
+ // This variable is used to indicate if the server needs to be restarted after the migration based on feature flags
+ // is complete.
+ Boolean isRestartRequired;
+
+ Boolean isStrongPasswordPolicyEnabled;
+
+ private Boolean isAtomicPushAllowed = false;
+
+ public void addThirdPartyAuth(String auth) {
+ if (thirdPartyAuths == null) {
+ thirdPartyAuths = new ArrayList<>();
+ }
+ thirdPartyAuths.add(auth);
+ }
+
+ public void copyNonSensitiveValues(OrganizationConfiguration organizationConfiguration) {
+ license = new License();
+ license.setPlan(LicensePlan.FREE);
+
+ if (organizationConfiguration == null) {
+ return;
+ }
+
+ googleMapsKey = ObjectUtils.defaultIfNull(organizationConfiguration.getGoogleMapsKey(), googleMapsKey);
+ isFormLoginEnabled =
+ ObjectUtils.defaultIfNull(organizationConfiguration.getIsFormLoginEnabled(), isFormLoginEnabled);
+ instanceName = ObjectUtils.defaultIfNull(organizationConfiguration.getInstanceName(), instanceName);
+ emailVerificationEnabled = ObjectUtils.defaultIfNull(
+ organizationConfiguration.isEmailVerificationEnabled(), emailVerificationEnabled);
+
+ featuresWithPendingMigration = organizationConfiguration.getFeaturesWithPendingMigration();
+ migrationStatus = organizationConfiguration.getMigrationStatus();
+ isStrongPasswordPolicyEnabled = organizationConfiguration.getIsStrongPasswordPolicyEnabled();
+ isAtomicPushAllowed = organizationConfiguration.getIsAtomicPushAllowed();
+ }
+
+ public Boolean isEmailVerificationEnabled() {
+ return Boolean.TRUE.equals(this.emailVerificationEnabled);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
index 74a62527e47c..29f5e4e84bb3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java
@@ -15,6 +15,7 @@
import java.util.List;
import java.util.Map;
+@Deprecated
@Data
public class TenantConfigurationCE implements Serializable {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/FeaturesRequestDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/FeaturesRequestDTO.java
index f18672b49a58..d1f61bd79f39 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/FeaturesRequestDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/FeaturesRequestDTO.java
@@ -7,7 +7,7 @@
@Setter
public class FeaturesRequestDTO {
private String instanceId;
- private String tenantId;
+ private String organizationId;
private String appsmithVersion;
private Boolean isCloudHosting;
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java
index 92b6adab46e8..9767c1ae6232 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java
@@ -45,7 +45,7 @@ public class UserSessionDTO {
private Set workspaceIds;
- private String tenantId;
+ private String organizationId;
private Object credentials;
@@ -85,7 +85,7 @@ public static UserSessionDTO fromToken(Authentication authentication) {
session.state = user.getState();
session.isEnabled = user.isEnabled();
session.workspaceIds = user.getWorkspaceIds();
- session.tenantId = user.getTenantId();
+ session.organizationId = user.getOrganizationId();
session.emailVerified = Boolean.TRUE.equals(user.getEmailVerified());
session.emailVerificationRequired = Boolean.TRUE.equals(user.getEmailVerificationRequired());
@@ -126,7 +126,7 @@ public Authentication makeToken() {
user.setState(state);
user.setIsEnabled(isEnabled);
user.setWorkspaceIds(workspaceIds);
- user.setTenantId(tenantId);
+ user.setOrganizationId(organizationId);
user.setEmailVerified(Boolean.TRUE.equals(emailVerified));
user.setEmailVerificationRequired(Boolean.TRUE.equals(emailVerificationRequired));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ConsolidatedAPIResponseCE_DTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ConsolidatedAPIResponseCE_DTO.java
index d51d75e23b2c..a9eb001f8a63 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ConsolidatedAPIResponseCE_DTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/ConsolidatedAPIResponseCE_DTO.java
@@ -3,8 +3,8 @@
import com.appsmith.external.models.ActionDTO;
import com.appsmith.external.models.Datasource;
import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.Organization;
import com.appsmith.server.domains.Plugin;
-import com.appsmith.server.domains.Tenant;
import com.appsmith.server.domains.Theme;
import com.appsmith.server.dtos.ActionCollectionDTO;
import com.appsmith.server.dtos.ActionCollectionViewDTO;
@@ -36,7 +36,7 @@ public class ConsolidatedAPIResponseCE_DTO {
ResponseDTO> featureFlags;
/* v1/tenants/current */
- ResponseDTO tenantConfig;
+ ResponseDTO organizationConfig;
/* v1/product-alert/alert */
ResponseDTO productAlert;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
index 1a9e705fb383..49df751a001e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
@@ -912,9 +912,9 @@ public enum AppsmithError {
ErrorType.INTERNAL_ERROR,
null),
- TENANT_EMAIL_VERIFICATION_NOT_ENABLED(
+ ORGANIZATION_EMAIL_VERIFICATION_NOT_ENABLED(
400,
- AppsmithErrorCode.TENANT_EMAIL_VERIFICATION_NOT_ENABLED.getCode(),
+ AppsmithErrorCode.ORGANIZATION_EMAIL_VERIFICATION_NOT_ENABLED.getCode(),
"Email verification is not enabled. Please contact your admin",
AppsmithErrorAction.DEFAULT,
"Email verification not enabled",
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java
index 4824f9815e22..44b154674c90 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java
@@ -123,7 +123,7 @@ public enum AppsmithErrorCode {
USER_EMAIL_ALREADY_VERIFIED("AE-EMV-4095", "User email already verified"),
EMAIL_VERIFICATION_TOKEN_EXPIRED("AE-EMV-4096", "Email Verification Token expired"),
- TENANT_EMAIL_VERIFICATION_NOT_ENABLED("AE-EMV-4097", "Email Verification not enabled"),
+ ORGANIZATION_EMAIL_VERIFICATION_NOT_ENABLED("AE-EMV-4097", "Email Verification not enabled"),
INVALID_EMAIL_VERIFICATION("AE-EMV-4098", "Invalid email verification request"),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java
index 204c93c8bb94..f87209b01652 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java
@@ -18,7 +18,7 @@
@AllArgsConstructor
public class FeatureFlagIdentityTraits {
String instanceId;
- String tenantId;
+ String organizationId;
Set userIdentifiers;
Map traits;
String appsmithVersion;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelperImpl.java
index afa9819ce76d..57fda98d43da 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelperImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelperImpl.java
@@ -1,12 +1,12 @@
package com.appsmith.server.helpers;
import com.appsmith.server.helpers.ce.EmailServiceHelperCEImpl;
-import com.appsmith.server.services.TenantService;
+import com.appsmith.server.services.OrganizationService;
import org.springframework.stereotype.Component;
@Component
public class EmailServiceHelperImpl extends EmailServiceHelperCEImpl implements EmailServiceHelper {
- public EmailServiceHelperImpl(TenantService tenantService) {
- super(tenantService);
+ public EmailServiceHelperImpl(OrganizationService organizationService) {
+ super(organizationService);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/InMemoryCacheableRepositoryHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/InMemoryCacheableRepositoryHelper.java
index cbf2e123c357..b409e60b3436 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/InMemoryCacheableRepositoryHelper.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/InMemoryCacheableRepositoryHelper.java
@@ -8,7 +8,7 @@
public class InMemoryCacheableRepositoryHelper {
private Set anonymousUserPermissionGroupIds = null;
- private String defaultTenantId = null;
+ private String defaultOrganizationId = null;
private String instanceAdminPermissionGroupId = null;
@@ -20,12 +20,12 @@ public void setAnonymousUserPermissionGroupIds(Set anonymousUserPermissi
this.anonymousUserPermissionGroupIds = anonymousUserPermissionGroupIds;
}
- public String getDefaultTenantId() {
- return defaultTenantId;
+ public String getDefaultOrganizationId() {
+ return defaultOrganizationId;
}
- public void setDefaultTenantId(String defaultTenantId) {
- this.defaultTenantId = defaultTenantId;
+ public void setDefaultOrganizationId(String defaultOrganizationId) {
+ this.defaultOrganizationId = defaultOrganizationId;
}
public void setInstanceAdminPermissionGroupId(String instanceAdminPermissionGroupId) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCEImpl.java
index 2dca84c12c4f..239be2322bc7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCEImpl.java
@@ -1,7 +1,7 @@
package com.appsmith.server.helpers.ce;
-import com.appsmith.server.domains.TenantConfiguration;
-import com.appsmith.server.services.TenantService;
+import com.appsmith.server.domains.OrganizationConfiguration;
+import com.appsmith.server.services.OrganizationService;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -23,13 +23,14 @@
@AllArgsConstructor
public class EmailServiceHelperCEImpl implements EmailServiceHelperCE {
- private final TenantService tenantService;
+ private final OrganizationService organizationService;
@Override
public Mono> enrichWithBrandParams(Map params, String origin) {
- return tenantService.getTenantConfiguration().map(tenant -> {
- final TenantConfiguration tenantConfiguration = tenant.getTenantConfiguration();
- params.put(INSTANCE_NAME, StringUtils.defaultIfEmpty(tenantConfiguration.getInstanceName(), "Appsmith"));
+ return organizationService.getOrganizationConfiguration().map(organization -> {
+ final OrganizationConfiguration organizationConfiguration = organization.getOrganizationConfiguration();
+ params.put(
+ INSTANCE_NAME, StringUtils.defaultIfEmpty(organizationConfiguration.getInstanceName(), "Appsmith"));
return params;
});
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCE.java
index 0a89a9c81fca..3df6f2d0577c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCE.java
@@ -2,19 +2,20 @@
import com.appsmith.external.enums.FeatureFlagEnum;
import com.appsmith.server.constants.FeatureMigrationType;
-import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.domains.Organization;
import reactor.core.publisher.Mono;
import java.util.Map;
public interface FeatureFlagMigrationHelperCE {
- Mono> getUpdatedFlagsWithPendingMigration(Tenant defaultTenant);
+ Mono> getUpdatedFlagsWithPendingMigration(
+ Organization defaultOrganization);
Mono> getUpdatedFlagsWithPendingMigration(
- Tenant tenant, boolean forceUpdate);
+ Organization organization, boolean forceUpdate);
- Mono checkAndExecuteMigrationsForFeatureFlag(Tenant tenant, FeatureFlagEnum featureFlagEnum);
+ Mono checkAndExecuteMigrationsForFeatureFlag(Organization organization, FeatureFlagEnum featureFlagEnum);
- Mono executeMigrationsBasedOnFeatureFlag(Tenant tenant, FeatureFlagEnum featureFlagEnum);
+ Mono executeMigrationsBasedOnFeatureFlag(Organization organization, FeatureFlagEnum featureFlagEnum);
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java
index 566d2865adf8..df4756817626 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java
@@ -2,8 +2,8 @@
import com.appsmith.external.enums.FeatureFlagEnum;
import com.appsmith.server.constants.FeatureMigrationType;
-import com.appsmith.server.domains.Tenant;
-import com.appsmith.server.domains.TenantConfiguration;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.OrganizationConfiguration;
import com.appsmith.server.featureflags.CachedFeatures;
import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.services.CacheableFeatureFlagHelper;
@@ -32,74 +32,76 @@ public class FeatureFlagMigrationHelperCEImpl implements FeatureFlagMigrationHel
/**
* To avoid race condition keep the refresh rate lower than cron execution interval {@link ScheduledTaskCEImpl}
- * to update the tenant level feature flags
+ * to update the org level feature flags
*/
- private static final long TENANT_FEATURES_CACHE_TIME_MIN = 115;
+ private static final long ORGANIZATION_FEATURES_CACHE_TIME_MIN = 115;
@Override
- public Mono> getUpdatedFlagsWithPendingMigration(Tenant defaultTenant) {
- return getUpdatedFlagsWithPendingMigration(defaultTenant, FALSE);
+ public Mono> getUpdatedFlagsWithPendingMigration(
+ Organization defaultOrganization) {
+ return getUpdatedFlagsWithPendingMigration(defaultOrganization, FALSE);
}
/**
* Method to get the updated feature flags with pending migrations. This method finds and registers the flags for
* migration by comparing the diffs between the feature flags stored in cache and the latest one pulled from CS
- * @param tenant Tenant for which the feature flags need to be updated
- * @param forceUpdate Flag to force update the tenant level feature flags
+ * @param organization Organization for which the feature flags need to be updated
+ * @param forceUpdate Flag to force update the organization level feature flags
* @return Map of feature flags with pending migrations
*/
@Override
public Mono> getUpdatedFlagsWithPendingMigration(
- Tenant tenant, boolean forceUpdate) {
+ Organization organization, boolean forceUpdate) {
/*
* 1. Fetch current/saved feature flags from cache
- * 2. Force update the tenant flags keeping existing flags as fallback in case the API call to fetch the flags fails for some reason
+ * 2. Force update the organization flags keeping existing flags as fallback in case the API call to fetch the flags fails for some reason
* 3. Get the diff and update the flags with pending migrations to be used to run migrations selectively
*/
return cacheableFeatureFlagHelper
- .fetchCachedTenantFeatures(tenant.getId())
+ .fetchCachedOrganizationFeatures(organization.getId())
.zipWhen(existingCachedFlags -> {
if (existingCachedFlags.getRefreshedAt().until(Instant.now(), ChronoUnit.MINUTES)
- < TENANT_FEATURES_CACHE_TIME_MIN
+ < ORGANIZATION_FEATURES_CACHE_TIME_MIN
&& !forceUpdate) {
return Mono.just(existingCachedFlags);
}
- return this.refreshTenantFeatures(tenant, existingCachedFlags);
+ return this.refreshOrganizationFeatures(organization, existingCachedFlags);
})
.map(tuple2 -> {
CachedFeatures existingCachedFlags = tuple2.getT1();
CachedFeatures latestFlags = tuple2.getT2();
- return this.getUpdatedFlagsWithPendingMigration(tenant, latestFlags, existingCachedFlags);
+ return this.getUpdatedFlagsWithPendingMigration(organization, latestFlags, existingCachedFlags);
});
}
/**
- * Method to force update the tenant level feature flags. This will be utilised in scenarios where we don't want
+ * Method to force update the organization level feature flags. This will be utilised in scenarios where we don't want
* to wait for the flags to get updated for cron scheduled time
*
- * @param tenant tenant for which the feature flags need to be updated
+ * @param organization organization for which the feature flags need to be updated
* @return Cached features
*/
- private Mono refreshTenantFeatures(Tenant tenant, CachedFeatures existingCachedFeatures) {
+ private Mono refreshOrganizationFeatures(
+ Organization organization, CachedFeatures existingCachedFeatures) {
/*
1. Force update the flag
a. Evict the cache
b. Fetch and save latest flags from CS
- 2. In case the tenant is unable to fetch the latest flags save the existing flags from step 1 to cache (fallback)
+ 2. In case the organization is unable to fetch the latest flags save the existing flags from step 1 to cache (fallback)
*/
- String tenantId = tenant.getId();
+ String organizationId = organization.getId();
return cacheableFeatureFlagHelper
- .evictCachedTenantFeatures(tenantId)
- .then(cacheableFeatureFlagHelper.fetchCachedTenantFeatures(tenantId))
+ .evictCachedOrganizationFeatures(organizationId)
+ .then(cacheableFeatureFlagHelper.fetchCachedOrganizationFeatures(organizationId))
.flatMap(features -> {
if (CollectionUtils.isNullOrEmpty(features.getFeatures())) {
// In case the retrieval of the latest flags from CS encounters an error, the previous flags
// will serve as a fallback value.
return cacheableFeatureFlagHelper
- .evictCachedTenantFeatures(tenantId)
- .then(cacheableFeatureFlagHelper.updateCachedTenantFeatures(
- tenantId, existingCachedFeatures));
+ .evictCachedOrganizationFeatures(organizationId)
+ .then(cacheableFeatureFlagHelper.updateCachedOrganizationFeatures(
+ organizationId, existingCachedFeatures));
}
return Mono.just(features);
});
@@ -121,16 +123,16 @@ private Mono refreshTenantFeatures(Tenant tenant, CachedFeatures
* Step 4: User adds the valid key or renews the subscription again which results in enabling the feature and
* ends up in nullifying the effect for step 2
*
- * @param tenant Tenant for which the feature flag migrations stats needs to be stored
+ * @param organization Organization for which the feature flag migrations stats needs to be stored
* @param latestFlags Latest flags pulled in from CS
* @param existingCachedFlags Flags which are already stored in cache
- * @return updated tenant with the required flags with pending migrations
+ * @return updated organization with the required flags with pending migrations
*/
private Map getUpdatedFlagsWithPendingMigration(
- Tenant tenant, CachedFeatures latestFlags, CachedFeatures existingCachedFlags) {
+ Organization organization, CachedFeatures latestFlags, CachedFeatures existingCachedFlags) {
// 1. Check if there are any diffs for the feature flags
- // 2. Update the flags for pending migration within provided tenant object
+ // 2. Update the flags for pending migration within provided organization object
Map featureDiffsWithMigrationType = new HashMap<>();
Map existingFeatureMap = existingCachedFlags.getFeatures();
latestFlags.getFeatures().forEach((key, value) -> {
@@ -147,16 +149,17 @@ private Map getUpdatedFlagsWithPendingMig
}
}
});
- return getUpdatedFlagsWithPendingMigration(featureDiffsWithMigrationType, tenant);
+ return getUpdatedFlagsWithPendingMigration(featureDiffsWithMigrationType, organization);
}
private Map getUpdatedFlagsWithPendingMigration(
- Map latestFeatureDiffsWithMigrationType, Tenant dbTenant) {
+ Map latestFeatureDiffsWithMigrationType,
+ Organization dbOrganization) {
Map featuresWithPendingMigrationDB =
- dbTenant.getTenantConfiguration().getFeaturesWithPendingMigration() == null
+ dbOrganization.getOrganizationConfiguration().getFeaturesWithPendingMigration() == null
? new HashMap<>()
- : dbTenant.getTenantConfiguration().getFeaturesWithPendingMigration();
+ : dbOrganization.getOrganizationConfiguration().getFeaturesWithPendingMigration();
Map updatedFlagsForMigrations =
new HashMap<>(featuresWithPendingMigrationDB);
@@ -197,25 +200,26 @@ with disable type (This will happen via cron to check the license status)
/**
* Method to check and execute if the migrations are required for the provided feature flag.
- * @param tenant Tenant for which the migrations need to be executed
+ * @param organization Organization for which the migrations need to be executed
* @param featureFlagEnum Feature flag for which the migrations need to be executed
* @return Boolean indicating if the migrations is successfully executed or not
*/
- public Mono checkAndExecuteMigrationsForFeatureFlag(Tenant tenant, FeatureFlagEnum featureFlagEnum) {
+ public Mono checkAndExecuteMigrationsForFeatureFlag(
+ Organization organization, FeatureFlagEnum featureFlagEnum) {
- TenantConfiguration tenantConfiguration = tenant.getTenantConfiguration();
+ OrganizationConfiguration organizationConfiguration = organization.getOrganizationConfiguration();
if (featureFlagEnum == null
- || tenantConfiguration == null
- || CollectionUtils.isNullOrEmpty(tenantConfiguration.getFeaturesWithPendingMigration())) {
+ || organizationConfiguration == null
+ || CollectionUtils.isNullOrEmpty(organizationConfiguration.getFeaturesWithPendingMigration())) {
return Mono.just(TRUE);
}
- return isMigrationRequired(tenant, featureFlagEnum).flatMap(isMigrationRequired -> {
+ return isMigrationRequired(organization, featureFlagEnum).flatMap(isMigrationRequired -> {
if (FALSE.equals(isMigrationRequired)) {
return Mono.just(TRUE);
}
Map featuresWithPendingMigration =
- tenantConfiguration.getFeaturesWithPendingMigration();
+ organizationConfiguration.getFeaturesWithPendingMigration();
if (CollectionUtils.isNullOrEmpty(featuresWithPendingMigration)
|| !featuresWithPendingMigration.containsKey(featureFlagEnum)) {
return Mono.just(TRUE);
@@ -224,24 +228,24 @@ public Mono checkAndExecuteMigrationsForFeatureFlag(Tenant tenant, Feat
"Running the migration for flag {} with migration type {}",
featureFlagEnum.name(),
featuresWithPendingMigration.get(featureFlagEnum));
- return this.executeMigrationsBasedOnFeatureFlag(tenant, featureFlagEnum);
+ return this.executeMigrationsBasedOnFeatureFlag(organization, featureFlagEnum);
});
}
/**
* Method to check if the migrations are required for the provided feature flag.
- * @param tenant Tenant for which the migrations need to be executed
+ * @param organization Organization for which the migrations need to be executed
* @param featureFlagEnum Feature flag for which the migrations need to be executed
* @return Boolean indicating if the migrations is required or not
*/
- private Mono isMigrationRequired(Tenant tenant, FeatureFlagEnum featureFlagEnum) {
+ private Mono isMigrationRequired(Organization organization, FeatureFlagEnum featureFlagEnum) {
Map featureMigrationTypeMap =
- tenant.getTenantConfiguration().getFeaturesWithPendingMigration();
+ organization.getOrganizationConfiguration().getFeaturesWithPendingMigration();
if (CollectionUtils.isNullOrEmpty(featureMigrationTypeMap)) {
return Mono.just(FALSE);
}
return cacheableFeatureFlagHelper
- .fetchCachedTenantFeatures(tenant.getId())
+ .fetchCachedOrganizationFeatures(organization.getId())
.map(cachedFeatures -> {
Map featureFlags = cachedFeatures.getFeatures();
if (featureFlags.containsKey(featureFlagEnum.name())) {
@@ -258,12 +262,13 @@ private Mono isMigrationRequired(Tenant tenant, FeatureFlagEnum feature
/**
* Method to execute the migrations for the given feature flag.
- * @param tenant Tenant for which the migrations need to be executed
+ * @param organization Organization for which the migrations need to be executed
* @param featureFlagEnum Feature flag for which the migrations need to be executed
* @return Boolean indicating if the migrations is successfully executed or not
*/
@Override
- public Mono executeMigrationsBasedOnFeatureFlag(Tenant tenant, FeatureFlagEnum featureFlagEnum) {
+ public Mono executeMigrationsBasedOnFeatureFlag(
+ Organization organization, FeatureFlagEnum featureFlagEnum) {
return Mono.just(TRUE);
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCE.java
index 9d97843468bb..18d5b550246b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCE.java
@@ -17,5 +17,5 @@ public interface InstanceConfigHelperCE {
Mono checkMongoDBVersion();
- Mono updateCacheForTenantFeatureFlags();
+ Mono updateCacheForOrganizationFeatureFlags();
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java
index 68126fa0c7da..1d26b253898b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java
@@ -226,7 +226,7 @@ public Mono checkMongoDBVersion() {
}
@Override
- public Mono updateCacheForTenantFeatureFlags() {
- return featureFlagService.getTenantFeatures().then();
+ public Mono updateCacheForOrganizationFeatureFlags() {
+ return featureFlagService.getOrganizationFeatures().then();
}
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
index eea297afe722..b927e4f6d7ad 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
@@ -91,7 +91,7 @@ public Mono makeSuperUser(List users) {
.then(Mono.just(users))
.flatMapMany(Flux::fromIterable)
.flatMap(user -> permissionGroupRepository.evictAllPermissionGroupCachesForUser(
- user.getEmail(), user.getTenantId()))
+ user.getEmail(), user.getOrganizationId()))
.then(Mono.just(Boolean.TRUE));
}
@@ -110,7 +110,7 @@ public Mono removeSuperUser(List users) {
.then(Mono.just(users))
.flatMapMany(Flux::fromIterable)
.flatMap(user -> permissionGroupRepository.evictAllPermissionGroupCachesForUser(
- user.getEmail(), user.getTenantId()))
+ user.getEmail(), user.getOrganizationId()))
.then(Mono.just(Boolean.TRUE));
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
index ba30d97b5614..bfd58c438d5b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
@@ -25,7 +25,6 @@
import com.appsmith.server.domains.User;
import com.appsmith.server.domains.Workspace;
import com.appsmith.server.dtos.Permission;
-import com.appsmith.server.helpers.TextUtils;
import com.appsmith.server.migrations.solutions.UpdateSuperUserMigrationHelper;
import com.appsmith.server.repositories.CacheableRepositoryHelper;
import com.appsmith.server.solutions.PolicySolution;
@@ -62,15 +61,12 @@
import static com.appsmith.server.acl.AclPermission.READ_PERMISSION_GROUP_MEMBERS;
import static com.appsmith.server.acl.AclPermission.READ_THEMES;
import static com.appsmith.server.acl.AppsmithRole.TENANT_ADMIN;
-import static com.appsmith.server.constants.EnvVariables.APPSMITH_ADMIN_EMAILS;
import static com.appsmith.server.constants.FieldName.DEFAULT_PERMISSION_GROUP;
import static com.appsmith.server.constants.FieldName.PERMISSION_GROUP_ID;
-import static com.appsmith.server.helpers.CollectionUtils.findSymmetricDiff;
import static com.appsmith.server.migrations.DatabaseChangelog1.dropIndexIfExists;
import static com.appsmith.server.migrations.DatabaseChangelog1.ensureIndexes;
import static com.appsmith.server.migrations.DatabaseChangelog1.installPluginToAllWorkspaces;
import static com.appsmith.server.migrations.DatabaseChangelog1.makeIndex;
-import static com.appsmith.server.migrations.MigrationHelperMethods.evictPermissionCacheForUsers;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
import static org.springframework.data.mongodb.core.query.Update.update;
@@ -443,65 +439,6 @@ public static void doAddPermissionGroupIndex(MongoTemplate mongoTemplate) {
ensureIndexes(mongoTemplate, PermissionGroup.class, assignedToUserIds_deleted_compound_index);
}
- /**
- * Changing the order of this function to 10000 so that it always gets executed at the end.
- * This ensures that any permission changes for super users happen once all other migrations are completed
- */
- @ChangeSet(order = "10000", id = "update-super-users", author = "", runAlways = true)
- public void updateSuperUsers(
- MongoTemplate mongoTemplate,
- CacheableRepositoryHelper cacheableRepositoryHelper,
- PolicySolution policySolution,
- PolicyGenerator policyGenerator) {
- // Read the admin emails from the environment and update the super users accordingly
- String adminEmailsStr = System.getenv(String.valueOf(APPSMITH_ADMIN_EMAILS));
-
- Set adminEmails = TextUtils.csvToSet(adminEmailsStr);
-
- Query instanceConfigurationQuery = new Query();
- instanceConfigurationQuery.addCriteria(where(Config.Fields.name).is(FieldName.INSTANCE_CONFIG));
- Config instanceAdminConfiguration = mongoTemplate.findOne(instanceConfigurationQuery, Config.class);
-
- String instanceAdminPermissionGroupId =
- (String) instanceAdminConfiguration.getConfig().get(DEFAULT_PERMISSION_GROUP);
-
- Query permissionGroupQuery = new Query();
- permissionGroupQuery
- .addCriteria(where(PermissionGroup.Fields.id).is(instanceAdminPermissionGroupId))
- .fields()
- .include(PermissionGroup.Fields.assignedToUserIds);
- PermissionGroup instanceAdminPG = mongoTemplate.findOne(permissionGroupQuery, PermissionGroup.class);
-
- Query tenantQuery = new Query();
- tenantQuery.addCriteria(where(Tenant.Fields.slug).is("default"));
- Tenant tenant = mongoTemplate.findOne(tenantQuery, Tenant.class);
-
- Set userIds = adminEmails.stream()
- .map(email -> email.trim())
- .map(String::toLowerCase)
- .map(email -> {
- Query userQuery = new Query();
- userQuery.addCriteria(where(User.Fields.email).is(email));
- User user = mongoTemplate.findOne(userQuery, User.class);
-
- if (user == null) {
- log.info("Creating super user with username {}", email);
- user = updateSuperUserMigrationHelper.createNewUser(
- email, tenant, instanceAdminPG, mongoTemplate, policySolution, policyGenerator);
- }
-
- return user.getId();
- })
- .collect(Collectors.toSet());
-
- Set oldSuperUsers = instanceAdminPG.getAssignedToUserIds();
- Set updatedUserIds = findSymmetricDiff(oldSuperUsers, userIds);
- evictPermissionCacheForUsers(updatedUserIds, mongoTemplate, cacheableRepositoryHelper);
-
- Update update = new Update().set(PermissionGroup.Fields.assignedToUserIds, userIds);
- mongoTemplate.updateFirst(permissionGroupQuery, update, PermissionGroup.class);
- }
-
@ChangeSet(order = "034", id = "update-bad-theme-state", author = "")
public void updateBadThemeState(
MongoTemplate mongoTemplate,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
index 277a3ac5768e..c361a99812cd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java
@@ -224,7 +224,7 @@ public static void evictPermissionCacheForUsers(
if (user != null) {
// blocking call for cache eviction to ensure its subscribed immediately before proceeding further.
cacheableRepositoryHelper
- .evictPermissionGroupsUser(user.getEmail(), user.getTenantId())
+ .evictPermissionGroupsUser(user.getEmail(), user.getOrganizationId())
.block();
}
});
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration059PolicySetToPolicyMap.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration059PolicySetToPolicyMap.java
index 76c3f6d00ac5..501414f0d527 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration059PolicySetToPolicyMap.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration059PolicySetToPolicyMap.java
@@ -91,7 +91,13 @@ public void execute() {
tenantQuery.addCriteria(where(Tenant.Fields.slug).is(DEFAULT));
Tenant defaultTenant = mongoTemplate.findOne(tenantQuery, Tenant.class).block();
assert defaultTenant != null : "Default tenant not found";
- cacheableRepositoryHelper.evictCachedTenant(defaultTenant.getId()).block();
+
+ // The following code line has been commented as part of Tenant to Organization migration. The function does not
+ // exist
+ // anymore and no need to evict the cached tenant anymore because Migration 065 would migrate the tenant to
+ // organization
+ // and a new cache line would be set for the organization.
+ // cacheableRepositoryHelper.evictCachedTenant(defaultTenant.getId()).block();
}
private static Mono executeForCollection(ReactiveMongoTemplate mongoTemplate, String collectionName) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration061TenantPolicySetToPolicyMap.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration061TenantPolicySetToPolicyMap.java
index cb966fd6b810..592f39090790 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration061TenantPolicySetToPolicyMap.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration061TenantPolicySetToPolicyMap.java
@@ -49,7 +49,13 @@ public void executeMigration() {
defaultTenant.getPolicies().forEach(policy -> policyMap.put(policy.getPermission(), policy));
defaultTenant.setPolicyMap(policyMap);
mongoTemplate.save(defaultTenant);
- cacheableRepositoryHelper.evictCachedTenant(defaultTenant.getId()).block();
+
+ // The following code line has been commented as part of Tenant to Organization migration. The function does
+ // not exist
+ // anymore and no need to evict the cached tenant anymore because Migration 065 would migrate the tenant to
+ // organization
+ // and a new cache line would be set for the organization.
+ // cacheableRepositoryHelper.evictCachedTenant(defaultTenant.getId()).block();
} else {
log.info(
"Tenant already has policyMap set. Skipping migration to update policy set to map in tenant Migration061TenantPolicySetToPolicyMap.");
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration065_CopyTenantIdToOrganizationId.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration065_CopyTenantIdToOrganizationId.java
new file mode 100644
index 000000000000..7cf8d0945f00
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration065_CopyTenantIdToOrganizationId.java
@@ -0,0 +1,242 @@
+package com.appsmith.server.migrations.db.ce;
+
+import com.appsmith.external.models.Policy;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.UsagePulse;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.Workspace;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.mongodb.DuplicateKeyException;
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.redis.core.ReactiveRedisOperations;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+
+@Slf4j
+@ChangeUnit(id = "copy-tenant-id-to-organization-id", order = "065")
+public class Migration065_CopyTenantIdToOrganizationId {
+
+ private final ReactiveRedisOperations reactiveRedisOperations;
+ private final ObjectMapper objectMapper;
+ private final MongoTemplate mongoTemplate;
+
+ private final List> DOMAIN_CLASSES =
+ Arrays.asList(User.class, Workspace.class, PermissionGroup.class, UsagePulse.class);
+
+ public Migration065_CopyTenantIdToOrganizationId(
+ @Qualifier("reactiveRedisOperations") ReactiveRedisOperations reactiveRedisOperations,
+ ObjectMapper objectMapper,
+ MongoTemplate mongoTemplate) {
+ this.reactiveRedisOperations = reactiveRedisOperations;
+ this.objectMapper = objectMapper;
+ this.mongoTemplate = mongoTemplate;
+ }
+
+ @RollbackExecution
+ public void rollbackExecution() {}
+
+ @Execution
+ public void execute() {
+ migrateTenantCollection();
+ migrateMongoCollections();
+ migrateRedisData();
+ }
+
+ private void migrateTenantCollection() {
+ try {
+ // Get the single tenant document
+ Document tenant = mongoTemplate.findOne(new Query(), Document.class, "tenant");
+
+ if (tenant == null) {
+ log.info("No tenant found to migrate");
+ return;
+ }
+
+ try {
+ // Create new organization document
+ Document organizationDocument = new Document();
+
+ // Copy all fields from tenant to organization
+ organizationDocument.putAll(tenant);
+
+ // Ensure the _id is preserved
+ String tenantId = tenant.getObjectId("_id").toString();
+ organizationDocument.put("_id", new ObjectId(tenantId));
+
+ // Handle configuration key rename
+ if (tenant.containsKey("tenantConfiguration")) {
+ organizationDocument.put("organizationConfiguration", tenant.get("tenantConfiguration"));
+ organizationDocument.remove("tenantConfiguration");
+ }
+
+ Organization organization = mongoTemplate.getConverter().read(Organization.class, organizationDocument);
+
+ Map existingPolicyMap = organization.getPolicyMap();
+ if (existingPolicyMap == null || existingPolicyMap.isEmpty()) {
+ return;
+ }
+
+ Map updatedPolicyMap = new HashMap<>(existingPolicyMap); // Copy existing policies
+ Set updatedPolicies =
+ new HashSet<>(organization.getPolicies()); // Copy existing deprecated policies
+
+ // Process each policy
+ for (Map.Entry entry : existingPolicyMap.entrySet()) {
+ Policy existingPolicy = entry.getValue();
+ String permission = existingPolicy.getPermission();
+
+ // Only process policies that contain 'tenant'
+ if (permission.toLowerCase().contains("tenant")) {
+ // Create new policy with 'organization' instead of 'tenant'
+ String newPermission = permission.replaceAll("(?i)tenant", "organization");
+
+ // Skip if the new permission already exists
+ if (!updatedPolicyMap.containsKey(newPermission)) {
+ // Create a new policy object with the same permissions but new name
+ Policy newPolicy =
+ new Policy(newPermission, new HashSet<>(existingPolicy.getPermissionGroups()));
+
+ updatedPolicyMap.put(newPermission, newPolicy);
+ updatedPolicies.add(newPolicy);
+ }
+ }
+ }
+
+ organization.setPolicyMap(updatedPolicyMap);
+ organization.setPolicies(updatedPolicies);
+
+ // Insert into organization collection
+ try {
+ mongoTemplate.save(organization);
+ log.info("Successfully migrated tenant to organization with id: {}", tenantId);
+ } catch (DuplicateKeyException e) {
+ log.warn("Organization already exists for tenant: {}", tenantId);
+ }
+
+ } catch (Exception e) {
+ log.error("Error migrating tenant: {}", tenant.get("_id"), e);
+ }
+
+ } catch (Exception e) {
+ log.error("Error during tenant to organization migration", e);
+ }
+ }
+
+ private void migrateMongoCollections() {
+ for (Class domainClass : DOMAIN_CLASSES) {
+ try {
+ migrateCollection(domainClass);
+ } catch (Exception e) {
+ log.error("Error while migrating collection for {}: ", domainClass.getSimpleName(), e);
+ }
+ }
+ }
+
+ private void migrateCollection(Class domainClass) {
+ Query query =
+ new Query(where("tenantId").exists(true).and("organizationId").exists(false));
+
+ // Create an update pipeline that copies the value
+ List pipeline = Arrays.asList(new Document("$set", new Document("organizationId", "$tenantId")));
+
+ try {
+ long updatedCount = mongoTemplate
+ .getCollection(mongoTemplate.getCollectionName(domainClass))
+ .updateMany(query.getQueryObject(), pipeline)
+ .getModifiedCount();
+
+ log.info(
+ "Successfully copied tenantId to organizationId for {} documents in collection: {}",
+ updatedCount,
+ domainClass.getSimpleName());
+ } catch (Exception e) {
+ log.error(
+ "Error while copying tenantId to organizationId for collection {}: ",
+ domainClass.getSimpleName(),
+ e);
+ throw e;
+ }
+ }
+
+ private void migrateRedisData() {
+ try {
+ // Get all session keys
+ List sessionKeys = reactiveRedisOperations
+ .keys("spring:session:sessions:*")
+ .collectList()
+ .block();
+
+ if (sessionKeys == null || sessionKeys.isEmpty()) {
+ log.info("No session keys found in Redis");
+ return;
+ }
+
+ int updatedCount = 0;
+ for (String sessionKey : sessionKeys) {
+ Map sessionData = reactiveRedisOperations
+ .opsForHash()
+ .entries(sessionKey)
+ .collectMap(entry -> entry.getKey(), entry -> entry.getValue())
+ .block();
+
+ if (sessionData != null && sessionData.containsKey("sessionAttr:SPRING_SECURITY_CONTEXT")) {
+ try {
+ String sessionStr = sessionData
+ .get("sessionAttr:SPRING_SECURITY_CONTEXT")
+ .toString();
+ // Extract the appsmith-session JSON string
+ if (sessionStr.contains("appsmith-session:")) {
+ String jsonStr =
+ sessionStr.substring(sessionStr.indexOf('{'), sessionStr.lastIndexOf('}') + 1);
+ JsonNode jsonNode = objectMapper.readTree(jsonStr);
+ ObjectNode objectNode = (ObjectNode) jsonNode;
+
+ if (objectNode.has("tenantId") && !objectNode.has("organizationId")) {
+ // Copy tenantId value to organizationId
+ objectNode.put(
+ "organizationId",
+ objectNode.get("tenantId").asText());
+ // Remove tenantId
+ objectNode.remove("tenantId");
+
+ // Reconstruct the session string with updated JSON
+ String updatedJson = objectMapper.writeValueAsString(objectNode);
+ String updatedSessionStr = "appsmith-session:" + updatedJson;
+
+ // Convert to byte array if needed
+ reactiveRedisOperations
+ .opsForHash()
+ .put(sessionKey, "sessionAttr:SPRING_SECURITY_CONTEXT", updatedSessionStr)
+ .block();
+ updatedCount++;
+ }
+ }
+ } catch (Exception e) {
+ log.error("Error processing Redis session key {}: ", sessionKey, e);
+ }
+ }
+ }
+ log.info("Successfully migrated {} Redis sessions", updatedCount);
+ } catch (Exception e) {
+ log.error("Error while migrating Redis session data: ", e);
+ }
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration10000_UpdateSuperUser.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration10000_UpdateSuperUser.java
new file mode 100644
index 000000000000..03cd7e111787
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration10000_UpdateSuperUser.java
@@ -0,0 +1,113 @@
+package com.appsmith.server.migrations.db.ce;
+
+import com.appsmith.server.acl.PolicyGenerator;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Config;
+import com.appsmith.server.domains.Organization;
+import com.appsmith.server.domains.PermissionGroup;
+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.PolicySolution;
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import lombok.extern.slf4j.Slf4j;
+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.util.Set;
+import java.util.stream.Collectors;
+
+import static com.appsmith.server.constants.EnvVariables.APPSMITH_ADMIN_EMAILS;
+import static com.appsmith.server.constants.ce.FieldNameCE.DEFAULT_PERMISSION_GROUP;
+import static com.appsmith.server.helpers.CollectionUtils.findSymmetricDiff;
+import static com.appsmith.server.migrations.MigrationHelperMethods.evictPermissionCacheForUsers;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+
+/**
+ * The order of this migration is set to 10000 so that it always gets executed at the end.
+ * This ensures that any permission changes for super users happen once all other migrations are completed.
+ */
+@Slf4j
+@ChangeUnit(order = "10000", id = "update-super-users", author = "", runAlways = true)
+public class Migration10000_UpdateSuperUser {
+
+ private final MongoTemplate mongoTemplate;
+ private final CacheableRepositoryHelper cacheableRepositoryHelper;
+ private final PolicySolution policySolution;
+ private final PolicyGenerator policyGenerator;
+ private final UpdateSuperUserMigrationHelper updateSuperUserMigrationHelper;
+
+ public Migration10000_UpdateSuperUser(
+ MongoTemplate mongoTemplate,
+ CacheableRepositoryHelper cacheableRepositoryHelper,
+ PolicySolution policySolution,
+ PolicyGenerator policyGenerator) {
+ this.mongoTemplate = mongoTemplate;
+ this.cacheableRepositoryHelper = cacheableRepositoryHelper;
+ this.policySolution = policySolution;
+ this.policyGenerator = policyGenerator;
+ this.updateSuperUserMigrationHelper = new UpdateSuperUserMigrationHelper();
+ }
+
+ @RollbackExecution
+ public void rollbackExecution() {}
+
+ @Execution
+ public void executeMigration() {
+ // Read the admin emails from the environment and update the super users accordingly
+ String adminEmailsStr = System.getenv(String.valueOf(APPSMITH_ADMIN_EMAILS));
+
+ Set adminEmails = TextUtils.csvToSet(adminEmailsStr);
+
+ Query instanceConfigurationQuery = new Query();
+ instanceConfigurationQuery.addCriteria(where(Config.Fields.name).is(FieldName.INSTANCE_CONFIG));
+ Config instanceAdminConfiguration = mongoTemplate.findOne(instanceConfigurationQuery, Config.class);
+
+ String instanceAdminPermissionGroupId =
+ (String) instanceAdminConfiguration.getConfig().get(DEFAULT_PERMISSION_GROUP);
+
+ Query permissionGroupQuery = new Query();
+ permissionGroupQuery
+ .addCriteria(where(PermissionGroup.Fields.id).is(instanceAdminPermissionGroupId))
+ .fields()
+ .include(PermissionGroup.Fields.assignedToUserIds);
+ PermissionGroup instanceAdminPG = mongoTemplate.findOne(permissionGroupQuery, PermissionGroup.class);
+
+ Query organizationQuery = new Query();
+ organizationQuery.addCriteria(where(Organization.Fields.slug).is("default"));
+ Organization organization = mongoTemplate.findOne(organizationQuery, Organization.class);
+
+ Set userIds = adminEmails.stream()
+ .map(email -> email.trim())
+ .map(String::toLowerCase)
+ .map(email -> {
+ Query userQuery = new Query();
+ userQuery.addCriteria(where(User.Fields.email).is(email));
+ User user = mongoTemplate.findOne(userQuery, User.class);
+
+ if (user == null) {
+ log.info("Creating super user with username {}", email);
+ user = updateSuperUserMigrationHelper.createNewUser(
+ email, organization, instanceAdminPG, mongoTemplate, policySolution, policyGenerator);
+ }
+
+ return user.getId();
+ })
+ .collect(Collectors.toSet());
+
+ Set oldSuperUsers = instanceAdminPG.getAssignedToUserIds();
+ Set updatedUserIds = findSymmetricDiff(oldSuperUsers, userIds);
+ evictPermissionCacheForUsers(updatedUserIds, mongoTemplate, cacheableRepositoryHelper);
+
+ Update update = new Update().set(PermissionGroup.Fields.assignedToUserIds, userIds);
+ mongoTemplate.updateFirst(permissionGroupQuery, update, PermissionGroup.class);
+
+ // Assign all super users to the default role
+ updateSuperUserMigrationHelper.assignAllSuperUsersToDefaultRole(
+ userIds, mongoTemplate, cacheableRepositoryHelper);
+ }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java
index 0c9836a18c2e..8c45a7c4d0fc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/solutions/ce/UpdateSuperUserMigrationHelperCE.java
@@ -3,10 +3,11 @@
import com.appsmith.external.models.Policy;
import com.appsmith.server.acl.PolicyGenerator;
import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Organization;
import com.appsmith.server.domains.PermissionGroup;
-import com.appsmith.server.domains.Tenant;
import com.appsmith.server.domains.User;
import com.appsmith.server.dtos.Permission;
+import com.appsmith.server.repositories.CacheableRepositoryHelper;
import com.appsmith.server.solutions.PolicySolution;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -24,7 +25,7 @@ protected Set generateUserPolicy(
User user,
PermissionGroup userManagementRole,
PermissionGroup instanceAdminRole,
- Tenant tenant,
+ Organization organization,
PolicySolution policySolution,
PolicyGenerator policyGenerator) {
Policy readUserPolicy = Policy.builder()
@@ -45,7 +46,7 @@ protected Set generateUserPolicy(
public User createNewUser(
String email,
- Tenant tenant,
+ Organization organization,
PermissionGroup instanceAdminRole,
MongoTemplate mongoTemplate,
PolicySolution policySolution,
@@ -53,14 +54,14 @@ public User createNewUser(
User user = new User();
user.setEmail(email);
user.setIsEnabled(false);
- user.setTenantId(tenant.getId());
+ user.setOrganizationId(organization.getId());
user.setCreatedAt(Instant.now());
user = mongoTemplate.save(user);
PermissionGroup userManagementPermissionGroup = createUserManagementPermissionGroup(mongoTemplate, user);
Set userPolicies = this.generateUserPolicy(
- user, userManagementPermissionGroup, instanceAdminRole, tenant, policySolution, policyGenerator);
+ user, userManagementPermissionGroup, instanceAdminRole, organization, policySolution, policyGenerator);
user.setPolicies(userPolicies);
@@ -79,4 +80,9 @@ public User createNewUser(
PermissionGroup savedPermissionGroup = mongoTemplate.save(userManagementPermissionGroup);
return savedPermissionGroup;
}
+
+ public void assignAllSuperUsersToDefaultRole(
+ Set userIds, MongoTemplate mongoTemplate, CacheableRepositoryHelper cacheableRepositoryHelper) {
+ // Empty function in CE to override in EE
+ }
}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java
index a983e279d1eb..bfa29a1b8b75 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/solutions/PluginTriggerSolutionCEImpl.java
@@ -10,7 +10,7 @@
import com.appsmith.server.repositories.PluginRepository;
import com.appsmith.server.services.ConfigService;
import com.appsmith.server.services.FeatureFlagService;
-import com.appsmith.server.services.TenantService;
+import com.appsmith.server.services.OrganizationService;
import com.appsmith.server.solutions.DatasourceTriggerSolution;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpHeaders;
@@ -28,7 +28,7 @@ public class PluginTriggerSolutionCEImpl implements PluginTriggerSolutionCE {
private final PluginExecutorHelper pluginExecutorHelper;
private final PluginRepository pluginRepository;
private final ConfigService configService;
- private final TenantService tenantService;
+ private final OrganizationService organizationService;
private final FeatureFlagService featureFlagService;
public PluginTriggerSolutionCEImpl(
@@ -36,13 +36,13 @@ public PluginTriggerSolutionCEImpl(
PluginExecutorHelper pluginExecutorHelper,
PluginRepository pluginRepository,
ConfigService configService,
- TenantService tenantService,
+ OrganizationService organizationService,
FeatureFlagService featureFlagService) {
this.datasourceTriggerSolution = datasourceTriggerSolution;
this.pluginExecutorHelper = pluginExecutorHelper;
this.pluginRepository = pluginRepository;
this.configService = configService;
- this.tenantService = tenantService;
+ this.organizationService = organizationService;
this.featureFlagService = featureFlagService;
}
@@ -81,7 +81,7 @@ public Mono trigger(
// TODO: Flags are needed here for google sheets integration to support shared drive behind a flag
// Once thoroughly tested, this flag can be removed
Map featureFlagMap =
- featureFlagService.getCachedTenantFeatureFlags().getFeatures();
+ featureFlagService.getCachedOrganizationFeatureFlags().getFeatures();
/*
* Since there is no datasource provided, we are passing the Datasource Context connection and datasourceConfiguration as null.
@@ -91,7 +91,7 @@ public Mono trigger(
Plugin plugin = pair.getT1();
PluginExecutor pluginExecutor = pair.getT2();
setHeadersToTriggerRequest(plugin, httpHeaders, triggerRequestDTO);
- return setTenantAndInstanceId(triggerRequestDTO)
+ return setOrganizationAndInstanceId(triggerRequestDTO)
.flatMap(updatedTriggerRequestDTO -> ((PluginExecutor