Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 43 additions & 44 deletions apps/app/src/app/components/den-settings-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ import {
resolveDenBaseUrls,
writeDenSettings,
} from "../lib/den";
import {
denSessionUpdatedEvent,
dispatchDenSessionUpdated,
type DenSessionUpdatedDetail,
} from "../lib/den-session-events";
import {
clearDenTemplateCache,
loadDenTemplateCache,
Expand Down Expand Up @@ -78,9 +83,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
const platform = usePlatform();
const tr = (key: string) => t(key, currentLocale());
const initial = readDenSettings();
const initialBaseUrl = props.developerMode
? initial.baseUrl || DEFAULT_DEN_BASE_URL
: DEFAULT_DEN_BASE_URL;
const initialBaseUrl = initial.baseUrl || DEFAULT_DEN_BASE_URL;

const [baseUrl, setBaseUrl] = createSignal(initialBaseUrl);
const [baseUrlDraft, setBaseUrlDraft] = createSignal(initialBaseUrl);
Expand Down Expand Up @@ -155,22 +158,14 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {

createEffect(() => {
writeDenSettings({
baseUrl: props.developerMode ? baseUrl() : DEFAULT_DEN_BASE_URL,
baseUrl: baseUrl(),
authToken: authToken() || null,
activeOrgId: activeOrgId() || null,
activeOrgSlug: activeOrg()?.slug ?? null,
activeOrgName: activeOrg()?.name ?? null,
});
});

createEffect(() => {
if (!props.developerMode) {
setBaseUrl(DEFAULT_DEN_BASE_URL);
setBaseUrlDraft(DEFAULT_DEN_BASE_URL);
setBaseUrlError(null);
}
});

const openControlPlane = () => {
platform.openLink(resolveDenBaseUrls(baseUrl()).baseUrl);
};
Expand Down Expand Up @@ -239,7 +234,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
}

writeDenSettings({
baseUrl: props.developerMode ? nextBaseUrl : DEFAULT_DEN_BASE_URL,
baseUrl: nextBaseUrl,
authToken: result.token,
activeOrgId: null,
activeOrgSlug: null,
Expand All @@ -248,26 +243,21 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {

setManualAuthInput("");
setManualAuthOpen(false);
window.dispatchEvent(
new CustomEvent("openwork-den-session-updated", {
detail: {
status: "success",
email: result.user?.email ?? null,
},
}),
);
dispatchDenSessionUpdated({
status: "success",
baseUrl: nextBaseUrl,
token: result.token,
user: result.user,
email: result.user?.email ?? null,
});
} catch (error) {
window.dispatchEvent(
new CustomEvent("openwork-den-session-updated", {
detail: {
status: "error",
message:
error instanceof Error
? error.message
: tr("den.error_signin_failed"),
},
}),
);
dispatchDenSessionUpdated({
status: "error",
message:
error instanceof Error
? error.message
: tr("den.error_signin_failed"),
});
} finally {
setAuthBusy(false);
}
Expand Down Expand Up @@ -337,7 +327,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
const nextOrg = response.orgs.find((org) => org.id === next) ?? null;
setActiveOrgId(next);
writeDenSettings({
baseUrl: props.developerMode ? baseUrl() : DEFAULT_DEN_BASE_URL,
baseUrl: baseUrl(),
authToken: authToken() || null,
activeOrgId: next || null,
activeOrgSlug: nextOrg?.slug ?? null,
Expand Down Expand Up @@ -472,18 +462,27 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {

createEffect(() => {
const handler = (event: Event) => {
const customEvent = event as CustomEvent<{
status?: string;
email?: string | null;
message?: string | null;
}>;
const customEvent = event as CustomEvent<DenSessionUpdatedDetail>;
const nextSettings = readDenSettings();
setBaseUrl(nextSettings.baseUrl || DEFAULT_DEN_BASE_URL);
setBaseUrlDraft(nextSettings.baseUrl || DEFAULT_DEN_BASE_URL);
setAuthToken(nextSettings.authToken?.trim() || "");
const nextBaseUrl =
customEvent.detail?.baseUrl?.trim() ||
nextSettings.baseUrl ||
DEFAULT_DEN_BASE_URL;
const nextToken =
customEvent.detail?.token?.trim() ||
nextSettings.authToken?.trim() ||
"";
setBaseUrl(nextBaseUrl);
setBaseUrlDraft(nextBaseUrl);
setAuthToken(nextToken);
setActiveOrgId(nextSettings.activeOrgId?.trim() || "");
if (customEvent.detail?.status === "success") {
clearSessionState();
if (customEvent.detail.user) {
setUser(customEvent.detail.user);
}
setAuthError(null);
setSessionBusy(false);
setStatusMessage(
customEvent.detail.email?.trim()
? t("den.status_cloud_signed_in_as", currentLocale(), { email: customEvent.detail.email.trim() })
Expand All @@ -498,12 +497,12 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
};

window.addEventListener(
"openwork-den-session-updated",
denSessionUpdatedEvent,
handler as EventListener,
);
return () =>
window.removeEventListener(
"openwork-den-session-updated",
denSessionUpdatedEvent,
handler as EventListener,
);
});
Expand Down Expand Up @@ -828,7 +827,7 @@ export default function DenSettingsPanel(props: DenSettingsPanelProps) {
const nextOrg = orgs().find((org) => org.id === nextId) ?? null;
setActiveOrgId(nextId);
writeDenSettings({
baseUrl: props.developerMode ? baseUrl() : DEFAULT_DEN_BASE_URL,
baseUrl: baseUrl(),
authToken: authToken() || null,
activeOrgId: nextId || null,
activeOrgSlug: nextOrg?.slug ?? null,
Expand Down
24 changes: 24 additions & 0 deletions apps/app/src/app/lib/den-session-events.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import type { DenUser } from "./den";

export const denSessionUpdatedEvent = "openwork-den-session-updated";

export type DenSessionUpdatedDetail = {
status?: "success" | "error";
baseUrl?: string | null;
token?: string | null;
user?: DenUser | null;
email?: string | null;
message?: string | null;
};

export function dispatchDenSessionUpdated(detail: DenSessionUpdatedDetail) {
if (typeof window === "undefined") {
return;
}

window.dispatchEvent(
new CustomEvent<DenSessionUpdatedDetail>(denSessionUpdatedEvent, {
detail,
}),
);
}
29 changes: 29 additions & 0 deletions apps/app/src/app/lib/den.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,35 @@ export function normalizeDenBaseUrl(input: string | null | undefined): string |

function isWebAppHost(hostname: string): boolean {
const normalized = hostname.trim().toLowerCase();

if (
normalized === "localhost" ||
normalized === "0.0.0.0" ||
normalized === "::1" ||
normalized === "[::1]" ||
/^127(?:\.\d{1,3}){3}$/.test(normalized)
) {
return true;
}

const ipv4Match = normalized.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
if (ipv4Match) {
const [first, second, third, fourth] = ipv4Match.slice(1).map(Number);
const octets = [first, second, third, fourth];
if (octets.every((octet) => Number.isInteger(octet) && octet >= 0 && octet <= 255)) {
if (
first === 10 ||
first === 127 ||
(first === 172 && second >= 16 && second <= 31) ||
(first === 192 && second === 168) ||
(first === 169 && second === 254) ||
(first === 100 && second >= 64 && second <= 127)
) {
return true;
}
}
}

return normalized === "app.openworklabs.com" || normalized === "app.openwork.software" || normalized.startsWith("app.");
}

Expand Down
51 changes: 35 additions & 16 deletions apps/app/src/app/shell/deep-links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { createEffect, createSignal, type Accessor } from "solid-js";
import { t, currentLocale } from "../../i18n";

import { createDenClient, writeDenSettings } from "../lib/den";
import { dispatchDenSessionUpdated } from "../lib/den-session-events";
import { stripBundleQuery } from "../bundles";
import type { createBundlesStore } from "../bundles/store";
import type { SettingsTab, View } from "../types";
Expand Down Expand Up @@ -35,6 +36,15 @@ export function createDeepLinksController(options: {
const [pendingDenAuthDeepLink, setPendingDenAuthDeepLink] = createSignal<DenAuthDeepLink | null>(null);
const [processingDenAuthDeepLink, setProcessingDenAuthDeepLink] = createSignal(false);
const recentClaimedDeepLinks = new Map<string, number>();
const recentHandledDenGrants = new Map<string, number>();

const pruneRecentHandledDenGrants = (now: number) => {
for (const [grant, seenAt] of recentHandledDenGrants) {
if (now - seenAt > 5 * 60 * 1000) {
recentHandledDenGrants.delete(grant);
}
}
};

const queueRemoteConnectDefaults = (pending: RemoteWorkspaceDefaults | null) => {
setPendingRemoteConnectDeepLink(pending);
Expand Down Expand Up @@ -87,6 +97,18 @@ export function createDeepLinksController(options: {
if (!parsed) {
return false;
}

const now = Date.now();
pruneRecentHandledDenGrants(now);
if (recentHandledDenGrants.has(parsed.grant)) {
return true;
}

const currentPending = pendingDenAuthDeepLink();
if (currentPending?.grant === parsed.grant) {
return true;
}

setPendingDenAuthDeepLink(parsed);
return true;
};
Expand Down Expand Up @@ -173,6 +195,7 @@ export function createDeepLinksController(options: {

setProcessingDenAuthDeepLink(true);
setPendingDenAuthDeepLink(null);
recentHandledDenGrants.set(pending.grant, Date.now());
options.setView("settings");
options.setSettingsTab("den");
options.goToSettings("den");
Expand All @@ -192,24 +215,20 @@ export function createDeepLinksController(options: {
activeOrgName: null,
});

window.dispatchEvent(
new CustomEvent("openwork-den-session-updated", {
detail: {
status: "success",
email: result.user?.email ?? null,
},
}),
);
dispatchDenSessionUpdated({
status: "success",
baseUrl: pending.denBaseUrl,
token: result.token,
user: result.user,
email: result.user?.email ?? null,
});
})
.catch((error) => {
window.dispatchEvent(
new CustomEvent("openwork-den-session-updated", {
detail: {
status: "error",
message: error instanceof Error ? error.message : t("app.error_cloud_signin", currentLocale()),
},
}),
);
recentHandledDenGrants.delete(pending.grant);
dispatchDenSessionUpdated({
status: "error",
message: error instanceof Error ? error.message : t("app.error_cloud_signin", currentLocale()),
});
})
.finally(() => {
setProcessingDenAuthDeepLink(false);
Expand Down
Loading
Loading