vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: trim gateway auth canvas exports

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-02 03:08:26 +01:00
parent 8514e4c913
commit 44a8c40114
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gateway/auth-config-utils.ts
View File

@@ -8,12 +8,12 @@ import {
type SupportedGatewaySecretInputPath,
} from "./secret-input-paths.js";
export type GatewayAuthSecretInputPath = Extract<
type GatewayAuthSecretInputPath = Extract<
SupportedGatewaySecretInputPath,
"gateway.auth.token" | "gateway.auth.password"
>;
export type GatewayAuthSecretRefResolutionParams = {
type GatewayAuthSecretRefResolutionParams = {
cfg: OpenClawConfig;
env: NodeJS.ProcessEnv;
mode?: GatewayAuthConfig["mode"];
@@ -28,7 +28,7 @@ export function hasConfiguredGatewayAuthSecretInput(
return hasConfiguredSecretInput(readGatewaySecretInputValue(cfg, path), cfg.secrets?.defaults);
}
export function shouldResolveGatewayAuthSecretRef(params: {
function shouldResolveGatewayAuthSecretRef(params: {
mode?: GatewayAuthConfig["mode"];
path: GatewayAuthSecretInputPath;
hasPasswordCandidate: boolean;
@@ -51,7 +51,7 @@ export function shouldResolveGatewayAuthSecretRef(params: {
return isTokenPath ? !params.hasPasswordCandidate : !params.hasTokenCandidate;
}
export function shouldResolveGatewayTokenSecretRef(
function shouldResolveGatewayTokenSecretRef(
params: Omit<GatewayAuthSecretRefResolutionParams, "cfg" | "env">,
): boolean {
return shouldResolveGatewayAuthSecretRef({
@@ -62,7 +62,7 @@ export function shouldResolveGatewayTokenSecretRef(
});
}
export function shouldResolveGatewayPasswordSecretRef(
function shouldResolveGatewayPasswordSecretRef(
params: Omit<GatewayAuthSecretRefResolutionParams, "cfg" | "env">,
): boolean {
return shouldResolveGatewayAuthSecretRef({
@@ -73,7 +73,7 @@ export function shouldResolveGatewayPasswordSecretRef(
});
}
export async function resolveGatewayAuthSecretRefValue(params: {
async function resolveGatewayAuthSecretRefValue(params: {
cfg: OpenClawConfig;
env: NodeJS.ProcessEnv;
path: GatewayAuthSecretInputPath;
@@ -116,7 +116,7 @@ export async function resolveGatewayPasswordSecretRefValue(
});
}
export async function resolveGatewayAuthSecretRef(params: {
async function resolveGatewayAuthSecretRef(params: {
cfg: OpenClawConfig;
env: NodeJS.ProcessEnv;
path: GatewayAuthSecretInputPath;
@@ -137,7 +137,7 @@ export async function resolveGatewayAuthSecretRef(params: {
return nextConfig;
}
export async function resolveGatewayPasswordSecretRef(params: {
async function resolveGatewayPasswordSecretRef(params: {
cfg: OpenClawConfig;
env: NodeJS.ProcessEnv;
mode?: GatewayAuthConfig["mode"];

4
src/gateway/canvas-capability.ts
View File

@@ -1,10 +1,10 @@
import { randomBytes } from "node:crypto";
export const CANVAS_CAPABILITY_PATH_PREFIX = "/__openclaw__/cap";
export const CANVAS_CAPABILITY_QUERY_PARAM = "oc_cap";
const CANVAS_CAPABILITY_QUERY_PARAM = "oc_cap";
export const CANVAS_CAPABILITY_TTL_MS = 10 * 60_000;
export type NormalizedCanvasScopedUrl = {
type NormalizedCanvasScopedUrl = {
pathname: string;
capability?: string;
rewrittenUrl?: string;

18
src/gateway/canvas-documents.ts
View File

@@ -5,20 +5,20 @@ import { CANVAS_HOST_PATH } from "../canvas-host/a2ui.js";
import { resolveStateDir } from "../config/paths.js";
import { resolveUserPath } from "../utils.js";
export type CanvasDocumentKind = "html_bundle" | "url_embed" | "document" | "image" | "video_asset";
type CanvasDocumentKind = "html_bundle" | "url_embed" | "document" | "image" | "video_asset";
export type CanvasDocumentAsset = {
type CanvasDocumentAsset = {
logicalPath: string;
sourcePath: string;
contentType?: string;
};
export type CanvasDocumentEntrypoint =
type CanvasDocumentEntrypoint =
| { type: "html"; value: string }
| { type: "path"; value: string }
| { type: "url"; value: string };
export type CanvasDocumentCreateInput = {
type CanvasDocumentCreateInput = {
id?: string;
kind: CanvasDocumentKind;
title?: string;
@@ -28,7 +28,7 @@ export type CanvasDocumentCreateInput = {
surface?: "assistant_message" | "tool_card" | "sidebar";
};
export type CanvasDocumentManifest = {
type CanvasDocumentManifest = {
id: string;
kind: CanvasDocumentKind;
title?: string;
@@ -44,7 +44,7 @@ export type CanvasDocumentManifest = {
}>;
};
export type CanvasDocumentResolvedAsset = {
type CanvasDocumentResolvedAsset = {
logicalPath: string;
contentType?: string;
url: string;
@@ -97,12 +97,12 @@ function normalizeCanvasDocumentId(value: string): string {
return normalized;
}
export function resolveCanvasRootDir(rootDir?: string, stateDir = resolveStateDir()): string {
function resolveCanvasRootDir(rootDir?: string, stateDir = resolveStateDir()): string {
const resolved = rootDir?.trim() ? resolveUserPath(rootDir) : path.join(stateDir, "canvas");
return path.resolve(resolved);
}
export function resolveCanvasDocumentsDir(rootDir?: string, stateDir = resolveStateDir()): string {
function resolveCanvasDocumentsDir(rootDir?: string, stateDir = resolveStateDir()): string {
return path.join(resolveCanvasRootDir(rootDir, stateDir), CANVAS_DOCUMENTS_DIR_NAME);
}
@@ -122,7 +122,7 @@ export function buildCanvasDocumentEntryUrl(documentId: string, entrypoint: stri
return `${CANVAS_HOST_PATH}/${CANVAS_DOCUMENTS_DIR_NAME}/${encodeURIComponent(documentId)}/${encodedEntrypoint}`;
}
export function buildCanvasDocumentAssetUrl(documentId: string, logicalPath: string): string {
function buildCanvasDocumentAssetUrl(documentId: string, logicalPath: string): string {
return buildCanvasDocumentEntryUrl(documentId, logicalPath);
}