fix build

libs/tools/generator/components/src/generator-services.module.ts

@@ -1,5 +1,4 @@
 import { NgModule } from "@angular/core";
-import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
@@ -11,7 +10,6 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { KeyServiceLegacyEncryptorProvider } from "@bitwarden/common/tools/cryptography/key-service-legacy-encryptor-provider";
 import { LegacyEncryptorProvider } from "@bitwarden/common/tools/cryptography/legacy-encryptor-provider";
@@ -38,7 +36,6 @@ import {
   DefaultCredentialGeneratorService,
 } from "@bitwarden/generator-core";
 import { KeyService } from "@bitwarden/key-management";
-import { BitwardenClient } from "@bitwarden/sdk-internal";
 
 export const RANDOMIZER = new SafeInjectionToken<Randomizer>("Randomizer");
 const GENERATOR_SERVICE_PROVIDER = new SafeInjectionToken<providers.CredentialGeneratorProviders>(
@@ -51,11 +48,6 @@ export const SYSTEM_SERVICE_PROVIDER = new SafeInjectionToken<SystemServiceProvi
   "SystemServices",
 );
 
-async function getSdkClient(sdk: SdkService) {
-  const sdkService: BitwardenClient = await firstValueFrom(sdk.client$);
-  return sdkService;
-}
-
 /** Shared module containing generator component dependencies */
 @NgModule({
   imports: [JslibModule],
@@ -153,19 +145,13 @@ async function getSdkClient(sdk: SdkService) {
           Object.values(BuiltIn),
         );
 
-        let sdkService;
-        try {
-          sdkService = await getSdkClient(system.sdk);
-        } catch (err) {
-          fail(err);
-        }
         const profile = new providers.GeneratorProfileProvider(userStateDeps, system.policy);
 
         const generator: providers.GeneratorDependencyProvider = {
           randomizer: random,
           client: new RestClient(api, i18n),
           i18nService: i18n,
-          sdk: sdkService,
+          sdk: system.sdk,
           now: Date.now,
         };
 

libs/tools/generator/core/src/engine/sdk-password-randomizer.ts

@@ -1,3 +1,6 @@
+import { firstValueFrom } from "rxjs";
+
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import {
   BitwardenClient,
   PassphraseGeneratorRequest,
@@ -20,11 +23,11 @@ export class SdkPasswordRandomizer
     CredentialGenerator<PasswordGenerationOptions>
 {
   /** Instantiates the password randomizer
-   *  @param client access to SDK client to call upon password/passphrase generation
+   *  @param service access to SDK client to call upon password/passphrase generation
    *  @param currentTime gets the current datetime in epoch time
    */
   constructor(
-    private client: BitwardenClient,
+    private service: SdkService,
     private currentTime: () => number,
   ) {}
 
@@ -40,8 +43,9 @@ export class SdkPasswordRandomizer
     request: GenerateRequest,
     settings: PasswordGenerationOptions | PassphraseGenerationOptions,
   ) {
+    const sdk: BitwardenClient = await firstValueFrom(this.service.client$);
     if (isPasswordGenerationOptions(settings)) {
-      const password = await this.client.generator().password(convertPasswordRequest(settings));
+      const password = await sdk.generator().password(convertPasswordRequest(settings));
 
       return new GeneratedCredential(
         password,
@@ -51,9 +55,7 @@ export class SdkPasswordRandomizer
         request.website,
       );
     } else if (isPassphraseGenerationOptions(settings)) {
-      const passphrase = await this.client
-        .generator()
-        .passphrase(convertPassphraseRequest(settings));
+      const passphrase = await sdk.generator().passphrase(convertPassphraseRequest(settings));
 
       return new GeneratedCredential(
         passphrase,

libs/tools/generator/core/src/providers/generator-dependency-provider.ts

@@ -1,6 +1,6 @@
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { RestClient } from "@bitwarden/common/tools/integration/rpc";
-import { BitwardenClient } from "@bitwarden/sdk-internal";
 
 import { Randomizer } from "../abstractions";
 
@@ -10,6 +10,6 @@ export type GeneratorDependencyProvider = {
   // FIXME: introduce `I18nKeyOrLiteral` into forwarder
   //        structures and remove this dependency
   i18nService: I18nService;
-  sdk: BitwardenClient;
+  sdk: SdkService;
   now: () => number;
 };