chore: merge dev to acc

.env.localhost

@@ -10,6 +10,7 @@ CSP_EXTRA_IMG_SRC="https://*.zinfra.io, https://*.wire.com, https://*.wire.link"
 CSP_EXTRA_SCRIPT_SRC="http://localhost:32123, https://*.zinfra.io, https://*.wire.com, https://*.wire.link, https://api.raygun.io"
 ENFORCE_HTTPS="false"
 FEATURE_ENABLE_DEBUG="true"
+ENABLE_DEV_BACKEND_API="true"
 
 #FEATURE_DEFAULT_LOGIN_TEMPORARY_CLIENT="false"
 #FEATURE_PERSIST_TEMPORARY_CLIENTS="false"

.github/workflows/create_docker_image.yml

@@ -0,0 +1,46 @@
+name: Create Docker image
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'tagname for the Docker image'
+        required: true
+        type: string
+
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test_build_deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Use latest Node.js v16
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+
+      - name: Yarn cache
+        uses: c-hive/[email protected]
+
+      - name: Install JS dependencies
+        run: yarn --immutable
+
+      - name: Test
+        run: yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false
+
+      - name: Build
+        run: yarn build:prod
+
+      - name: Push Docker image
+        env:
+          DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}}
+          DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}}
+        run: yarn docker '' "${{inputs.tag}}"

.github/workflows/jira-lint-and-link.yml

@@ -6,10 +6,11 @@ jobs:
   add-jira-description:
     runs-on: ubuntu-latest
     steps:
-      - uses: cakeinpanic/jira-description-action@v1.2
+      - uses: cakeinpanic/jira-description-action@v0.3.2
         name: jira-description-action
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           jira-token: ${{ secrets.JIRA_TOKEN }}
           jira-base-url: https://wearezeta.atlassian.net
           skip-branches: '^(production-release|main|master|release\/v\d+)$' #optional
+          fail-when-jira-issue-not-found: false

.github/workflows/sync_translations.yml

@@ -34,7 +34,7 @@ jobs:
         run: yarn translate:merge
 
       - name: Download translations
-        uses: crowdin/[email protected].15
+        uses: crowdin/[email protected].16
         env:
           GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
           CROWDIN_PROJECT_ID: 342359

app-config/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.5-0",
-    "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.4"
+    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.9-0",
+    "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.8"
   }
 }

babel.config.js

@@ -30,27 +30,15 @@ const presetEnvConfig = {
 module.exports = {
   env: {
     test: {
-      plugins: [
-        '@babel/plugin-proposal-class-properties',
-        '@babel/plugin-proposal-nullish-coalescing-operator',
-        '@babel/plugin-proposal-optional-chaining',
-        '@emotion',
-      ],
+      plugins: ['@emotion'],
       presets: [
         ['@babel/preset-react', {importSource: '@emotion/react', runtime: 'automatic'}],
         '@babel/preset-typescript',
         ['@babel/preset-env', {...presetEnvConfig, modules: 'commonjs'}],
       ],
     },
   },
-  plugins: [
-    ['@babel/plugin-proposal-decorators', {legacy: true}],
-    '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-nullish-coalescing-operator',
-    '@babel/plugin-proposal-optional-chaining',
-    '@babel/plugin-syntax-dynamic-import',
-    '@emotion',
-  ],
+  plugins: [['@babel/plugin-proposal-decorators', {legacy: true}], '@emotion'],
   presets: [
     ['@babel/preset-react', {importSource: '@emotion/react', runtime: 'automatic'}],
     '@babel/preset-typescript',

package.json

@@ -2,11 +2,11 @@
   "dependencies": {
     "@emotion/react": "11.10.4",
     "@wireapp/avs": "8.2.16",
-    "@wireapp/core": "32.1.1",
-    "@wireapp/react-ui-kit": "8.17.0",
-    "@wireapp/store-engine-dexie": "1.7.6",
-    "@wireapp/store-engine-sqleet": "1.8.6",
-    "@wireapp/webapp-events": "0.14.6",
+    "@wireapp/core": "34.1.4",
+    "@wireapp/react-ui-kit": "8.17.5",
+    "@wireapp/store-engine-dexie": "1.7.11",
+    "@wireapp/store-engine-sqleet": "1.8.9",
+    "@wireapp/webapp-events": "0.14.9",
     "amplify": "https://github.com/wireapp/amplify#head=master",
     "classnames": "2.3.2",
     "copy-webpack-plugin": "11.0.0",
@@ -30,7 +30,7 @@
     "platform": "1.3.6",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-intl": "6.2.0",
+    "react-intl": "6.2.1",
     "react-redux": "8.0.4",
     "react-router": "6.4.2",
     "react-router-dom": "6.4.2",
@@ -46,21 +46,17 @@
     "underscore": "1.13.6",
     "uuidjs": "4.2.12",
     "webrtc-adapter": "6.4.8",
-    "zustand": "4.1.2"
+    "zustand": "4.1.3"
   },
   "devDependencies": {
-    "@babel/core": "7.19.3",
+    "@babel/core": "7.19.6",
     "@babel/eslint-parser": "7.19.1",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-decorators": "7.19.3",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "7.18.9",
-    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-proposal-decorators": "7.19.6",
     "@babel/preset-env": "7.19.4",
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.18.6",
     "@faker-js/faker": "7.6.0",
-    "@formatjs/cli": "5.1.2",
+    "@formatjs/cli": "5.1.3",
     "@koush/wrtc": "0.5.3",
     "@testing-library/react": "13.4.0",
     "@types/adm-zip": "0.5.0",
@@ -70,14 +66,14 @@
     "@types/fs-extra": "9.0.13",
     "@types/generate-changelog": "1.8.1",
     "@types/highlight.js": "10.1.0",
-    "@types/jest": "29.1.2",
+    "@types/jest": "29.2.0",
     "@types/js-cookie": "3.0.2",
     "@types/jsdom": "20.0.0",
     "@types/keyboardjs": "2.5.0",
     "@types/libsodium-wrappers-sumo": "0.7.5",
     "@types/linkify-it": "3.0.2",
     "@types/markdown-it": "12.2.3",
-    "@types/node": "^18.11.0",
+    "@types/node": "^18.11.3",
     "@types/open-graph": "0.2.2",
     "@types/platform": "1.3.4",
     "@types/react": "18.0.21",
@@ -91,29 +87,29 @@
     "@types/uint32": "0.2.0",
     "@types/underscore": "1.11.4",
     "@types/webpack-env": "1.18.0",
-    "@typescript-eslint/eslint-plugin": "5.40.0",
-    "@typescript-eslint/parser": "5.40.0",
-    "@wireapp/copy-config": "1.3.6",
-    "@wireapp/eslint-config": "1.12.11",
-    "@wireapp/prettier-config": "0.4.6",
+    "@typescript-eslint/eslint-plugin": "5.40.1",
+    "@typescript-eslint/parser": "5.40.1",
+    "@wireapp/copy-config": "1.3.10",
+    "@wireapp/eslint-config": "1.12.12",
+    "@wireapp/prettier-config": "0.4.7",
     "adm-zip": "0.5.9",
     "autoprefixer": "9.8.8",
     "babel-loader": "8.2.5",
-    "caniuse-lite": "^1.0.30001420",
-    "concurrently": "7.4.0",
+    "caniuse-lite": "^1.0.30001423",
+    "concurrently": "7.5.0",
     "cross-env": "7.0.3",
     "cspell": "6.12.0",
     "cssnano": "4.1.11",
     "dexie": "^3.2.2",
     "dotenv": "16.0.3",
     "dpdm": "3.10.0",
-    "eslint": "8.25.0",
+    "eslint": "8.26.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-import-resolver-alias": "1.1.2",
     "eslint-plugin-babel": "5.3.1",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jest": "27.1.2",
-    "eslint-plugin-jsdoc": "39.3.6",
+    "eslint-plugin-jest": "27.1.3",
+    "eslint-plugin-jsdoc": "39.3.21",
     "eslint-plugin-jsx-a11y": "6.6.1",
     "eslint-plugin-no-unsanitized": "4.0.1",
     "eslint-plugin-prettier": "4.2.1",
@@ -138,10 +134,10 @@
     "husky": "7.0.4",
     "i18next-scanner": "4.1.0",
     "intersection-observer": "0.12.2",
-    "jest": "29.2.0",
+    "jest": "29.2.1",
     "jest-canvas-mock": "2.4.0",
-    "jest-environment-jsdom": "29.1.2",
-    "jest-jasmine2": "29.2.0",
+    "jest-environment-jsdom": "29.2.1",
+    "jest-jasmine2": "29.2.1",
     "jsdom-worker": "0.3.0",
     "less": "3.13.1",
     "lint-staged": "13.0.3",

server/ServerConfig.ts

@@ -27,6 +27,7 @@ export interface ServerConfig {
     BRAND_NAME: string;
     CHROME_ORIGIN_TRIAL_TOKEN: string;
     COUNTLY_API_KEY: string;
+    ENABLE_DEV_BACKEND_API: boolean;
     ENVIRONMENT: string;
     FEATURE: {
       ALLOWED_FILE_UPLOAD_EXTENSIONS: string[];

server/config.ts

@@ -123,6 +123,7 @@ const config: ServerConfig = {
     BRAND_NAME: process.env.BRAND_NAME,
     CHROME_ORIGIN_TRIAL_TOKEN: process.env.CHROME_ORIGIN_TRIAL_TOKEN,
     COUNTLY_API_KEY: process.env.COUNTLY_API_KEY,
+    ENABLE_DEV_BACKEND_API: process.env.ENABLE_DEV_BACKEND_API == 'true',
     ENVIRONMENT: nodeEnvironment,
     FEATURE: {
       ALLOWED_FILE_UPLOAD_EXTENSIONS: (process.env.FEATURE_ALLOWED_FILE_UPLOAD_EXTENSIONS || '*')

server/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "dependencies": {
-    "@wireapp/commons": "4.4.6",
+    "@wireapp/commons": "4.4.10",
     "dotenv": "16.0.3",
     "dotenv-extended": "2.9.0",
     "express": "4.18.2",

server/yarn.lock

@@ -1332,15 +1332,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/commons@npm:4.4.6":
-  version: 4.4.6
-  resolution: "@wireapp/commons@npm:4.4.6"
+"@wireapp/commons@npm:4.4.10":
+  version: 4.4.10
+  resolution: "@wireapp/commons@npm:4.4.10"
   dependencies:
     ansi-regex: 5.0.1
-    fs-extra: 10.0.0
+    fs-extra: 10.1.0
     logdown: 3.3.1
     platform: 1.3.6
-  checksum: 76dcebc6ba4a514c15ab27c2c048edb1043a1f1ab1652a2b1b059f8d9bd227f351d44c345445d38c37333c45751e4432cd3ab53697b3d0cab761025c834d8a55
+  checksum: c026b91caffbf8c2abf929abb4e62c33684a1c3bbcde7d6f6164d60a80ce7507969921965fc477145c127eff1b1e3f4d7072f9821c08b8d6cecd9a474894f169
   languageName: node
   linkType: hard
 
@@ -2952,17 +2952,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:10.0.0":
-  version: 10.0.0
-  resolution: "fs-extra@npm:10.0.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a
-  languageName: node
-  linkType: hard
-
 "fs-extra@npm:10.1.0":
   version: 10.1.0
   resolution: "fs-extra@npm:10.1.0"
@@ -4623,11 +4612,11 @@ __metadata:
   linkType: hard
 
 "minimatch@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "minimatch@npm:3.0.4"
+  version: 3.1.2
+  resolution: "minimatch@npm:3.1.2"
   dependencies:
     brace-expansion: ^1.1.7
-  checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078
+  checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a
   languageName: node
   linkType: hard
 
@@ -6717,7 +6706,7 @@ __metadata:
     "@types/geolite2": 2.0.0
     "@types/hbs": 4.0.1
     "@types/node": 12.20.55
-    "@wireapp/commons": 4.4.6
+    "@wireapp/commons": 4.4.10
     dotenv: 16.0.3
     dotenv-extended: 2.9.0
     express: 4.18.2

src/script/Config.ts

@@ -40,6 +40,7 @@ export class Configuration {
   readonly BACKEND_WS = env.BACKEND_WS || 'wss://prod-nginz-ssl.wire.com';
   readonly BRAND_NAME = env.BRAND_NAME || 'Wire';
   readonly COUNTLY_API_KEY = env.COUNTLY_API_KEY;
+  readonly ENABLE_DEV_BACKEND_API = env.ENABLE_DEV_BACKEND_API;
   readonly ENVIRONMENT = env.ENVIRONMENT || 'production';
   readonly FEATURE = {
     ...env.FEATURE,

src/script/auth/module/action/AuthAction.ts

@@ -174,7 +174,7 @@ export class AuthAction {
       dispatch(AuthActionCreator.startLogin());
       try {
         // we first init the core without initializing the client for now (this will be done later on)
-        await core.init(clientType, undefined, false);
+        await core.init(clientType, {initClient: false});
         await this.persistAuthData(clientType, core, dispatch, localStorageAction);
         await dispatch(selfAction.fetchSelf());
         await dispatch(cookieAction.setCookie(COOKIE_NAME_APP_OPENED, {appInstanceId: getConfig().APP_INSTANCE_ID}));
@@ -363,7 +363,7 @@ export class AuthAction {
         }
         const clientType = persist ? ClientType.PERMANENT : ClientType.TEMPORARY;
 
-        await core.init(clientType, undefined, false);
+        await core.init(clientType, {initClient: false});
         await this.persistAuthData(clientType, core, dispatch, localStorageAction);
 
         if (options.shouldValidateLocalClient) {

src/script/calling/CallingRepository.ts

@@ -572,6 +572,7 @@ export class CallingRepository {
       qualified_from,
       sender: clientId,
       time = new Date().toISOString(),
+      senderClientId: senderFullyQualifiedClientId = '',
     } = event;
     const isFederated = this.core.backendFeatures.isFederated && qualified_conversation && qualified_from;
     const userId = isFederated ? qualified_from : {domain: '', id: from};
@@ -619,6 +620,11 @@ export class CallingRepository {
       }
     }
 
+    let senderClientId = '';
+    if (senderFullyQualifiedClientId) {
+      senderClientId = this.parseQualifiedId(senderFullyQualifiedClientId).id.split(':')[1];
+    }
+
     const res = this.wCall?.recvMsg(
       this.wUser,
       contentStr,
@@ -627,7 +633,7 @@ export class CallingRepository {
       toSecond(new Date(time).getTime()),
       this.serializeQualifiedId(conversationId),
       this.serializeQualifiedId(userId),
-      conversationEntity?.isUsingMLSProtocol ? content.src_clientid : clientId,
+      conversationEntity?.isUsingMLSProtocol ? senderClientId : clientId,
     );
 
     if (res !== 0) {

src/script/components/userDevices/SelfFingerprint.tsx

@@ -44,7 +44,10 @@ const SelfFingerprint: React.FC<SelfFingerprintProps> = ({
   noPadding,
   clientState = container.resolve(ClientState),
 }) => {
-  const fingerprintLocal = useMemo<string>(() => cryptographyRepository.getLocalFingerprint(), []);
+  const fingerprintLocal = useMemo<string>(
+    () => cryptographyRepository.getLocalFingerprint(),
+    [cryptographyRepository],
+  );
   const {currentClient} = useKoSubscribableChildren(clientState, ['currentClient']);
 
   return (