From 447bd44c99cd221ae86bc8183006715ce55853cd Mon Sep 17 00:00:00 2001
From: Simon Hornby <liquidwicked64@gmail.com>
Date: Mon, 5 Dec 2022 12:07:15 +0200
Subject: [PATCH] Remove clone env and sync sso group flags (#2596)

Removes feature flags for syncing sso groups and clone environment.
These features are being made generally available for all who have
access to environments and sso groups
---
 .../admin/auth/OidcAuth/OidcAuth.tsx          | 14 ++---
 .../admin/auth/SamlAuth/SamlAuth.tsx          | 15 ++---
 .../admin/groups/GroupForm/GroupForm.tsx      | 56 ++++++++-----------
 .../EnvironmentActionCellPopover.tsx          | 45 +++++++--------
 frontend/src/interfaces/uiConfig.ts           |  2 -
 .../__snapshots__/create-config.test.ts.snap  |  4 --
 src/lib/types/experimental.ts                 | 10 ----
 src/server-dev.ts                             |  2 -
 src/test/config/test-config.ts                |  2 -
 9 files changed, 52 insertions(+), 98 deletions(-)

diff --git a/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx b/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx
index 383d750abcc..b000f6ede08 100644
--- a/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx
+++ b/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx
@@ -40,7 +40,6 @@ export const OidcAuth = () => {
     const { hasAccess } = useContext(AccessContext);
     const { config } = useAuthSettings('oidc');
     const { updateSettings, errors, loading } = useAuthSettingsApi('oidc');
-    const ssoSyncShown = Boolean(uiConfig.flags.syncSSOGroups);
 
     useEffect(() => {
         if (config.discoverUrl) {
@@ -240,15 +239,10 @@ export const OidcAuth = () => {
                         />
                     </Grid>
                 </Grid>
-                <ConditionallyRender
-                    condition={ssoSyncShown}
-                    show={
-                        <SsoGroupSettings
-                            ssoType="OIDC"
-                            data={data}
-                            setValue={setValue}
-                        />
-                    }
+                <SsoGroupSettings
+                    ssoType="OIDC"
+                    data={data}
+                    setValue={setValue}
                 />
                 <AutoCreateForm data={data} setValue={setValue} />
 
diff --git a/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx b/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx
index 7ecbded6491..a52281c8b5e 100644
--- a/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx
+++ b/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx
@@ -40,7 +40,6 @@ export const SamlAuth = () => {
     const { hasAccess } = useContext(AccessContext);
     const { config } = useAuthSettings('saml');
     const { updateSettings, errors, loading } = useAuthSettingsApi('saml');
-    const ssoSyncShown = Boolean(uiConfig.flags.syncSSOGroups);
 
     useEffect(() => {
         if (config.entityId) {
@@ -251,15 +250,11 @@ export const SamlAuth = () => {
                         />
                     </Grid>
                 </Grid>
-                <ConditionallyRender
-                    condition={ssoSyncShown}
-                    show={
-                        <SsoGroupSettings
-                            ssoType="SAML"
-                            data={data}
-                            setValue={setValue}
-                        />
-                    }
+
+                <SsoGroupSettings
+                    ssoType="SAML"
+                    data={data}
+                    setValue={setValue}
                 />
 
                 <AutoCreateForm data={data} setValue={setValue} />
diff --git a/frontend/src/component/admin/groups/GroupForm/GroupForm.tsx b/frontend/src/component/admin/groups/GroupForm/GroupForm.tsx
index 06d65f35dde..f53eeeda4a1 100644
--- a/frontend/src/component/admin/groups/GroupForm/GroupForm.tsx
+++ b/frontend/src/component/admin/groups/GroupForm/GroupForm.tsx
@@ -128,41 +128,31 @@ export const GroupForm: FC<IGroupForm> = ({
                     data-testid={UG_DESC_ID}
                 />
                 <ConditionallyRender
-                    condition={
-                        Boolean(uiConfig.flags.syncSSOGroups) && !isOss()
-                    }
+                    condition={isGroupSyncingEnabled}
                     show={
-                        <ConditionallyRender
-                            condition={isGroupSyncingEnabled}
-                            show={
-                                <>
-                                    <StyledInputDescription>
-                                        Is this group associated with SSO
-                                        groups?
-                                    </StyledInputDescription>
-                                    <StyledItemList
-                                        label="SSO group ID / name"
-                                        value={mappingsSSO}
-                                        onChange={setMappingsSSO}
-                                    />
-                                </>
-                            }
-                            elseShow={() => (
-                                <StyledDescriptionBlock>
-                                    <Box sx={{ display: 'flex' }}>
-                                        You can enable SSO groups syncronization
-                                        if needed
-                                        <HelpIcon tooltip="SSO groups syncronization allows SSO groups to be mapped to Unleash groups, so that user group membership is properly synchronized." />
-                                    </Box>
-                                    <Link data-loading to={`/admin/auth`}>
-                                        <span data-loading>
-                                            View SSO configuration
-                                        </span>
-                                    </Link>
-                                </StyledDescriptionBlock>
-                            )}
-                        />
+                        <>
+                            <StyledInputDescription>
+                                Is this group associated with SSO groups?
+                            </StyledInputDescription>
+                            <StyledItemList
+                                label="SSO group ID / name"
+                                value={mappingsSSO}
+                                onChange={setMappingsSSO}
+                            />
+                        </>
                     }
+                    elseShow={() => (
+                        <StyledDescriptionBlock>
+                            <Box sx={{ display: 'flex' }}>
+                                You can enable SSO groups syncronization if
+                                needed
+                                <HelpIcon tooltip="SSO groups syncronization allows SSO groups to be mapped to Unleash groups, so that user group membership is properly synchronized." />
+                            </Box>
+                            <Link data-loading to={`/admin/auth`}>
+                                <span data-loading>View SSO configuration</span>
+                            </Link>
+                        </StyledDescriptionBlock>
+                    )}
                 />
                 <ConditionallyRender
                     condition={mode === 'Create'}
diff --git a/frontend/src/component/environments/EnvironmentTable/EnvironmentActionCell/EnvironmentActionCellPopover/EnvironmentActionCellPopover.tsx b/frontend/src/component/environments/EnvironmentTable/EnvironmentActionCell/EnvironmentActionCellPopover/EnvironmentActionCellPopover.tsx
index ae3a8940bea..88e4dca694f 100644
--- a/frontend/src/component/environments/EnvironmentTable/EnvironmentActionCell/EnvironmentActionCellPopover/EnvironmentActionCellPopover.tsx
+++ b/frontend/src/component/environments/EnvironmentTable/EnvironmentActionCell/EnvironmentActionCellPopover/EnvironmentActionCellPopover.tsx
@@ -118,31 +118,26 @@ export const EnvironmentActionCellPopover = ({
                             </StyledMenuItem>
                         )}
                     </PermissionHOC>
-                    <ConditionallyRender
-                        condition={Boolean(uiConfig.flags.cloneEnvironment)}
-                        show={
-                            <PermissionHOC permission={ADMIN}>
-                                {({ hasAccess }) => (
-                                    <StyledMenuItem
-                                        onClick={() => {
-                                            onClone();
-                                            handleClose();
-                                        }}
-                                        disabled={!hasAccess}
-                                    >
-                                        <ListItemIcon>
-                                            <CopyIcon />
-                                        </ListItemIcon>
-                                        <ListItemText>
-                                            <Typography variant="body2">
-                                                Clone
-                                            </Typography>
-                                        </ListItemText>
-                                    </StyledMenuItem>
-                                )}
-                            </PermissionHOC>
-                        }
-                    />
+                    <PermissionHOC permission={ADMIN}>
+                        {({ hasAccess }) => (
+                            <StyledMenuItem
+                                onClick={() => {
+                                    onClone();
+                                    handleClose();
+                                }}
+                                disabled={!hasAccess}
+                            >
+                                <ListItemIcon>
+                                    <CopyIcon />
+                                </ListItemIcon>
+                                <ListItemText>
+                                    <Typography variant="body2">
+                                        Clone
+                                    </Typography>
+                                </ListItemText>
+                            </StyledMenuItem>
+                        )}
+                    </PermissionHOC>
                     <PermissionHOC permission={UPDATE_ENVIRONMENT}>
                         {({ hasAccess }) => (
                             <StyledMenuItem
diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
index 2ca982c2704..3d54d4b218e 100644
--- a/frontend/src/interfaces/uiConfig.ts
+++ b/frontend/src/interfaces/uiConfig.ts
@@ -40,9 +40,7 @@ export interface IFlags {
     UG?: boolean;
     ENABLE_DARK_MODE_SUPPORT?: boolean;
     embedProxyFrontend?: boolean;
-    syncSSOGroups?: boolean;
     changeRequests?: boolean;
-    cloneEnvironment?: boolean;
     variantsPerEnvironment?: boolean;
     tokensLastSeen?: boolean;
     favorites?: boolean;
diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index d61caa9f6a5..1217e70830b 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -71,14 +71,12 @@ exports[`should create default config 1`] = `
       "anonymiseEventLog": false,
       "batchMetrics": false,
       "changeRequests": false,
-      "cloneEnvironment": false,
       "embedProxy": true,
       "embedProxyFrontend": true,
       "favorites": false,
       "networkView": false,
       "proxyReturnAllToggles": false,
       "responseTimeWithAppName": false,
-      "syncSSOGroups": false,
       "toggleTagFiltering": false,
       "tokensLastSeen": false,
       "variantsPerEnvironment": false,
@@ -90,14 +88,12 @@ exports[`should create default config 1`] = `
       "anonymiseEventLog": false,
       "batchMetrics": false,
       "changeRequests": false,
-      "cloneEnvironment": false,
       "embedProxy": true,
       "embedProxyFrontend": true,
       "favorites": false,
       "networkView": false,
       "proxyReturnAllToggles": false,
       "responseTimeWithAppName": false,
-      "syncSSOGroups": false,
       "toggleTagFiltering": false,
       "tokensLastSeen": false,
       "variantsPerEnvironment": false,
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index 699f5dfbd13..c1a9483bc63 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -14,10 +14,6 @@ export const defaultExperimentalOptions = {
             process.env.UNLEASH_EXPERIMENTAL_CHANGE_REQUESTS,
             false,
         ),
-        syncSSOGroups: parseEnvVarBoolean(
-            process.env.UNLEASH_EXPERIMENTAL_SYNC_SSO_GROUPS,
-            false,
-        ),
         embedProxyFrontend: parseEnvVarBoolean(
             process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY_FRONTEND,
             true,
@@ -30,10 +26,6 @@ export const defaultExperimentalOptions = {
             process.env.UNLEASH_EXPERIMENTAL_RESPONSE_TIME_WITH_APP_NAME,
             false,
         ),
-        cloneEnvironment: parseEnvVarBoolean(
-            process.env.UNLEASH_EXPERIMENTAL_CLONE_ENVIRONMENT,
-            false,
-        ),
         toggleTagFiltering: parseEnvVarBoolean(
             process.env.UNLEASH_EXPERIMENTAL_TOGGLE_TAG_FILTERING,
             false,
@@ -70,9 +62,7 @@ export interface IExperimentalOptions {
         embedProxyFrontend?: boolean;
         batchMetrics?: boolean;
         anonymiseEventLog?: boolean;
-        syncSSOGroups?: boolean;
         changeRequests?: boolean;
-        cloneEnvironment?: boolean;
         proxyReturnAllToggles?: boolean;
         variantsPerEnvironment?: boolean;
         tokensLastSeen?: boolean;
diff --git a/src/server-dev.ts b/src/server-dev.ts
index deeb886652f..c621d720640 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -38,9 +38,7 @@ process.nextTick(async () => {
                         batchMetrics: true,
                         anonymiseEventLog: false,
                         responseTimeWithAppName: true,
-                        syncSSOGroups: true,
                         changeRequests: true,
-                        cloneEnvironment: true,
                         toggleTagFiltering: true,
                         favorites: true,
                         variantsPerEnvironment: true,
diff --git a/src/test/config/test-config.ts b/src/test/config/test-config.ts
index 4e305cecfb0..f96f4896be2 100644
--- a/src/test/config/test-config.ts
+++ b/src/test/config/test-config.ts
@@ -27,9 +27,7 @@ export function createTestConfig(config?: IUnleashOptions): IUnleashConfig {
                 embedProxy: true,
                 embedProxyFrontend: true,
                 batchMetrics: true,
-                syncSSOGroups: true,
                 changeRequests: true,
-                cloneEnvironment: true,
                 variantsPerEnvironment: true,
                 favorites: true,
             },