@graffiti-garden/implementation-decentralized 0.1.5 → 0.1.7

package/src/3-protocol/1-sessions.ts

@@ -41,6 +41,7 @@ export const DID_SERVICE_ID_GRAFFITI_SHARED_INBOX_PREFIX =
 
 export class Sessions {
   sessionEvents: Graffiti["sessionEvents"] = new EventTarget();
+  initialAuthorizationNavigation: "assign" | "replace" = "assign";
 
   constructor(
     protected readonly services: {
@@ -87,8 +88,9 @@ export class Sessions {
           const url = new URL(window.location.toString());
           url.searchParams.delete("actor");
           window.history.replaceState({}, "", url.toString());
-          // Complete the login
-          loginPromise = this.login(actor);
+          // The original app entry was kept when opening account creation or
+          // recovery, so OAuth reuses this callback entry.
+          loginPromise = this.login(actor, "replace");
         } catch (error) {
           console.error("Error decoding actor:", error);
         }
@@ -124,9 +126,13 @@ export class Sessions {
   protected inProgressLogout: infer_<typeof InProgressSchema> | undefined =
     undefined;
 
-  async login(actor: string) {
+  async login(
+    actor: string,
+    initialAuthorizationNavigation: "assign" | "replace" =
+      this.initialAuthorizationNavigation,
+  ) {
     try {
-      await this.login_(actor);
+      await this.login_(actor, initialAuthorizationNavigation);
     } catch (e) {
       const loginEvent: GraffitiLoginEvent = new CustomEvent("login", {
         detail: {
@@ -137,7 +143,10 @@ export class Sessions {
       this.sessionEvents.dispatchEvent(loginEvent);
     }
   }
-  protected async login_(actor: string) {
+  protected async login_(
+    actor: string,
+    initialAuthorizationNavigation: "assign" | "replace",
+  ) {
     // First look to see if we're already logged in
     const existingSession = this.loggedInSessions.find(
       (session) => session.actor === actor,
@@ -257,6 +266,7 @@ export class Sessions {
       firstAuthorizationEndpoint,
       actor,
       firstServices.map((s) => s.endpoint),
+      initialAuthorizationNavigation,
     );
   }
 
@@ -367,6 +377,7 @@ export class Sessions {
         authorizationEndpoint,
         actor,
         services.map((s) => s.endpoint),
+        "replace",
       );
     }
   }

package/src/3-protocol/4-graffiti.ts

@@ -131,6 +131,8 @@ const MESSAGE_LABEL_INVALID = 3;
 export interface GraffitiDecentralizedOptions {
   identityCreatorEndpoint?: string;
   defaultInboxEndpoints?: string[];
+  /** For login hosts that already have the application in the preceding history entry. */
+  replaceInitialLoginHistoryEntry?: boolean;
 }
 
 const CONCURRENCY = 128;
@@ -180,7 +182,13 @@ export class GraffitiDecentralized implements Graffiti {
 
   protected readonly defaultInboxEndpoints: string[];
   protected readonly identityCreatorEndpoint: string;
+  protected readonly replaceInitialLoginHistoryEntry: boolean;
   constructor(options?: GraffitiDecentralizedOptions) {
+    this.replaceInitialLoginHistoryEntry =
+      options?.replaceInitialLoginHistoryEntry ?? false;
+    if (this.replaceInitialLoginHistoryEntry) {
+      this.sessions.initialAuthorizationNavigation = "replace";
+    }
     this.defaultInboxEndpoints = options?.defaultInboxEndpoints ?? [
       "https://graffiti.actor/i/shared",
     ];
@@ -358,9 +366,24 @@ export class GraffitiDecentralized implements Graffiti {
         "redirect_uri",
         encodeURIComponent(window.location.toString()),
       );
-      template
-        ?.querySelector("#graffiti-login-new")
-        ?.setAttribute("href", createUrl.toString());
+      const createLink = template?.querySelector<HTMLAnchorElement>(
+        "#graffiti-login-new",
+      );
+      createLink?.setAttribute("href", createUrl.toString());
+      if (this.replaceInitialLoginHistoryEntry) {
+        createLink?.addEventListener("click", (event) => {
+          if (
+            event.defaultPrevented ||
+            event.button !== 0 ||
+            event.metaKey ||
+            event.ctrlKey ||
+            event.shiftKey ||
+            event.altKey
+          ) return;
+          event.preventDefault();
+          window.location.replace(createUrl.toString());
+        });
+      }
 
       await this.modal?.open();
     } else {
@@ -425,7 +448,11 @@ export class GraffitiDecentralized implements Graffiti {
 
           const url = new URL("/forgot-handle", origin);
           url.searchParams.set("redirect_uri", window.location.toString());
-          window.location.assign(url.toString());
+          if (this.replaceInitialLoginHistoryEntry) {
+            window.location.replace(url.toString());
+          } else {
+            window.location.assign(url.toString());
+          }
         } catch {
           alert("Enter a valid provider domain.");
         }