Simplelogin alias generation only generate random words instead the domain name

libs/common/src/vault/abstractions/cipher-form-uri.service.ts

@@ -0,0 +1,11 @@
+export abstract class CipherFormUriService {
+  /**
+   * The current URI value
+   */
+  abstract uri: string;
+
+  /**
+   * Updates the current URI
+   */
+  abstract setUri(uri: string): void;
+}

libs/common/src/vault/services/cipher-form-uri.service.ts

@@ -0,0 +1,30 @@
+// FIXME: Update this file to be type safe and remove this and next line
+// @ts-strict-ignore
+// eslint-disable-next-line import/no-restricted-paths
+import { Injectable } from "@angular/core";
+
+import { CipherFormUriService as CipherFormUriServiceAbstraction } from "../abstractions/cipher-form-uri.service";
+
+@Injectable({
+  providedIn: "root",
+})
+export class CipherFormUriService implements CipherFormUriServiceAbstraction {
+  private _uri: string = "";
+
+  constructor() {}
+
+  /**
+   * Getter for the current URI
+   */
+  get uri(): string {
+    return this._uri;
+  }
+
+  /**
+   * Setter for the URI
+   * @param uri - The new URI to set
+   */
+  setUri(uri: string): void {
+    this._uri = uri;
+  }
+}

libs/tools/generator/components/src/username-generator.component.ts

@@ -23,6 +23,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { IntegrationId } from "@bitwarden/common/tools/integration";
 import { UserId } from "@bitwarden/common/types/guid";
+import { CipherFormUriService } from "@bitwarden/common/vault/services/cipher-form-uri.service";
 import { ToastService, Option } from "@bitwarden/components";
 import {
   AlgorithmInfo,
@@ -66,6 +67,7 @@ export class UsernameGeneratorComponent implements OnInit, OnDestroy {
     private accountService: AccountService,
     private zone: NgZone,
     private formBuilder: FormBuilder,
+    private cipherFormUriService: CipherFormUriService,
   ) {}
 
   /** Binds the component to a specific user's settings. When this input is not provided,
@@ -336,7 +338,11 @@ export class UsernameGeneratorComponent implements OnInit, OnDestroy {
 
   private typeToGenerator$(type: CredentialAlgorithm) {
     const dependencies = {
-      on$: this.generate$,
+      on$: this.generate$.pipe(
+        map(() => ({
+          website: this.cipherFormUriService.uri,
+        })),
+      ),
       userId$: this.userId$,
     };
 

libs/tools/generator/core/src/services/credential-generator.service.ts

@@ -3,7 +3,6 @@
 import {
   BehaviorSubject,
   combineLatest,
-  concat,
   concatMap,
   distinctUntilChanged,
   endWith,
@@ -15,7 +14,6 @@
   Observable,
   ReplaySubject,
   share,
-  skipUntil,
   switchMap,
   takeUntil,
   withLatestFrom,
@@ -123,31 +121,22 @@
     const engine = configuration.engine.create(this.getDependencyProvider());
 
     // stream blocks until all of these values are received
-    const website$ = dependencies?.website$ ?? new BehaviorSubject<string>(null);
-    const request$ = website$.pipe(map((website) => ({ website })));
     const settings$ = this.settings$(configuration, dependencies);
 
-    // if on$ triggers before settings are loaded, trigger as soon
-    // as they become available.
-    let readyOn$: Observable<any> = null;
-    if (dependencies?.on$) {
-      const NO_EMISSIONS = {};
-      const ready$ = combineLatest([settings$, request$]).pipe(
-        first(null, NO_EMISSIONS),
-        filter((value) => value !== NO_EMISSIONS),
-        share(),
-      );
-      readyOn$ = concat(
-        dependencies.on$?.pipe(switchMap(() => ready$)),
-        dependencies.on$.pipe(skipUntil(ready$)),
-      );
-    }
-
-    // generation proper
-    const generate$ = (readyOn$ ?? settings$).pipe(
-      withLatestFrom(request$, settings$),
-      concatMap(([, request, settings]) => engine.generate(request, settings)),
-      takeUntil(anyComplete([request$, settings$])),
+    // Handle the on$ emissions which now include the website data
+    const on$ =
+      dependencies?.on$ ?? new BehaviorSubject<{ website: string | null }>({ website: null });
+    // Ensure that settings are loaded before proceeding
+    const ready$ = combineLatest([settings$, on$]).pipe(first(), share());
+
+    // Generation logic
+    const generate$ = ready$.pipe(
+      withLatestFrom(on$, settings$),
+      concatMap(([, { website }, settings]) => {
+        const request = { website };
+        return engine.generate(request, settings);
+      }),
+      takeUntil(anyComplete([on$, settings$])),
     );
 
     return generate$;

libs/vault/src/cipher-form/components/autofill-options/uri-option.component.ts

@@ -24,6 +24,7 @@ import {
   UriMatchStrategySetting,
 } from "@bitwarden/common/models/domain/domain-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CipherFormUriService } from "@bitwarden/common/vault/services/cipher-form-uri.service";
 import {
   FormFieldModule,
   IconButtonModule,
@@ -135,8 +136,10 @@ export class UriOptionComponent implements ControlValueAccessor {
   constructor(
     private formBuilder: FormBuilder,
     private i18nService: I18nService,
+    private cipherFormUriService: CipherFormUriService,
   ) {
     this.uriForm.valueChanges.pipe(takeUntilDestroyed()).subscribe((value) => {
+      this.cipherFormUriService.setUri(value.uri ?? "");
       this.onChange(value);
     });