From a67aed32337d96bcb1402974dd7dde166a475621 Mon Sep 17 00:00:00 2001
From: John Harrington <84741727+harr1424@users.noreply.github.com>
Date: Fri, 3 Oct 2025 16:38:49 -0700
Subject: [PATCH] review and tidy code changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• remove unused logging methods in import.service.spec.ts
• restore (unused) feature flag support in generator-services.module.ts
• avoid type casting
• clarify doc comments
---
 libs/importer/src/services/import.service.spec.ts   | 13 ++++---------
 .../components/src/generator-services.module.ts     | 11 ++++++++++-
 .../default-credential-generator.service.spec.ts    |  2 +-
 .../default-credential-generator.service.ts         |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts
index 490465131f3..b465a677b22 100644
--- a/libs/importer/src/services/import.service.spec.ts
+++ b/libs/importer/src/services/import.service.spec.ts
@@ -20,7 +20,7 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { KeyService } from "@bitwarden/key-management";
-import { LogProvider } from "@bitwarden/logging";
+import { LogProvider, SemanticLogger } from "@bitwarden/logging";
 
 import { BitwardenPasswordProtectedImporter } from "../importers/bitwarden/bitwarden-password-protected-importer";
 import { Importer } from "../importers/importer";
@@ -45,6 +45,7 @@ describe("ImportService", () => {
   let restrictedItemTypesService: MockProxy<RestrictedItemTypesService>;
   let envService: MockProxy<EnvService>;
   let logProvider: LogProvider;
+  let mockLogger: MockProxy<SemanticLogger>;
 
   beforeEach(() => {
     cipherService = mock<CipherService>();
@@ -61,14 +62,8 @@ describe("ImportService", () => {
     envService.getFeatureFlag$.mockReturnValue(new BehaviorSubject(false));
     envService.getClientType.mockReturnValue(ClientType.Desktop);
 
-    logProvider = jest.fn(() => ({
-      debug: jest.fn(),
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      panic: jest.fn(),
-      child: jest.fn(),
-    })) as any;
+    mockLogger = mock<SemanticLogger>();
+    logProvider = () => mockLogger;
 
     importService = new ImportService(
       cipherService,
diff --git a/libs/tools/generator/components/src/generator-services.module.ts b/libs/tools/generator/components/src/generator-services.module.ts
index 4688caf91dd..9c5db19ba44 100644
--- a/libs/tools/generator/components/src/generator-services.module.ts
+++ b/libs/tools/generator/components/src/generator-services.module.ts
@@ -1,10 +1,13 @@
 import { NgModule } from "@angular/core";
+import { from } from "rxjs";
+import { take } from "rxjs/operators";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
 import { LOG_PROVIDER, SafeInjectionToken } from "@bitwarden/angular/services/injection-tokens";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -126,6 +129,12 @@ const GENERATOR_SERVICE_PROVIDER = new SafeInjectionToken<providers.CredentialGe
 
         // Feature flag for SDK password generators (currently not available)
         // TODO: Add SDK service support when available
+        const featureFlagObs$ = from(
+          configService.getFeatureFlag(FeatureFlag.UseSdkPasswordGenerators),
+        );
+        let featureFlag: boolean = false;
+        featureFlagObs$.pipe(take(1)).subscribe((ff) => (featureFlag = ff));
+
         const metadata = new providers.GeneratorMetadataProvider(
           userStateDeps,
           policy,
@@ -133,7 +142,7 @@ const GENERATOR_SERVICE_PROVIDER = new SafeInjectionToken<providers.CredentialGe
           Object.values(BuiltIn),
         );
 
-        const sdkService: undefined = undefined; // SDK service is not available in this context
+        const sdkService: undefined = featureFlag ? undefined : undefined;
         const profile = new providers.GeneratorProfileProvider(userStateDeps, policy);
 
         const generator: providers.GeneratorDependencyProvider = {
diff --git a/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts
index e44c36a0e71..04ca226b110 100644
--- a/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts
+++ b/libs/tools/generator/core/src/services/default-credential-generator.service.spec.ts
@@ -55,7 +55,7 @@ describe("DefaultCredentialGeneratorService", () => {
     }) as any;
     logProvider = () => mockLogger;
 
-    mockExtension = { settings: jest.fn() } as any;
+    mockExtension = { settings: jest.fn() };
 
     // Use a hard-coded value for mockAccount
     account = {
diff --git a/libs/tools/generator/core/src/services/default-credential-generator.service.ts b/libs/tools/generator/core/src/services/default-credential-generator.service.ts
index cc7c2814415..4a1c98c35e6 100644
--- a/libs/tools/generator/core/src/services/default-credential-generator.service.ts
+++ b/libs/tools/generator/core/src/services/default-credential-generator.service.ts
@@ -43,8 +43,8 @@ const THREE_MINUTES = 3 * 60 * 1000;
 export class DefaultCredentialGeneratorService implements CredentialGeneratorService {
   /** Instantiate the `DefaultCredentialGeneratorService`.
    *  @param provide application services required by the credential generator.
-   *  @param extension extension service for managing forwarder extensions.
-   *  @param log logger factory for creating semantic loggers.
+   *  @param extension service for managing forwarder extensions.
+   *  @param log factory for creating semantic loggers.
    */
   constructor(
     private readonly provide: CredentialGeneratorProviders,