Skip to content

Commit 21d7e99

Browse files
committed
fix(connect): retain refresh response body failure causes
1 parent 83f102d commit 21d7e99

2 files changed

Lines changed: 31 additions & 9 deletions

File tree

‎apps/server/src/cloud/CliTokenManager.test.ts‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,13 @@ it.effect("only includes an allowlisted OAuth error code in a login prompt", ()
392392
);
393393

394394
it.effect.each([
395-
{ name: "malformed", layer: layerRefreshResponse({ status: 400, body: "{" }) },
396-
{ name: "unreadable", layer: layerUnreadableResponseBody(400) },
397-
])("keeps the permanent status for a $name refresh error body", ({ layer }) =>
395+
{
396+
name: "malformed",
397+
layer: layerRefreshResponse({ status: 400, body: "{" }),
398+
expectedBodyCause: false,
399+
},
400+
{ name: "unreadable", layer: layerUnreadableResponseBody(400), expectedBodyCause: true },
401+
])("keeps the permanent status for a $name refresh error body", ({ layer, expectedBodyCause }) =>
398402
Effect.gen(function* () {
399403
const manager = yield* CliTokenManager.CloudCliTokenManager;
400404
const error = yield* manager.getExisting.pipe(Effect.flip);
@@ -407,6 +411,21 @@ it.effect.each([
407411
assert.equal(error.cause.reason._tag, "StatusCodeError");
408412
if (error.cause.reason._tag === "StatusCodeError") {
409413
assert.equal(error.cause.reason.response.status, 400);
414+
if (expectedBodyCause) {
415+
assert.isTrue(HttpClientError.isHttpClientError(error.cause.reason.cause));
416+
if (HttpClientError.isHttpClientError(error.cause.reason.cause)) {
417+
assert.equal(error.cause.reason.cause.reason._tag, "DecodeError");
418+
if (error.cause.reason.cause.reason._tag === "DecodeError") {
419+
assert.instanceOf(error.cause.reason.cause.reason.cause, Error);
420+
assert.equal(
421+
(error.cause.reason.cause.reason.cause as Error).message,
422+
"body read failed",
423+
);
424+
}
425+
}
426+
} else {
427+
assert.isUndefined(error.cause.reason.cause);
428+
}
410429
}
411430
}
412431
}).pipe(
@@ -442,6 +461,12 @@ it.effect.each([200, 400])(
442461
assert.instanceOf(error, CliTokenManager.CloudCliCredentialRefreshError);
443462
assert.equal(error.requiresLogin, status === 400);
444463
assert.equal(error.message.includes("t3 connect login"), status === 400);
464+
if (status === 400 && HttpClientError.isHttpClientError(error.cause)) {
465+
assert.equal(error.cause.reason._tag, "StatusCodeError");
466+
if (error.cause.reason._tag === "StatusCodeError") {
467+
assert.isTrue(Cause.isTimeoutError(error.cause.reason.cause));
468+
}
469+
}
445470
assert.isTrue(yield* Fiber.join(hasCredential));
446471
}).pipe(
447472
Effect.provide(

‎apps/server/src/cloud/CliTokenManager.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,15 +327,12 @@ const readTokenResponse = Effect.fn("cloud.cli_token.read_token_response")(funct
327327
const isPermanentRefreshStatus = (status: number): boolean =>
328328
status >= 400 && status < 500 && status !== 408 && status !== 429;
329329

330-
const makeStatusCodeError = (
331-
response: HttpClientResponse.HttpClientResponse,
332-
oauthErrorCode?: OAuthRefreshErrorCode,
333-
) =>
330+
const makeStatusCodeError = (response: HttpClientResponse.HttpClientResponse, cause?: unknown) =>
334331
new HttpClientError.HttpClientError({
335332
reason: new HttpClientError.StatusCodeError({
336333
request: response.request,
337334
response,
338-
...(oauthErrorCode === undefined ? {} : { cause: oauthErrorCode }),
335+
...(cause === undefined ? {} : { cause }),
339336
}),
340337
});
341338

@@ -372,7 +369,7 @@ const exchangeToken = Effect.fn("cloud.cli_token.exchange")(function* (
372369
isRefreshGrant &&
373370
isPermanentRefreshStatus(responseWithStatus.status) &&
374371
!isStatusCodeError(cause)
375-
? Effect.fail(makeStatusCodeError(responseWithStatus))
372+
? Effect.fail(makeStatusCodeError(responseWithStatus, cause))
376373
: Effect.fail(cause),
377374
),
378375
);

0 commit comments

Comments
 (0)