diff --git a/app/client/cypress/fixtures/featureFlags.json b/app/client/cypress/fixtures/featureFlags.json index cfb07d85ef..b9b815df9a 100644 --- a/app/client/cypress/fixtures/featureFlags.json +++ b/app/client/cypress/fixtures/featureFlags.json @@ -14,7 +14,6 @@ "AUDIT_LOGS": true, "JS_EDITOR": true, "GIT_IMPORT": true, - "CONTEXT_SWITCHING": true, - "LIMITING_GOOGLE_SHEET_ACCESS": true + "CONTEXT_SWITCHING": true } } diff --git a/app/client/src/entities/FeatureFlags.ts b/app/client/src/entities/FeatureFlags.ts index 8749a4fcb8..0a16321924 100644 --- a/app/client/src/entities/FeatureFlags.ts +++ b/app/client/src/entities/FeatureFlags.ts @@ -10,7 +10,6 @@ type FeatureFlags = { DATASOURCE_ENVIRONMENTS?: boolean; MULTIPLE_PANES?: boolean; AUTO_LAYOUT?: boolean; - LIMITING_GOOGLE_SHEET_ACCESS?: boolean; LAZY_CANVAS_RENDERING?: boolean; ONE_CLICK_BINDING?: boolean; CHAT_AI?: boolean; diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx index 55fa06ee7e..0ad8278018 100644 --- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx +++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx @@ -64,7 +64,6 @@ import { GSHEET_AUTHORIZATION_ERROR, SAVE_AND_AUTHORIZE_BUTTON_TEXT, } from "@appsmith/constants/messages"; -import { selectFeatureFlags } from "selectors/usersSelectors"; import { getDatasourceErrorMessage } from "./errorUtils"; import { getAssetUrl } from "@appsmith/utils/airgapHelpers"; import { DocumentationLink } from "../QueryEditor/EditorJSONtoForm"; @@ -278,7 +277,6 @@ class DatasourceSaaSEditor extends JSONtoForm { datasourceButtonConfiguration, datasourceId, documentationLink, - featureFlags, formConfig, formData, gsheetProjectID, @@ -381,9 +379,7 @@ class DatasourceSaaSEditor extends JSONtoForm { <> {/* This adds information banner when creating google sheets datasource, this info banner explains why appsmith requires permissions from users google account */} - {!!featureFlags && - !!featureFlags?.LIMITING_GOOGLE_SHEET_ACCESS && - datasource && + {datasource && isGoogleSheetPlugin && datasource?.id === TEMP_DATASOURCE_ID ? ( { state.entities.datasources.isDatasourceBeingSavedFromPopup, isFormDirty, canCreateDatasourceActions, - featureFlags: selectFeatureFlags(state), gsheetToken, gsheetProjectID, }; diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json index 5fe2a428cb..d2edb6ffbe 100644 --- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json +++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json @@ -2,59 +2,6 @@ "form": [ { "sectionName": "General", - "hidden": { - "comparison": "FEATURE_FLAG", - "value": true, - "flagValue": "LIMITING_GOOGLE_SHEET_ACCESS" - }, - "children": [ - { - "label": "Authentication Type", - "configProperty": "datasourceConfiguration.authentication.authenticationType", - "controlType": "INPUT_TEXT", - "isRequired": false, - "hidden": true, - "initialValue": "oAuth2" - }, - { - "label": "Grant Type", - "configProperty": "datasourceConfiguration.authentication.grantType", - "controlType": "INPUT_TEXT", - "isRequired": false, - "hidden": true, - "initialValue": "authorization_code" - }, - { - "label": "Scope", - "configProperty": "datasourceConfiguration.authentication.scopeString", - "controlType": "DROP_DOWN", - "isRequired": true, - "options": [ - { - "label": "Read Files", - "value": "https://www.googleapis.com/auth/spreadsheets.readonly,https://www.googleapis.com/auth/drive.readonly" - }, - { - "label": "Read, Edit and Create Files", - "value": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive.readonly" - }, - { - "label": "Read, Edit, Create and Delete Files", - "value": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive" - } - ], - "initialValue": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive.readonly" - } - ] - }, - { - "sectionName": "General", - "hidden": { - "comparison": "FEATURE_FLAG", - "value": false, - "flagValue": "LIMITING_GOOGLE_SHEET_ACCESS" - }, - "isDefaultOpen": true, "children": [ { "label": "Authentication Type", diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagEnum.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagEnum.java index c13b0dbc5b..e702509896 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagEnum.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagEnum.java @@ -32,7 +32,6 @@ public enum FeatureFlagEnum { CONTEXT_SWITCHING, DATASOURCE_ENVIRONMENTS, AUTO_LAYOUT, - LIMITING_GOOGLE_SHEET_ACCESS, LAZY_CANVAS_RENDERING, ONE_CLICK_BINDING, diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java index 0bc9654610..0ec1b7c2ad 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java @@ -467,19 +467,11 @@ public class AuthenticationServiceCEImpl implements AuthenticationServiceCE { Mono accessTokenMono = Mono.just(accessToken); Mono projectIdMono = Mono.just(projectID); - return featureFlagService.check(FeatureFlagEnum.LIMITING_GOOGLE_SHEET_ACCESS) - .flatMap(isFeatureFlag -> { - if (Boolean.TRUE.equals(isFeatureFlag)) { - - return pluginExecutorHelper - .getPluginExecutor(pluginService.findById(datasource.getPluginId())) - .flatMap(pluginExecutor -> ((PluginExecutor) pluginExecutor) - .getDatasourceMetadata(datasource.getDatasourceConfiguration())) - .then(Mono.zip(Mono.just(datasource), accessTokenMono, projectIdMono)); - } - - return Mono.zip(Mono.just(datasource), accessTokenMono, projectIdMono); - }); + return pluginExecutorHelper + .getPluginExecutor(pluginService.findById(datasource.getPluginId())) + .flatMap(pluginExecutor -> ((PluginExecutor) pluginExecutor) + .getDatasourceMetadata(datasource.getDatasourceConfiguration())) + .then(Mono.zip(Mono.just(datasource), accessTokenMono, projectIdMono)); }); }) .flatMap(tuple -> { diff --git a/app/server/appsmith-server/src/main/resources/features/init-flags.yml b/app/server/appsmith-server/src/main/resources/features/init-flags.yml index 228e3b7bee..072b5afe41 100644 --- a/app/server/appsmith-server/src/main/resources/features/init-flags.yml +++ b/app/server/appsmith-server/src/main/resources/features/init-flags.yml @@ -89,15 +89,6 @@ ff4j: - name: emailDomains value: appsmith.com,moolya.com - - uid: LIMITING_GOOGLE_SHEET_ACCESS - enable: true - description: Enable limiting gsheet access feature by email domain of the user - flipstrategy: - class: com.appsmith.server.featureflags.strategies.EmailBasedRolloutStrategy - param: - - name: emails - value: integrations@appsmith.com - # Put EE flags below this line, to avoid conflicts. - uid: LAZY_CANVAS_RENDERING enable: true