From 3cab7c891c0c5c9c46df11d68d341f608f2197d5 Mon Sep 17 00:00:00 2001 From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com> Date: Fri, 9 Jan 2026 20:03:22 +0000 Subject: [PATCH 1/2] fix: ddp streamer not waiting some requests completion (#38118) --- .changeset/stale-shoes-serve.md | 5 +++++ ee/apps/account-service/src/lib/loginViaUsername.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/stale-shoes-serve.md diff --git a/.changeset/stale-shoes-serve.md b/.changeset/stale-shoes-serve.md new file mode 100644 index 0000000000000..6f1b6fea42ee2 --- /dev/null +++ b/.changeset/stale-shoes-serve.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/account-service': patch +--- + +Fixes an issue where some DDP streamer requests were returning before processing was completed diff --git a/ee/apps/account-service/src/lib/loginViaUsername.ts b/ee/apps/account-service/src/lib/loginViaUsername.ts index 67c4bd8c4c5e6..57f2cbb31ec08 100644 --- a/ee/apps/account-service/src/lib/loginViaUsername.ts +++ b/ee/apps/account-service/src/lib/loginViaUsername.ts @@ -15,7 +15,7 @@ export async function loginViaUsername( return false; } - const valid = user.services?.password?.bcrypt && validatePassword(password, user.services.password.bcrypt); + const valid = user.services?.password?.bcrypt && (await validatePassword(password, user.services.password.bcrypt)); if (!valid) { return false; } From 9dc2d48e7445d2497e4198494161494be4a665f2 Mon Sep 17 00:00:00 2001 From: Julio Araujo Date: Mon, 12 Jan 2026 17:42:35 +0100 Subject: [PATCH 2/2] fix ci --- .github/workflows/ci.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 705151a0ad02a..af03f83e12981 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -584,6 +584,35 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORTER_JIRA_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_JIRA_ROCKETCHAT_API_KEY }} + test-ui-ee-watcher: + name: 🔨 Test UI (EE) + needs: [checks, build-gh-docker-publish, release-versions] + + uses: ./.github/workflows/ci-test-e2e.yml + with: + type: ui + release: ee + transporter: 'nats://nats:4222' + enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }} + shard: '[1, 2, 3, 4, 5]' + total-shard: 5 + mongodb-version: "['8.2']" + coverage: '8.2' + node-version: ${{ needs.release-versions.outputs.node-version }} + deno-version: ${{ needs.release-versions.outputs.deno-version }} + lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }} + gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }} + retries: ${{ (github.event_name == 'release' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master') && 2 || 0 }} + db-watcher-disabled: 'false' + secrets: + CR_USER: ${{ secrets.CR_USER }} + CR_PAT: ${{ secrets.CR_PAT }} + QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }} + REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }} + REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + REPORTER_JIRA_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_JIRA_ROCKETCHAT_API_KEY }} + test-federation-matrix: name: 🔨 Test Federation Matrix needs: [checks, build-gh-docker-publish, packages-build, release-versions]