From 73e5aab7e473ff63b063c435b8a84141df372ecc Mon Sep 17 00:00:00 2001 From: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com> Date: Fri, 20 Jun 2025 09:40:34 -0400 Subject: [PATCH 1/5] Changing the text for creating a new access token from "add access token" to "create access token" (#15078) --- apps/web/src/locales/en/messages.json | 4 ++-- .../service-accounts/access/access-list.component.html | 2 +- .../access/dialogs/access-token-create-dialog.component.html | 4 ++-- .../access/dialogs/access-token-dialog.component.html | 2 +- .../service-accounts/service-account.component.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 6785c20d8f4..7ca482755a7 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -7702,8 +7702,8 @@ "message": "Access tokens", "description": "Title for the section displaying access tokens." }, - "newAccessToken": { - "message": "New access token", + "createAccessToken": { + "message": "Create access token", "description": "Button label for creating a new access token." }, "expires": { diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html index 0c5a49cd35b..fbb0dd8888a 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html @@ -13,7 +13,7 @@ (click)="newAccessTokenEvent.emit()" > - {{ "newAccessToken" | i18n }} + {{ "createAccessToken" | i18n }} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html index d843887a392..65de06617a9 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html @@ -1,7 +1,7 @@
- {{ "newAccessToken" | i18n }} + {{ "createAccessToken" | i18n }} {{ data.serviceAccountView.name }} @@ -21,7 +21,7 @@ From 8a8d02b7dbcf51c580e2525ec8bc337293313585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= Date: Fri, 20 Jun 2025 09:44:38 -0400 Subject: [PATCH 2/5] encapsulate kludge property to fix invalid credential type error (#15225) --- libs/common/src/tools/state/user-state-subject.ts | 8 ++++++++ .../core/src/providers/generator-profile-provider.spec.ts | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/common/src/tools/state/user-state-subject.ts b/libs/common/src/tools/state/user-state-subject.ts index 118b0069c84..2c80c9ad135 100644 --- a/libs/common/src/tools/state/user-state-subject.ts +++ b/libs/common/src/tools/state/user-state-subject.ts @@ -161,6 +161,14 @@ export class UserStateSubject< this.outputSubscription = userState$ .pipe( switchMap((userState) => userState.state$), + map((stored) => { + if (stored && typeof stored === "object" && ALWAYS_UPDATE_KLUDGE in stored) { + // related: ALWAYS_UPDATE_KLUDGE FIXME + delete stored[ALWAYS_UPDATE_KLUDGE]; + } + + return stored; + }), this.declassify(encryptor$), this.adjust(combineLatestWith(constraints$)), takeUntil(anyComplete(account$)), diff --git a/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts b/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts index 1053834eca7..32d99aa8a1f 100644 --- a/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts +++ b/libs/tools/generator/core/src/providers/generator-profile-provider.spec.ts @@ -172,7 +172,7 @@ describe("GeneratorProfileProvider", () => { await awaitAsync(); const result = await firstValueFrom(stateProvider.getUserState$(SettingsKey, SomeUser)); - expect(result).toEqual({ foo: "next value" }); + expect(result).toMatchObject({ foo: "next value" }); }); it("waits for the user to become available", async () => { From 750cfeea721fdd85d60c6ba01f0036b9ba1e48aa Mon Sep 17 00:00:00 2001 From: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com> Date: Fri, 20 Jun 2025 09:50:57 -0400 Subject: [PATCH 3/5] SM-1122 Removing H1 on service account event logs, so that there is consistency in the UI (#15085) --- .../event-logs/service-accounts-events.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html index 458320a8a2a..a895ab058ec 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html @@ -1,5 +1,4 @@
-

{{ "eventLogs" | i18n }}

{{ "from" | i18n }} From a4ef61e1fc8182528f377ffb20de83be1f29eb14 Mon Sep 17 00:00:00 2001 From: Andy Pixley <3723676+pixman20@users.noreply.github.com> Date: Fri, 20 Jun 2025 12:34:18 -0400 Subject: [PATCH 4/5] [BRE-848] Adding Workflow Permissions (#15250) --- .github/workflows/auto-branch-updater.yml | 2 ++ .github/workflows/auto-reply-discussions.yml | 3 +++ .github/workflows/enforce-labels.yml | 3 +++ .github/workflows/lint.yml | 3 +++ .github/workflows/locales-lint.yml | 3 +++ .github/workflows/release-browser.yml | 6 ++++++ .github/workflows/release-web.yml | 4 ++++ .github/workflows/stale-bot.yml | 5 +++++ 8 files changed, 29 insertions(+) diff --git a/.github/workflows/auto-branch-updater.yml b/.github/workflows/auto-branch-updater.yml index dc4a43fc34e..3f67388fd0c 100644 --- a/.github/workflows/auto-branch-updater.yml +++ b/.github/workflows/auto-branch-updater.yml @@ -22,6 +22,8 @@ jobs: env: _BOT_EMAIL: 106330231+bitwarden-devops-bot@users.noreply.github.com _BOT_NAME: bitwarden-devops-bot + permissions: + contents: write steps: - name: Setup id: setup diff --git a/.github/workflows/auto-reply-discussions.yml b/.github/workflows/auto-reply-discussions.yml index 8becc7471c5..83970ab3619 100644 --- a/.github/workflows/auto-reply-discussions.yml +++ b/.github/workflows/auto-reply-discussions.yml @@ -8,6 +8,9 @@ jobs: reply: name: Auto-reply runs-on: ubuntu-22.04 + permissions: + discussions: write + contents: read steps: - name: Get discussion label and template name diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml index 40ddfe7739f..12a771fd3c0 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.github/workflows/enforce-labels.yml @@ -4,6 +4,9 @@ on: workflow_call: pull_request: types: [labeled, unlabeled, opened, edited, synchronize] +permissions: + contents: read + pull-requests: read jobs: enforce-label: name: EnforceLabel diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4fbef027c7c..4246d623f04 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,6 +22,9 @@ defaults: run: shell: bash +permissions: + contents: read + jobs: lint: name: Lint diff --git a/.github/workflows/locales-lint.yml b/.github/workflows/locales-lint.yml index 8c9447ea50f..0c8148d4c28 100644 --- a/.github/workflows/locales-lint.yml +++ b/.github/workflows/locales-lint.yml @@ -8,6 +8,9 @@ on: paths: - '**/messages.json' +permissions: + contents: read + jobs: lint: name: Lint diff --git a/.github/workflows/release-browser.yml b/.github/workflows/release-browser.yml index 498f8748959..ac79287f84d 100644 --- a/.github/workflows/release-browser.yml +++ b/.github/workflows/release-browser.yml @@ -22,6 +22,8 @@ jobs: setup: name: Setup runs-on: ubuntu-22.04 + permissions: + contents: read outputs: release_version: ${{ steps.version.outputs.version }} steps: @@ -53,6 +55,8 @@ jobs: name: Locales Test runs-on: ubuntu-22.04 needs: setup + permissions: + contents: read steps: - name: Checkout repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -89,6 +93,8 @@ jobs: needs: - setup - locales-test + permissions: + contents: write steps: - name: Download latest Release build artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} diff --git a/.github/workflows/release-web.yml b/.github/workflows/release-web.yml index 0301b814796..5a3c29d29fc 100644 --- a/.github/workflows/release-web.yml +++ b/.github/workflows/release-web.yml @@ -18,6 +18,8 @@ jobs: setup: name: Setup runs-on: ubuntu-22.04 + permissions: + contents: read outputs: release_version: ${{ steps.version.outputs.version }} tag_version: ${{ steps.version.outputs.tag }} @@ -50,6 +52,8 @@ jobs: runs-on: ubuntu-22.04 needs: - setup + permissions: + contents: write steps: - name: Download latest build artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml index abb292f53f3..13acde2b0fc 100644 --- a/.github/workflows/stale-bot.yml +++ b/.github/workflows/stale-bot.yml @@ -8,6 +8,11 @@ jobs: stale: name: 'Check for stale issues and PRs' runs-on: ubuntu-22.04 + permissions: + actions: write + contents: read + issues: write + pull-requests: write steps: - name: 'Run stale action' uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0 From 9e1ab2864c972524bab4be03c4766cf997b5a616 Mon Sep 17 00:00:00 2001 From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com> Date: Fri, 20 Jun 2025 15:57:33 -0500 Subject: [PATCH 5/5] avoid aria-label for screen reader only text (#15119) --- .../src/nudge-generator-spotlight.component.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/tools/generator/components/src/nudge-generator-spotlight.component.html b/libs/tools/generator/components/src/nudge-generator-spotlight.component.html index b06db8b83e1..581825936be 100644 --- a/libs/tools/generator/components/src/nudge-generator-spotlight.component.html +++ b/libs/tools/generator/components/src/nudge-generator-spotlight.component.html @@ -3,11 +3,10 @@ [title]="'generatorNudgeTitle' | i18n" (onDismiss)="dismissGeneratorSpotlight(NudgeType.GeneratorNudgeStatus)" > -

+

+ + {{ "generatorNudgeBodyAria" | i18n }} +