Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: RC-2024-12-11 #18480

Merged
merged 5 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.localhost
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ ENABLE_DEV_BACKEND_API="true"
#FEATURE_DEFAULT_LOGIN_TEMPORARY_CLIENT="false"
#FEATURE_APPLOCK_UNFOCUS_TIMEOUT="30"
#FEATURE_APPLOCK_SCHEDULED_TIMEOUT="30"
#FEATURE_ENABLE_MLS="true"
#FEATURE_USE_CORE_CRYPTO="true"

# staging
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@mediapipe/tasks-vision": "0.10.18",
"@wireapp/avs": "9.10.16",
"@wireapp/commons": "5.4.0",
"@wireapp/core": "46.13.0",
"@wireapp/core": "46.14.1",
"@wireapp/react-ui-kit": "9.28.0",
"@wireapp/store-engine-dexie": "2.1.15",
"@wireapp/telemetry": "0.1.3",
Expand Down
1 change: 0 additions & 1 deletion server/config/client.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY: env.FEATURE_ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY == 'true',
ENABLE_EXTRA_CLIENT_ENTROPY: env.FEATURE_ENABLE_EXTRA_CLIENT_ENTROPY == 'true',
ENABLE_MEDIA_EMBEDS: env.FEATURE_ENABLE_MEDIA_EMBEDS != 'false',
ENABLE_MLS: env.FEATURE_ENABLE_MLS == 'true',
ENABLE_PROTEUS_CORE_CRYPTO: env.FEATURE_ENABLE_PROTEUS_CORE_CRYPTO == 'true',
ENABLE_SSO: env.FEATURE_ENABLE_SSO == 'true',
ENFORCE_CONSTANT_BITRATE: env.FEATURE_ENFORCE_CONSTANT_BITRATE == 'true',
Expand All @@ -74,12 +73,12 @@
SHOW_LOADING_INFORMATION: env.FEATURE_SHOW_LOADING_INFORMATION == 'true',
USE_CORE_CRYPTO: env.FEATURE_USE_CORE_CRYPTO == 'true',
MAX_USERS_TO_PING_WITHOUT_ALERT:
(env.FEATURE_MAX_USERS_TO_PING_WITHOUT_ALERT && Number(env.FEATURE_MAX_USERS_TO_PING_WITHOUT_ALERT)) || 4,

Check warning on line 76 in server/config/client.config.ts

View workflow job for this annotation

GitHub Actions / test

No magic number: 4
DATADOG_ENVIRONMENT: env.FEATURE_DATADOG_ENVIRONMENT,
},
MAX_GROUP_PARTICIPANTS: (env.MAX_GROUP_PARTICIPANTS && Number(env.MAX_GROUP_PARTICIPANTS)) || 500,

Check warning on line 79 in server/config/client.config.ts

View workflow job for this annotation

GitHub Actions / test

No magic number: 500
MAX_VIDEO_PARTICIPANTS: (env.MAX_VIDEO_PARTICIPANTS && Number(env.MAX_VIDEO_PARTICIPANTS)) || 4,

Check warning on line 80 in server/config/client.config.ts

View workflow job for this annotation

GitHub Actions / test

No magic number: 4
NEW_PASSWORD_MINIMUM_LENGTH: (env.NEW_PASSWORD_MINIMUM_LENGTH && Number(env.NEW_PASSWORD_MINIMUM_LENGTH)) || 8,

Check warning on line 81 in server/config/client.config.ts

View workflow job for this annotation

GitHub Actions / test

No magic number: 8
URL: {
ACCOUNT_BASE: env.URL_ACCOUNT_BASE,
MOBILE_BASE: env.URL_MOBILE_BASE,
Expand Down
2 changes: 0 additions & 2 deletions server/config/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ export type Env = {
FEATURE_ALLOWED_FILE_UPLOAD_EXTENSIONS: string;

/** will enable the MLS protocol */
FEATURE_ENABLE_MLS?: string;

FEATURE_USE_CORE_CRYPTO?: string;

FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD?: string;
Expand Down
6 changes: 3 additions & 3 deletions src/i18n/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -1061,9 +1061,9 @@
"modalConversationOptionsToggleServiceMessage": "Status der Dienste konnte nicht geändert werden.",
"modalConversationRemoveAction": "Entfernen",
"modalConversationRemoveCloseBtn": "Fenster 'Entfernen' schließen",
"modalConversationRemoveGroupAction": "Delete for Me",
"modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?",
"modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.",
"modalConversationRemoveGroupAction": "Für mich löschen",
"modalConversationRemoveGroupHeadline": "Gruppe {conversation} für mich löschen?",
"modalConversationRemoveGroupMessage": "Sie können dann nicht mehr auf die Gruppe und ihren Inhalt zugreifen. Es gibt keine Möglichkeit, sie wiederherzustellen.",
"modalConversationRemoveGuestsHeadline": "Gastzugang deaktivieren?",
"modalConversationRemoveGuestsMessage": "Aktuelle Gäste werden aus der Unterhaltung entfernt. Neue Gäste können nicht hinzugefügt werden.",
"modalConversationRemoveGuestsOrServicesAction": "Deaktivieren",
Expand Down
2 changes: 1 addition & 1 deletion src/script/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const config = {
ALLOWED_IMAGE_TYPES: ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png'],

/** Which min and max version of the backend api do we support */
SUPPORTED_API_RANGE: [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 6],
SUPPORTED_API_RANGE: [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 7],

/** DataDog client api keys acces */
dataDog: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,12 @@ const GroupCreationModal: React.FC<GroupCreationModalProps> = ({
} = useKoSubscribableChildren(teamState, ['isTeam', 'isMLSEnabled', 'isProtocolToggleEnabledForUser']);
const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);

const isMLSFeatureEnabled = Config.getConfig().FEATURE.ENABLE_MLS;

const enableMLSToggle = isMLSFeatureEnabled && isMLSEnabledForTeam && isProtocolToggleEnabledForUser;
const enableMLSToggle = isMLSEnabledForTeam && isProtocolToggleEnabledForUser;

//if feature flag is set to false or mls is disabled for current team use proteus as default
const defaultProtocol =
isMLSFeatureEnabled && isMLSEnabledForTeam
? teamState.teamFeatures()?.mls?.config.defaultProtocol
: ConversationProtocol.PROTEUS;
const defaultProtocol = isMLSEnabledForTeam
? teamState.teamFeatures()?.mls?.config.defaultProtocol
: ConversationProtocol.PROTEUS;

const protocolOptions: ProtocolOption[] = ([ConversationProtocol.PROTEUS, ConversationProtocol.MLS] as const).map(
protocol => ({
Expand Down
3 changes: 1 addition & 2 deletions src/script/util/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {Runtime} from '@wireapp/commons';
import {isTabKey} from './KeyboardUtil';
import {getLogger} from './Logger';

import {Config} from '../Config';
import type {Conversation} from '../entity/Conversation';
import {AuthError} from '../error/AuthError';

Expand Down Expand Up @@ -304,7 +303,7 @@ export const setContextMenuPosition = (event: React.KeyboardEvent) => {
const supportsSecretStorage = () => !Runtime.isDesktopApp() || !!window.systemCrypto;

// disables mls for old 'broken' desktop clients, see https://github.com/wireapp/wire-desktop/pull/6094
export const supportsMLS = () => Config.getConfig().FEATURE.ENABLE_MLS && supportsSecretStorage();
export const supportsMLS = () => supportsSecretStorage();

export const incomingCssClass = 'content-animation-incoming-horizontal-left';

Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5941,9 +5941,9 @@ __metadata:
languageName: node
linkType: hard

"@wireapp/api-client@npm:^27.13.2":
version: 27.13.2
resolution: "@wireapp/api-client@npm:27.13.2"
"@wireapp/api-client@npm:^27.14.0":
version: 27.14.0
resolution: "@wireapp/api-client@npm:27.14.0"
dependencies:
"@wireapp/commons": "npm:^5.4.0"
"@wireapp/priority-queue": "npm:^2.1.11"
Expand All @@ -5958,7 +5958,7 @@ __metadata:
tough-cookie: "npm:4.1.4"
ws: "npm:8.18.0"
zod: "npm:3.23.8"
checksum: 10/1fbe961c5648fd349de4f59df29eb52e80d7999c7114066cfdfbf14a7c42e4ebfa6276218f4694aa4a141e7e6221e1b2bd9f65de48cfcd2c3207e330e00edc9d
checksum: 10/8f03bc24e21b8a1b2c78e4aa663115eb910d2cb5acbf3e4603e25ed860b72a1c2342db4cf02d2f853413386b3d6b91128d0baf72cb4c6f3237dc75f49b4a4151
languageName: node
linkType: hard

Expand Down Expand Up @@ -6005,20 +6005,20 @@ __metadata:
languageName: node
linkType: hard

"@wireapp/core-crypto@npm:2.0.0":
version: 2.0.0
resolution: "@wireapp/core-crypto@npm:2.0.0"
checksum: 10/f4d9a687ba32bea4026d831f05dcc20e65436f44e6600663348aaf3089ceb1d0a6ad179d24516fc54436be104805b065ab44fe9418b3c8ef872aba8417f71ce3
"@wireapp/core-crypto@npm:3.0.0":
version: 3.0.0
resolution: "@wireapp/core-crypto@npm:3.0.0"
checksum: 10/7c4a1385bac9e59692ee0e4102745f20cfb5a2d4abd0025e28bce33970712125de2cc2d631769828a9339374684cb3ab9f6e737dfc0eb9af16d2f4129fec75ff
languageName: node
linkType: hard

"@wireapp/core@npm:46.13.0":
version: 46.13.0
resolution: "@wireapp/core@npm:46.13.0"
"@wireapp/core@npm:46.14.1":
version: 46.14.1
resolution: "@wireapp/core@npm:46.14.1"
dependencies:
"@wireapp/api-client": "npm:^27.13.2"
"@wireapp/api-client": "npm:^27.14.0"
"@wireapp/commons": "npm:^5.4.0"
"@wireapp/core-crypto": "npm:2.0.0"
"@wireapp/core-crypto": "npm:3.0.0"
"@wireapp/cryptobox": "npm:12.8.0"
"@wireapp/priority-queue": "npm:^2.1.11"
"@wireapp/promise-queue": "npm:^2.3.10"
Expand All @@ -6034,7 +6034,7 @@ __metadata:
long: "npm:^5.2.0"
uuid: "npm:9.0.1"
zod: "npm:3.23.8"
checksum: 10/30b90cdc3fdc0ba8e015bac7182244c410528ba66ed0a48c7aa647e8354e2b4fa6aa0c9e30af18923aa02551b6c10562632604c6d59537e49dc1e113d4858cb6
checksum: 10/11a5fbedddc1c5be8218935f4b1f1ec9c7824c4261e6d189ad3708f8edcdcfaea143fd121fd57c05a790c0392e9e5757c5a82742c1c8a85fb3ff9f8360a4c650
languageName: node
linkType: hard

Expand Down Expand Up @@ -18683,7 +18683,7 @@ __metadata:
"@wireapp/avs": "npm:9.10.16"
"@wireapp/commons": "npm:5.4.0"
"@wireapp/copy-config": "npm:2.2.10"
"@wireapp/core": "npm:46.13.0"
"@wireapp/core": "npm:46.14.1"
"@wireapp/eslint-config": "npm:3.0.7"
"@wireapp/prettier-config": "npm:0.6.4"
"@wireapp/react-ui-kit": "npm:9.28.0"
Expand Down
Loading