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

Matrix: narrow client auth imports

Browse Source
This commit is contained in:
Gustavo Madeira Santana
2026-03-30 23:59:03 -04:00
parent 44674525f2
commit 57003ffddf
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/matrix/src/matrix/account-config.ts
View File

@@ -1,9 +1,10 @@
import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
import {
listConfiguredAccountIds,
resolveNormalizedAccountEntry,
} from "openclaw/plugin-sdk/account-resolution";
import { DEFAULT_ACCOUNT_ID, hasConfiguredSecretInput } from "../runtime-api.js";
import { hasConfiguredSecretInput } from "openclaw/plugin-sdk/secret-input";
import type { CoreConfig, MatrixAccountConfig, MatrixConfig } from "../types.js";
export function resolveMatrixBaseConfig(cfg: CoreConfig): MatrixConfig {

18
extensions/matrix/src/matrix/client/config.ts
View File

@@ -27,7 +27,6 @@ import {
listNormalizedMatrixAccountIds,
} from "../account-config.js";
import { resolveMatrixConfigFieldPath } from "../config-update.js";
import { credentialsMatchConfig, loadMatrixCredentials } from "../credentials-read.js";
import type { MatrixAuth, MatrixResolvedConfig } from "./types.js";
type MatrixAuthClientDeps = {
@@ -35,7 +34,13 @@ type MatrixAuthClientDeps = {
ensureMatrixSdkLoggingConfigured: typeof import("./logging.js").ensureMatrixSdkLoggingConfigured;
};
type MatrixCredentialsReadDeps = {
loadMatrixCredentials: typeof import("../credentials-read.js").loadMatrixCredentials;
credentialsMatchConfig: typeof import("../credentials-read.js").credentialsMatchConfig;
};
let matrixAuthClientDepsPromise: Promise<MatrixAuthClientDeps> | undefined;
let matrixCredentialsReadDepsPromise: Promise<MatrixCredentialsReadDeps> | undefined;
async function loadMatrixAuthClientDeps(): Promise<MatrixAuthClientDeps> {
matrixAuthClientDepsPromise ??= Promise.all([import("../sdk.js"), import("./logging.js")]).then(
@@ -47,6 +52,16 @@ async function loadMatrixAuthClientDeps(): Promise<MatrixAuthClientDeps> {
return await matrixAuthClientDepsPromise;
}
async function loadMatrixCredentialsReadDeps(): Promise<MatrixCredentialsReadDeps> {
matrixCredentialsReadDepsPromise ??= import("../credentials-read.js").then(
(credentialsReadModule) => ({
loadMatrixCredentials: credentialsReadModule.loadMatrixCredentials,
credentialsMatchConfig: credentialsReadModule.credentialsMatchConfig,
}),
);
return await matrixCredentialsReadDepsPromise;
}
function readEnvSecretRefFallback(params: {
value: unknown;
env?: NodeJS.ProcessEnv;
@@ -664,6 +679,7 @@ export async function resolveMatrixAuth(params?: {
return credentialsWriter;
};
const { loadMatrixCredentials, credentialsMatchConfig } = await loadMatrixCredentialsReadDeps();
const cached = loadMatrixCredentials(env, accountId);
const cachedCredentials =
cached &&