@@ -14,6 +14,7 @@ import type { ManagedRelayDpopSigner } from "../relay/managedRelay.ts";
1414import {
1515 executeEnvironmentHttpRequest,
1616 makeEnvironmentHttpApiGroupClient,
17+ makeEnvironmentHttpApiUrlBuilder,
1718 RemoteEnvironmentAuthFetchError,
1819 RemoteEnvironmentAuthTimeoutError,
1920 type RemoteEnvironmentRequestError,
@@ -131,7 +132,12 @@ const executeEnvironmentRequest = Effect.fnUntraced(function* <
131132 readonly signer: Option.Option<ManagedRelayDpopSigner["Service"]>;
132133 readonly remoteAuthorization?: Option.Option<RemoteEnvironmentAuthorization["Service"]>;
133134 readonly method: HttpMethod.HttpMethod;
134- readonly url: (httpBaseUrl: string) => string;
135+ /**
136+ * The URL to sign, from the group's contract URL builder. It encodes path
137+ * params exactly like the request client, so the DPoP proof matches the
138+ * URL actually sent.
139+ */
140+ readonly url: (urls: ReturnType<typeof makeEnvironmentHttpApiUrlBuilder>[Group]) => string;
135141 readonly timeoutMs: number;
136142 readonly group: Group;
137143 readonly request: (input: {
@@ -146,6 +152,8 @@ const executeEnvironmentRequest = Effect.fnUntraced(function* <
146152 Effect.Services<ReturnType<typeof makeEnvironmentHttpApiGroupClient<Group>>> | R
147153> {
148154 let httpBaseUrl = input.prepared.httpBaseUrl;
155+ const requestUrlFor = (baseUrl: string) =>
156+ input.url(makeEnvironmentHttpApiUrlBuilder(baseUrl)[input.group]);
149157 return yield* Effect.gen(function* () {
150158 let rejectedAccessToken: string | undefined;
151159 for (;;) {
@@ -179,7 +187,7 @@ const executeEnvironmentRequest = Effect.fnUntraced(function* <
179187 authorization = current.httpAuthorization;
180188 }
181189
182- const requestUrl = input.url (httpBaseUrl);
190+ const requestUrl = requestUrlFor (httpBaseUrl);
183191 const client = yield* makeEnvironmentHttpApiGroupClient(httpBaseUrl, input.group);
184192 const headers = yield* buildEnvironmentAuthHeaders(
185193 authorization,
@@ -225,7 +233,9 @@ const executeEnvironmentRequest = Effect.fnUntraced(function* <
225233 Effect.timeoutOrElse({
226234 duration: input.timeoutMs,
227235 orElse: () =>
228- Effect.fail(new RemoteEnvironmentAuthTimeoutError(input.url(httpBaseUrl), input.timeoutMs)),
236+ Effect.fail(
237+ new RemoteEnvironmentAuthTimeoutError(requestUrlFor(httpBaseUrl), input.timeoutMs),
238+ ),
229239 }),
230240 );
231241});
0 commit comments