[PM-23306] "Show cards in autofill" is defaulting to on when the setting is enabled (#15534)

* disable card autofill

* Fixed dependency issues

libs/angular/src/services/jslib-services.module.ts

@@ -1319,7 +1319,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: AutofillSettingsServiceAbstraction,
     useClass: AutofillSettingsService,
-    deps: [StateProvider, PolicyServiceAbstraction, AccountService],
+    deps: [StateProvider, PolicyServiceAbstraction, AccountService, RestrictedItemTypesService],
   }),
   safeProvider({
     provide: BadgeSettingsServiceAbstraction,
@@ -1334,7 +1334,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: VaultSettingsServiceAbstraction,
     useClass: VaultSettingsService,
-    deps: [StateProvider],
+    deps: [StateProvider, RestrictedItemTypesService],
   }),
   safeProvider({
     provide: MigrationRunner,

libs/common/src/autofill/services/autofill-settings.service.ts

@@ -1,6 +1,9 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { map, Observable, switchMap } from "rxjs";
+import { combineLatest, map, Observable, startWith, switchMap } from "rxjs";
+
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 
 import { PolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "../../admin-console/enums";
@@ -155,6 +158,7 @@ export class AutofillSettingsService implements AutofillSettingsServiceAbstracti
     private stateProvider: StateProvider,
     private policyService: PolicyService,
     private accountService: AccountService,
+    private restrictedItemTypesService: RestrictedItemTypesService,
   ) {
     this.autofillOnPageLoadState = this.stateProvider.getActive(AUTOFILL_ON_PAGE_LOAD);
     this.autofillOnPageLoad$ = this.autofillOnPageLoadState.state$.pipe(map((x) => x ?? false));
@@ -199,7 +203,16 @@ export class AutofillSettingsService implements AutofillSettingsServiceAbstracti
     );
 
     this.showInlineMenuCardsState = this.stateProvider.getActive(SHOW_INLINE_MENU_CARDS);
-    this.showInlineMenuCards$ = this.showInlineMenuCardsState.state$.pipe(map((x) => x ?? true));
+    this.showInlineMenuCards$ = combineLatest([
+      this.showInlineMenuCardsState.state$.pipe(map((x) => x ?? true)),
+      this.restrictedItemTypesService.restricted$.pipe(startWith([])),
+    ]).pipe(
+      map(
+        ([enabled, restrictions]) =>
+          // If enabled, show cards inline menu unless card type is restricted
+          enabled && !restrictions.some((r) => r.cipherType === CipherType.Card),
+      ),
+    );
 
     this.enableContextMenuState = this.stateProvider.getGlobal(ENABLE_CONTEXT_MENU);
     this.enableContextMenu$ = this.enableContextMenuState.state$.pipe(map((x) => x ?? true));

libs/common/src/vault/services/vault-settings/vault-settings.service.ts

@@ -1,13 +1,15 @@
-import { Observable, map, shareReplay } from "rxjs";
+import { Observable, combineLatest, map, shareReplay, startWith } from "rxjs";
 
 import { ActiveUserState, GlobalState, StateProvider } from "../../../platform/state";
 import { VaultSettingsService as VaultSettingsServiceAbstraction } from "../../abstractions/vault-settings/vault-settings.service";
+import { CipherType } from "../../enums";
 import {
   SHOW_CARDS_CURRENT_TAB,
   SHOW_IDENTITIES_CURRENT_TAB,
   USER_ENABLE_PASSKEYS,
   CLICK_ITEMS_AUTOFILL_VAULT_VIEW,
 } from "../key-state/vault-settings.state";
+import { RestrictedItemTypesService } from "../restricted-item-types.service";
 
 /**
  * {@link VaultSettingsServiceAbstraction}
@@ -27,8 +29,15 @@ export class VaultSettingsService implements VaultSettingsServiceAbstraction {
   /**
    * {@link VaultSettingsServiceAbstraction.showCardsCurrentTab$}
    */
-  readonly showCardsCurrentTab$: Observable<boolean> = this.showCardsCurrentTabState.state$.pipe(
-    map((x) => x ?? true),
+  readonly showCardsCurrentTab$: Observable<boolean> = combineLatest([
+    this.showCardsCurrentTabState.state$.pipe(map((x) => x ?? true)),
+    this.restrictedItemTypesService.restricted$.pipe(startWith([])),
+  ]).pipe(
+    map(
+      ([enabled, restrictions]) =>
+        // If enabled, show cards tab unless card type is restricted
+        enabled && !restrictions.some((r) => r.cipherType === CipherType.Card),
+    ),
   );
 
   private showIdentitiesCurrentTabState: ActiveUserState<boolean> = this.stateProvider.getActive(
@@ -51,7 +60,10 @@ export class VaultSettingsService implements VaultSettingsServiceAbstraction {
       shareReplay({ bufferSize: 1, refCount: false }),
     );
 
-  constructor(private stateProvider: StateProvider) {}
+  constructor(
+    private stateProvider: StateProvider,
+    private restrictedItemTypesService: RestrictedItemTypesService,
+  ) {}
 
   /**
    * {@link VaultSettingsServiceAbstraction.setShowCardsCurrentTab}