Refactor login modal provider handling

This commit is contained in:
thePR0M3TH3AN committed 2025-10-21 14:19:30 -04:00
1 parent cac35cdf1a
commit a86c86f695
4 files changed
+794 -97

No files matched your search

+22 -8
View File
@@ -50,14 +50,28 @@
<!-- Simple horizontal rule -->
<div class="my-2 border-t border-border/60"></div>
<!-- Existing login buttons -->
<button
id="loginNIP07"
class="btn w-full"
type="button"
>
Login with Extension (NIP-07)
</button>
<!-- Login provider buttons are rendered dynamically -->
<div data-login-providers class="space-y-3"></div>
<template data-login-provider-template>
<button
class="btn w-full text-left"
type="button"
data-provider-button
>
<span class="flex flex-col items-start gap-2">
<span data-provider-label class="text-base font-semibold"></span>
<span data-provider-description class="text-sm text-text-muted"></span>
<span
data-provider-status
class="text-sm text-text-muted hidden"
></span>
<span
data-provider-capabilities
class="flex flex-wrap gap-2"
></span>
</span>
</button>
</template>
<button
id="loginNSEC"
class="btn-ghost w-full"
+112 -89
View File
@@ -89,6 +89,7 @@ import {
import { VideoListView } from "./ui/views/VideoListView.js";
import MoreMenuController from "./ui/moreMenuController.js";
import ProfileModalController from "./ui/profileModalController.js";
import LoginModalController from "./ui/loginModalController.js";
import ZapController from "./ui/zapController.js";
import { MediaLoader } from "./utils/mediaLoader.js";
import { pointerArrayToKey } from "./utils/pointer.js";
@@ -408,14 +409,104 @@ class Application {
})
);
// Profile and login modal controller state
this.profileController = null;
this.loginModalController = null;
this.currentUserNpub = null;
try {
const loginModalElement = document.getElementById("loginModal");
if (loginModalElement) {
const closeLoginModal = () => {
if (closeStaticModal("loginModal")) {
setGlobalModalState("login", false);
}
};
this.loginModalController = new LoginModalController({
modalElement: loginModalElement,
providers: authProviders,
services: {
authService: this.authService,
},
callbacks: {
onProviderSelected: (providerId) => {
devLogger.log(
`[LoginModal] Provider selected: ${providerId}.`,
);
},
onLoginSuccess: async ({ result }) => {
if (!result || typeof result !== "object") {
return;
}
const { pubkey, detail } = result;
devLogger.log(
"[LoginModal] Login result returned pubkey:",
pubkey,
);
if (
pubkey &&
detail &&
typeof detail === "object" &&
detail.__handled !== true
) {
try {
await this.handleAuthLogin(detail);
} catch (error) {
devLogger.error(
"[LoginModal] handleAuthLogin fallback failed:",
error,
);
}
}
},
onLoginError: async ({ message, error, provider }) => {
const fallbackMessage =
typeof message === "string" && message.trim()
? message.trim()
: this.describeLoginError(
error,
provider?.errorMessage ||
"Failed to login. Please try again.",
);
userLogger.warn(
provider && provider.id
? `[LoginModal] Login failed for provider ${provider.id}.`
: "[LoginModal] Login failed for provider.",
);
this.showError(fallbackMessage);
},
},
helpers: {
closeModal: closeLoginModal,
describeLoginError: (error, fallbackMessage) =>
this.describeLoginError(
error,
typeof fallbackMessage === "string" && fallbackMessage.trim()
? fallbackMessage.trim()
: "Failed to login. Please try again.",
),
},
});
} else {
devLogger.warn(
"[Application] Login modal controller disabled: modal container not found.",
);
}
} catch (error) {
devLogger.error(
"[Application] Failed to initialize login modal controller:",
error,
);
}
// Optional: a "profile" button or avatar (if used)
this.profileButton = document.getElementById("profileButton") || null;
this.profileAvatar = document.getElementById("profileAvatar") || null;
// Profile modal controller state
this.profileController = null;
this.currentUserNpub = null;
// Upload modal component
this.uploadButton = document.getElementById("uploadButton") || null;
const uploadModalEvents = new EventTarget();
@@ -2301,89 +2392,7 @@ class Application {
});
}
// 6) NIP-07 button inside the login modal => call the extension & login
const nip07Button = document.getElementById("loginNIP07");
if (nip07Button) {
const originalLabel = nip07Button.textContent;
let slowExtensionTimer = null;
const slowExtensionDelayMs = 8_000;
const clearSlowExtensionTimer = () => {
if (slowExtensionTimer) {
clearTimeout(slowExtensionTimer);
slowExtensionTimer = null;
}
};
const setLoadingState = (isLoading) => {
if (isLoading) {
nip07Button.disabled = true;
nip07Button.dataset.state = "loading";
nip07Button.setAttribute("aria-busy", "true");
nip07Button.textContent = "Connecting to NIP-07 extension...";
clearSlowExtensionTimer();
slowExtensionTimer = window.setTimeout(() => {
if (nip07Button.dataset.state === "loading") {
nip07Button.textContent = "Waiting for the extension prompt…";
}
}, slowExtensionDelayMs);
} else {
nip07Button.disabled = false;
delete nip07Button.dataset.state;
nip07Button.setAttribute("aria-busy", "false");
clearSlowExtensionTimer();
nip07Button.textContent = originalLabel;
}
};
nip07Button.addEventListener("click", async () => {
if (nip07Button.dataset.state === "loading") {
return;
}
setLoadingState(true);
devLogger.log(
"[app.js] loginNIP07 clicked! Attempting extension login..."
);
try {
const { pubkey, detail } = await this.authService.requestLogin();
devLogger.log("[NIP-07] login returned pubkey:", pubkey);
if (pubkey) {
if (
detail &&
typeof detail === "object" &&
detail.__handled !== true
) {
try {
await this.handleAuthLogin(detail);
} catch (error) {
devLogger.error(
"[NIP-07] handleAuthLogin fallback failed:",
error,
);
}
}
if (closeStaticModal("loginModal")) {
setGlobalModalState("login", false);
}
}
} catch (err) {
devLogger.error("[NIP-07 login error]", err);
const message = this.describeLoginError(
err,
"Failed to login with NIP-07. Please try again.",
);
this.showError(message);
} finally {
setLoadingState(false);
}
});
}
// 7) Cleanup on page unload
// 6) Cleanup on page unload
window.addEventListener("beforeunload", () => {
this.flushWatchHistory("session-end", "beforeunload").catch((error) => {
devLogger.warn("[beforeunload] Watch history flush failed:", error);
@@ -2406,13 +2415,13 @@ class Application {
}
});
// 8) Handle back/forward navigation => hide video modal
// 7) Handle back/forward navigation => hide video modal
window.addEventListener("popstate", async () => {
devLogger.log("[popstate] user navigated back/forward; cleaning modal...");
await this.hideModal();
});
// 9) Event delegation for the “Application Form” button inside the login modal
// 8) Event delegation for the “Application Form” button inside the login modal
document.addEventListener("click", (event) => {
if (event.target && event.target.id === "openApplicationModal") {
// Hide the login modal
@@ -8299,6 +8308,20 @@ class Application {
this.profileController = null;
}
if (this.loginModalController) {
if (typeof this.loginModalController.destroy === "function") {
try {
this.loginModalController.destroy();
} catch (error) {
devLogger.warn(
"[Application] Failed to destroy login modal controller:",
error,
);
}
}
this.loginModalController = null;
}
this.videoList = null;
}
+29
View File
@@ -1,4 +1,27 @@
const PROVIDER_ID = "nip07";
const PROVIDER_LABEL = "Login with Extension";
const PROVIDER_DESCRIPTION =
"Use a NIP-07 compatible browser extension to authenticate.";
const PROVIDER_CAPABILITIES = Object.freeze([
Object.freeze({
id: "signing",
label: "Signs Nostr events",
variant: "info",
}),
Object.freeze({
id: "session",
label: "Loads your public key",
variant: "neutral",
}),
]);
const PROVIDER_BUTTON = Object.freeze({
variant: "primary",
});
const PROVIDER_MESSAGES = Object.freeze({
loading: "Connecting to your extension…",
slow: "Waiting for the extension prompt…",
error: "Failed to login with your browser extension. Please try again.",
});
function normalizePubkey(result) {
if (typeof result === "string") {
@@ -22,6 +45,12 @@ function normalizePubkey(result) {
export default {
id: PROVIDER_ID,
label: PROVIDER_LABEL,
description: PROVIDER_DESCRIPTION,
capabilities: PROVIDER_CAPABILITIES,
button: PROVIDER_BUTTON,
messages: PROVIDER_MESSAGES,
errorMessage: PROVIDER_MESSAGES.error,
async login({ nostrClient, options } = {}) {
if (!nostrClient || typeof nostrClient.login !== "function") {
const error = new Error("Nostr login is not available.");
+631
View File
@@ -0,0 +1,631 @@
import { devLogger, userLogger } from "../utils/logger.js";
const noop = () => {};
const SLOW_PROVIDER_DELAY_MS = 8_000;
function toArray(input) {
if (!input) {
return [];
}
if (Array.isArray(input)) {
return input;
}
if (typeof input === "object") {
return Object.values(input);
}
return [];
}
function normalizeProvider(provider, fallbackId, index) {
if (!provider || typeof provider !== "object") {
return null;
}
if (typeof provider.login !== "function") {
return null;
}
const rawId =
typeof provider.id === "string" && provider.id.trim()
? provider.id.trim()
: typeof fallbackId === "string" && fallbackId
? `${fallbackId}-${index}`
: `provider-${index}`;
const label =
typeof provider.label === "string" && provider.label.trim()
? provider.label.trim()
: rawId;
const description =
typeof provider.description === "string" && provider.description.trim()
? provider.description.trim()
: "";
const button = provider.button && typeof provider.button === "object"
? provider.button
: {};
const messages = provider.messages && typeof provider.messages === "object"
? provider.messages
: {};
const capabilities = Array.isArray(provider.capabilities)
? provider.capabilities.filter((capability) =>
capability && typeof capability === "object" && capability.label,
)
: [];
const orderValue = Number.parseInt(provider.order, 10);
const order = Number.isFinite(orderValue) ? orderValue : Number.MAX_SAFE_INTEGER;
return {
id: rawId,
source: provider,
label,
description,
button,
messages,
capabilities,
order,
disabled: provider.disabled === true || provider.available === false,
errorMessage:
typeof provider.errorMessage === "string" && provider.errorMessage.trim()
? provider.errorMessage.trim()
: typeof messages.error === "string" && messages.error.trim()
? messages.error.trim()
: "Failed to login. Please try again.",
};
}
function sortProviders(providers) {
return providers.sort((a, b) => {
if (a.order !== b.order) {
return a.order - b.order;
}
return a.label.localeCompare(b.label);
});
}
function safeInvoke(callback, payload) {
if (typeof callback !== "function") {
return undefined;
}
try {
return callback(payload);
} catch (error) {
devLogger.warn("[LoginModalController] Callback threw:", error);
return undefined;
}
}
async function safeInvokeAsync(callback, payload) {
if (typeof callback !== "function") {
return;
}
try {
await callback(payload);
} catch (error) {
devLogger.warn("[LoginModalController] Async callback threw:", error);
}
}
function resolveDocument(candidate) {
if (candidate && typeof candidate === "object" && candidate.nodeType === 9) {
return candidate;
}
if (typeof document !== "undefined" && document?.nodeType === 9) {
return document;
}
return null;
}
function resolveWindow(doc) {
if (doc && typeof doc.defaultView !== "undefined") {
return doc.defaultView;
}
if (typeof window !== "undefined") {
return window;
}
return null;
}
function resolveButtonVariantClasses(variant, className) {
const classes = new Set(["w-full", "text-left"]);
if (typeof className === "string" && className.trim()) {
className
.trim()
.split(/\s+/)
.forEach((token) => {
if (token) {
classes.add(token);
}
});
}
switch (variant) {
case "ghost":
classes.add("btn-ghost");
break;
case "outline":
classes.add("btn-outline");
break;
case "link":
classes.add("btn-link");
break;
default:
classes.add("btn");
break;
}
return Array.from(classes).join(" ");
}
export default class LoginModalController {
constructor({
modalElement,
providers,
services = {},
callbacks = {},
helpers = {},
document: providedDocument,
} = {}) {
this.modalElement =
modalElement instanceof HTMLElement ? modalElement : null;
this.document =
resolveDocument(providedDocument || this.modalElement?.ownerDocument) || null;
this.window = resolveWindow(this.document);
const normalizedProviders = sortProviders(
toArray(providers).reduce((accumulator, provider, index) => {
const normalized = normalizeProvider(provider, "provider", index);
if (normalized) {
accumulator.push(normalized);
}
return accumulator;
}, []),
);
this.providers = normalizedProviders;
this.services = {
authService:
services.authService && typeof services.authService === "object"
? services.authService
: null,
};
this.callbacks = {
onProviderSelected:
typeof callbacks.onProviderSelected === "function"
? callbacks.onProviderSelected
: noop,
onLoginSuccess:
typeof callbacks.onLoginSuccess === "function"
? callbacks.onLoginSuccess
: null,
onLoginError:
typeof callbacks.onLoginError === "function"
? callbacks.onLoginError
: null,
};
this.helpers = {
closeModal:
typeof helpers.closeModal === "function" ? helpers.closeModal : noop,
describeLoginError:
typeof helpers.describeLoginError === "function"
? helpers.describeLoginError
: (_, fallbackMessage) => fallbackMessage,
};
this.providerContainer = null;
this.template = null;
this.providerEntries = new Map();
this.slowTimers = new Map();
this.boundClickHandler = (event) => this.handleContainerClick(event);
this.initialized = false;
this.initialize();
}
initialize() {
if (!this.modalElement) {
devLogger.warn("[LoginModalController] Modal element was not provided.");
return;
}
const container = this.modalElement.querySelector("[data-login-providers]");
if (!(container instanceof HTMLElement)) {
devLogger.warn("[LoginModalController] Provider container not found.");
return;
}
this.providerContainer = container;
this.template = this.resolveTemplate();
this.renderProviders();
this.providerContainer.addEventListener("click", this.boundClickHandler);
this.initialized = true;
}
resolveTemplate() {
if (!this.modalElement) {
return null;
}
const template = this.modalElement.querySelector(
"template[data-login-provider-template]",
);
if (template instanceof HTMLTemplateElement) {
return template;
}
return null;
}
createFragment() {
if (this.template) {
return this.template.content
? this.template.content.cloneNode(true)
: this.document?.createDocumentFragment() || null;
}
if (!this.document) {
return null;
}
const fragment = this.document.createDocumentFragment();
const button = this.document.createElement("button");
button.type = "button";
button.className = "btn w-full text-left";
button.dataset.providerButton = "";
fragment.appendChild(button);
return fragment;
}
renderProviders() {
if (!this.providerContainer) {
return;
}
this.providerContainer.innerHTML = "";
this.providerEntries.clear();
if (!this.providers.length) {
userLogger.warn(
"[LoginModalController] No authentication providers available to render.",
);
return;
}
for (const provider of this.providers) {
const fragment = this.createFragment();
if (!fragment) {
continue;
}
const appended = this.appendProviderFragment(fragment, provider);
if (!appended) {
continue;
}
this.providerContainer.appendChild(appended.fragment);
this.providerEntries.set(provider.id, appended.entry);
}
}
appendProviderFragment(fragment, provider) {
const button = fragment.querySelector("[data-provider-button]");
if (!(button instanceof HTMLButtonElement)) {
devLogger.warn(
`[LoginModalController] Provider template missing button for ${provider.id}.`,
);
return null;
}
button.type = "button";
button.dataset.providerId = provider.id;
button.className = resolveButtonVariantClasses(
provider.button?.variant,
provider.button?.className,
);
button.disabled = provider.disabled;
if (provider.disabled) {
button.setAttribute("aria-disabled", "true");
} else {
button.removeAttribute("aria-disabled");
}
const labelNode = button.querySelector("[data-provider-label]");
if (labelNode instanceof HTMLElement) {
labelNode.textContent = provider.label;
} else {
button.textContent = provider.label;
}
const descriptionNode = button.querySelector("[data-provider-description]");
if (descriptionNode instanceof HTMLElement) {
descriptionNode.textContent = provider.description;
descriptionNode.classList.toggle("hidden", !provider.description);
}
const statusNode = button.querySelector("[data-provider-status]");
if (statusNode instanceof HTMLElement) {
statusNode.textContent = "";
statusNode.classList.add("hidden");
}
const capabilitiesNode = button.querySelector(
"[data-provider-capabilities]",
);
if (capabilitiesNode instanceof HTMLElement) {
capabilitiesNode.innerHTML = "";
if (provider.capabilities.length) {
capabilitiesNode.classList.remove("hidden");
for (const capability of provider.capabilities) {
const badgeLabel =
typeof capability.label === "string" && capability.label.trim()
? capability.label.trim()
: "";
if (!badgeLabel) {
continue;
}
const badge = this.document?.createElement("span");
if (!badge) {
continue;
}
badge.className = "badge";
if (
capability.variant &&
typeof capability.variant === "string" &&
capability.variant.trim()
) {
badge.dataset.variant = capability.variant.trim();
}
badge.textContent = badgeLabel;
capabilitiesNode.appendChild(badge);
}
} else {
capabilitiesNode.classList.add("hidden");
}
}
return {
fragment,
entry: {
provider,
button,
descriptionNode: descriptionNode instanceof HTMLElement ? descriptionNode : null,
statusNode: statusNode instanceof HTMLElement ? statusNode : null,
defaultDescription: provider.description,
},
};
}
handleContainerClick(event) {
const target = event.target;
if (!(target instanceof Element)) {
return;
}
const button = target.closest("[data-provider-button]");
if (!(button instanceof HTMLButtonElement)) {
return;
}
const providerId = button.dataset.providerId;
if (!providerId) {
return;
}
this.handleProviderSelection(providerId);
}
getProviderEntry(providerId) {
return this.providerEntries.get(providerId) || null;
}
setLoadingState(providerId, isLoading) {
const entry = this.getProviderEntry(providerId);
if (!entry) {
return;
}
if (isLoading) {
entry.button.disabled = true;
entry.button.dataset.state = "loading";
entry.button.setAttribute("aria-busy", "true");
this.updateStatusMessage(
entry,
entry.provider.messages.loading || "Connecting…",
);
this.startSlowTimer(providerId, entry);
} else {
const shouldRemainDisabled = entry.provider.disabled === true;
entry.button.disabled = shouldRemainDisabled;
if (shouldRemainDisabled) {
entry.button.setAttribute("aria-disabled", "true");
} else {
entry.button.removeAttribute("aria-disabled");
}
delete entry.button.dataset.state;
entry.button.removeAttribute("aria-busy");
this.stopSlowTimer(providerId);
this.updateStatusMessage(entry, "", true);
}
}
updateStatusMessage(entry, message, reset = false) {
if (!entry) {
return;
}
const normalized = typeof message === "string" ? message.trim() : "";
if (entry.statusNode) {
if (normalized && !reset) {
entry.statusNode.textContent = normalized;
entry.statusNode.classList.remove("hidden");
} else {
entry.statusNode.textContent = "";
entry.statusNode.classList.add("hidden");
}
} else if (normalized && !reset) {
entry.button.textContent = normalized;
}
if (entry.descriptionNode) {
if (normalized && !reset) {
entry.descriptionNode.classList.add("hidden");
} else {
entry.descriptionNode.textContent = entry.defaultDescription;
entry.descriptionNode.classList.toggle(
"hidden",
!entry.defaultDescription,
);
}
}
}
startSlowTimer(providerId, entry) {
this.stopSlowTimer(providerId);
const delay = entry.provider.messages.slowDelay;
const timeout =
Number.isFinite(delay) && delay > 0 ? delay : SLOW_PROVIDER_DELAY_MS;
if (!this.window || typeof this.window.setTimeout !== "function") {
return;
}
const timerId = this.window.setTimeout(() => {
if (!entry.button.dataset.state || entry.button.dataset.state !== "loading") {
return;
}
const slowMessage =
entry.provider.messages.slow || "Waiting for the provider…";
this.updateStatusMessage(entry, slowMessage);
}, timeout);
this.slowTimers.set(providerId, timerId);
}
stopSlowTimer(providerId) {
const timerId = this.slowTimers.get(providerId);
if (!timerId) {
return;
}
if (this.window && typeof this.window.clearTimeout === "function") {
this.window.clearTimeout(timerId);
}
this.slowTimers.delete(providerId);
}
async handleProviderSelection(providerId) {
const entry = this.getProviderEntry(providerId);
if (!entry) {
devLogger.warn(
`[LoginModalController] Ignoring selection for unknown provider: ${providerId}.`,
);
return;
}
if (entry.button.dataset.state === "loading") {
devLogger.log(
`[LoginModalController] Ignoring duplicate selection while ${providerId} is loading.`,
);
return;
}
if (!this.services.authService) {
userLogger.error(
"[LoginModalController] AuthService not available; cannot process login.",
);
return;
}
safeInvoke(this.callbacks.onProviderSelected, providerId);
this.setLoadingState(providerId, true);
devLogger.log(
`[LoginModalController] Starting login for provider ${providerId}.`,
);
try {
const result = await this.services.authService.requestLogin({
providerId,
});
devLogger.log(
`[LoginModalController] Login resolved for ${providerId} with pubkey:`,
result?.pubkey,
);
await safeInvokeAsync(this.callbacks.onLoginSuccess, {
provider: entry.provider.source || entry.provider,
result,
});
if (result && typeof result.pubkey === "string" && result.pubkey.trim()) {
this.helpers.closeModal();
}
} catch (error) {
devLogger.error(
`[LoginModalController] Login failed for ${providerId}:`,
error,
);
const message = this.helpers.describeLoginError(
error,
entry.provider.errorMessage,
);
if (
!message ||
(typeof message === "string" && !message.trim())
) {
devLogger.warn(
`[LoginModalController] describeLoginError returned empty message for ${providerId}.`,
);
}
await safeInvokeAsync(this.callbacks.onLoginError, {
provider: entry.provider.source || entry.provider,
error,
message,
});
} finally {
this.setLoadingState(providerId, false);
}
}
destroy() {
if (this.providerContainer && this.boundClickHandler) {
this.providerContainer.removeEventListener("click", this.boundClickHandler);
}
for (const providerId of this.slowTimers.keys()) {
this.stopSlowTimer(providerId);
}
this.providerEntries.clear();
this.initialized = false;
}
}