Merge branch 'main' into SM-1273-AddAdditionalSecretEventLogs

.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

.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

.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

.github/workflows/lint.yml

@@ -22,6 +22,9 @@ defaults:
   run:
     shell: bash
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     name: Lint

.github/workflows/locales-lint.yml

@@ -8,6 +8,9 @@ on:
     paths:
       - '**/messages.json'
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     name: Lint

.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' }}

.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' }}

.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

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": {

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html

@@ -13,7 +13,7 @@
     (click)="newAccessTokenEvent.emit()"
   >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
-    {{ "newAccessToken" | i18n }}
+    {{ "createAccessToken" | i18n }}
   </button>
 </bit-no-items>
 

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html

@@ -1,7 +1,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog dialogSize="default">
     <ng-container bitDialogTitle>
-      <span>{{ "newAccessToken" | i18n }}</span>
+      <span>{{ "createAccessToken" | i18n }}</span>
       <span class="tw-text-sm tw-normal-case tw-text-muted">
         {{ data.serviceAccountView.name }}
       </span>
@@ -21,7 +21,7 @@
 
     <ng-container bitDialogFooter>
       <button class="tw-normal-case" type="submit" bitButton buttonType="primary" bitFormButton>
-        {{ "newAccessToken" | i18n }}
+        {{ "createAccessToken" | i18n }}
       </button>
       <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html

@@ -1,4 +1,4 @@
-<bit-dialog dialogSize="default" [title]="'newAccessToken' | i18n" [subtitle]="data.subTitle">
+<bit-dialog dialogSize="default" [title]="'createAccessToken' | i18n" [subtitle]="data.subTitle">
   <div bitDialogContent>
     <bit-callout type="info" [title]="'accessTokenCallOutTitle' | i18n">
       {{ "downloadAccessToken" | i18n }}<br />

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html

@@ -1,5 +1,4 @@
 <div class="tw-mb-4">
-  <h1>{{ "eventLogs" | i18n }}</h1>
   <div class="tw-mt-4 tw-flex tw-items-center" [formGroup]="eventsForm">
     <bit-form-field>
       <bit-label>{{ "from" | i18n }}</bit-label>

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html

@@ -39,7 +39,7 @@
     (click)="openNewAccessTokenDialog()"
   >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
-    {{ "newAccessToken" | i18n }}
+    {{ "createAccessToken" | i18n }}
   </button>
 </app-header>
 <router-outlet></router-outlet>

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$)),

libs/tools/generator/components/src/nudge-generator-spotlight.component.html

@@ -3,11 +3,10 @@
     [title]="'generatorNudgeTitle' | i18n"
     (onDismiss)="dismissGeneratorSpotlight(NudgeType.GeneratorNudgeStatus)"
   >
-    <p
-      class="tw-text-main tw-mb-0"
-      bitTypography="body2"
-      [attr.aria-label]="'generatorNudgeBodyAria' | i18n"
-    >
+    <p class="tw-text-main tw-mb-0" bitTypography="body2">
+      <span class="tw-sr-only">
+        {{ "generatorNudgeBodyAria" | i18n }}
+      </span>
       <span aria-hidden="true">
         {{ "generatorNudgeBodyOne" | i18n }} <i class="bwi bwi-generate"></i>
         {{ "generatorNudgeBodyTwo" | i18n }}

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 () => {