Skip to content

Commit

Permalink
chore: remove guest link passwords temp flag (#17896)
Browse files Browse the repository at this point in the history
  • Loading branch information
tlebon authored Sep 2, 2024
1 parent fc6946b commit 51c09d5
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 0 additions & 2 deletions server/config/client.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
env.FEATURE_ENABLE_ACCOUNT_REGISTRATION_ACCEPT_TERMS_AND_PRIVACY_POLICY == 'true',
ENABLE_DEBUG: env.FEATURE_ENABLE_DEBUG == 'true',
ENABLE_PING_CONFIRMATION: env.FEATURE_ENABLE_PING_CONFIRMATION == 'true',
//TODO: remove this when all clients have enabled this feature
ENABLE_LINK_PASSWORDS: env.FEATURE_ENABLE_LINK_PASSWORDS == 'true',
ENABLE_DOMAIN_DISCOVERY: env.FEATURE_ENABLE_DOMAIN_DISCOVERY != 'false',
ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY: env.FEATURE_ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY == 'true',
ENABLE_EXTRA_CLIENT_ENTROPY: env.FEATURE_ENABLE_EXTRA_CLIENT_ENTROPY == 'true',
Expand Down
4 changes: 0 additions & 4 deletions server/config/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,6 @@ export type Env = {
/** Set a default federation domain in case no domain can be found */
FEATURE_FEDERATION_DOMAIN: string;

// TODO: remove this when all clients have enabled this feature
/** Enable guest link passwords if the feature is enabled on the backend */
FEATURE_ENABLE_LINK_PASSWORDS: string;

/** Feature toggle for the log in with a username. Can be set to true or false */
FEATURE_ENABLE_USERNAME_LOGIN: string;

Expand Down
6 changes: 1 addition & 5 deletions src/script/page/RightSidebar/RightSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {container} from 'tsyringe';

import {WebAppEvents} from '@wireapp/webapp-events';

import {Config} from 'src/script/Config';
import {useKoSubscribableChildren} from 'Util/ComponentUtil';

import {AddParticipants} from './AddParticipants';
Expand Down Expand Up @@ -263,10 +262,7 @@ const RightSidebar: FC<RightSidebarProps> = ({

{(currentState === PanelState.GUEST_OPTIONS || currentState === PanelState.SERVICES_OPTIONS) && (
<GuestServicesOptions
isPasswordSupported={
// TODO: remove this flag when all clients have enabled this feature
Config.getConfig().FEATURE.ENABLE_LINK_PASSWORDS && core?.backendFeatures.supportsGuestLinksWithPassword
}
isPasswordSupported={core?.backendFeatures.supportsGuestLinksWithPassword}
isGuest={currentState === PanelState.GUEST_OPTIONS}
activeConversation={activeConversation}
conversationRepository={conversationRepository}
Expand Down

0 comments on commit 51c09d5

Please sign in to comment.