@@ -14,6 +14,7 @@ import * as Schema from "effect/Schema";
1414import * as Terminal from "effect/Terminal" ;
1515import * as TestClock from "effect/testing/TestClock" ;
1616import * as HttpClient from "effect/http/HttpClient" ;
17+ import * as HttpClientError from "effect/http/HttpClientError" ;
1718import * as HttpClientResponse from "effect/http/HttpClientResponse" ;
1819
1920import * as ServerSecretStore from "../auth/ServerSecretStore.ts" ;
@@ -178,23 +179,24 @@ const layerDeviceFlow = (server: DeviceFlowServer) =>
178179const tokenRequests = ( requests : ReadonlyArray < RecordedTokenRequest > ) =>
179180 requests . filter ( ( request ) => request . url . endsWith ( "/oauth/token" ) ) ;
180181
181- // The endpoint sends 200 headers, then the JSON body never finishes.
182- const layerStalledBody = Layer . succeed (
183- HttpClient . HttpClient ,
184- HttpClient . make ( ( request ) =>
185- Effect . succeed (
186- HttpClientResponse . fromWeb (
187- request ,
188- new Response (
189- new ReadableStream ( {
190- start : ( controller ) => controller . enqueue ( new TextEncoder ( ) . encode ( "{" ) ) ,
191- } ) ,
192- { status : 200 , headers : { "content-type" : "application/json" } } ,
182+ // The endpoint sends headers, then the JSON body never finishes.
183+ const layerStalledBody = ( status : number ) =>
184+ Layer . succeed (
185+ HttpClient . HttpClient ,
186+ HttpClient . make ( ( request ) =>
187+ Effect . succeed (
188+ HttpClientResponse . fromWeb (
189+ request ,
190+ new Response (
191+ new ReadableStream ( {
192+ start : ( controller ) => controller . enqueue ( new TextEncoder ( ) . encode ( "{" ) ) ,
193+ } ) ,
194+ { status, headers : { "content-type" : "application/json" } } ,
195+ ) ,
193196 ) ,
194197 ) ,
195198 ) ,
196- ) ,
197- ) ;
199+ ) ;
198200
199201const expiredStoredToken = new TextEncoder ( ) . encode (
200202 JSON . stringify ( { accessToken : "expired" , refreshToken : "refresh-token-1" , expiresAtEpochMs : 0 } ) ,
@@ -216,6 +218,24 @@ const layerRefreshResponse = (reply: { readonly status: number; readonly body: s
216218 ) ,
217219 ) ;
218220
221+ const layerUnreadableResponseBody = ( status : number ) =>
222+ Layer . succeed (
223+ HttpClient . HttpClient ,
224+ HttpClient . make ( ( request ) =>
225+ Effect . succeed (
226+ HttpClientResponse . fromWeb (
227+ request ,
228+ new Response (
229+ new ReadableStream ( {
230+ start : ( controller ) => controller . error ( new Error ( "body read failed" ) ) ,
231+ } ) ,
232+ { status, headers : { "content-type" : "application/json" } } ,
233+ ) ,
234+ ) ,
235+ ) ,
236+ ) ,
237+ ) ;
238+
219239it . effect ( "persists a rotated refresh token before parent interruption is delivered" , ( ) =>
220240 Effect . gen ( function * ( ) {
221241 const requestStarted = yield * Deferred . make < void > ( ) ;
@@ -308,6 +328,7 @@ it.effect.each([
308328 assert . instanceOf ( error , CliTokenManager . CloudCliCredentialRefreshError ) ;
309329 assert . equal ( error . requiresLogin , requiresLogin ) ;
310330 assert . equal ( error . message . includes ( "t3 connect login" ) , requiresLogin ) ;
331+ assert . equal ( error . message . includes ( "OAuth error: invalid_grant" ) , requiresLogin ) ;
311332 assert . notInclude ( error . message , "private-oauth-diagnostic" ) ;
312333 } ) . pipe (
313334 Effect . provide (
@@ -334,22 +355,66 @@ it.effect.each([
334355 ) ,
335356) ;
336357
337- it . effect ( "a stalled token refresh fails and releases the credential lock " , ( ) =>
358+ it . effect ( "only includes an allowlisted OAuth error code in a login prompt " , ( ) =>
338359 Effect . gen ( function * ( ) {
339360 const manager = yield * CliTokenManager . CloudCliTokenManager ;
340- const refresh = yield * manager . getExisting . pipe ( Effect . flip , Effect . forkChild ) ;
341- const hasCredential = yield * manager . hasCredential . pipe ( Effect . forkChild ) ;
361+ const error = yield * manager . getExisting . pipe ( Effect . flip ) ;
362+
363+ assert . instanceOf ( error , CliTokenManager . CloudCliCredentialRefreshError ) ;
364+ assert . isTrue ( error . requiresLogin ) ;
365+ assert . include ( error . message , "t3 connect login" ) ;
366+ assert . notInclude ( error . message , "provider_secret" ) ;
367+ assert . notInclude ( error . message , "private-oauth-diagnostic" ) ;
368+ assert . notInclude ( error . message , "OAuth error:" ) ;
369+ } ) . pipe (
370+ Effect . provide (
371+ CliTokenManager . layer . pipe (
372+ Layer . provide (
373+ Layer . mergeAll (
374+ layerRefreshResponse ( {
375+ status : 400 ,
376+ body : JSON . stringify ( {
377+ error : "provider_secret" ,
378+ error_description : "private-oauth-diagnostic" ,
379+ } ) ,
380+ } ) ,
381+ Layer . mock ( ServerSecretStore . ServerSecretStore ) ( {
382+ get : ( ) => Effect . succeedSome ( expiredStoredToken ) ,
383+ } ) ,
384+ Layer . mock ( ExternalLauncher . ExternalLauncher ) ( { } ) ,
385+ NodeServices . layer ,
386+ ) ,
387+ ) ,
388+ ) ,
389+ ) ,
390+ provideTestEnv ,
391+ ) ,
392+ ) ;
342393
343- yield * TestClock . adjust ( Duration . seconds ( 10 ) ) ;
394+ 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 } ) =>
398+ Effect . gen ( function * ( ) {
399+ const manager = yield * CliTokenManager . CloudCliTokenManager ;
400+ const error = yield * manager . getExisting . pipe ( Effect . flip ) ;
344401
345- assert . instanceOf ( yield * Fiber . join ( refresh ) , CliTokenManager . CloudCliCredentialRefreshError ) ;
346- assert . isTrue ( yield * Fiber . join ( hasCredential ) ) ;
402+ assert . instanceOf ( error , CliTokenManager . CloudCliCredentialRefreshError ) ;
403+ assert . isTrue ( error . requiresLogin ) ;
404+ assert . include ( error . message , "t3 connect login" ) ;
405+ assert . isTrue ( HttpClientError . isHttpClientError ( error . cause ) ) ;
406+ if ( HttpClientError . isHttpClientError ( error . cause ) ) {
407+ assert . equal ( error . cause . reason . _tag , "StatusCodeError" ) ;
408+ if ( error . cause . reason . _tag === "StatusCodeError" ) {
409+ assert . equal ( error . cause . reason . response . status , 400 ) ;
410+ }
411+ }
347412 } ) . pipe (
348413 Effect . provide (
349414 CliTokenManager . layer . pipe (
350415 Layer . provide (
351416 Layer . mergeAll (
352- layerStalledBody ,
417+ layer ,
353418 Layer . mock ( ServerSecretStore . ServerSecretStore ) ( {
354419 get : ( ) => Effect . succeedSome ( expiredStoredToken ) ,
355420 } ) ,
@@ -363,6 +428,40 @@ it.effect("a stalled token refresh fails and releases the credential lock", () =
363428 ) ,
364429) ;
365430
431+ it . effect . each ( [ 200 , 400 ] ) (
432+ "a stalled $status token refresh fails and releases the credential lock" ,
433+ ( status ) =>
434+ Effect . gen ( function * ( ) {
435+ const manager = yield * CliTokenManager . CloudCliTokenManager ;
436+ const refresh = yield * manager . getExisting . pipe ( Effect . flip , Effect . forkChild ) ;
437+ const hasCredential = yield * manager . hasCredential . pipe ( Effect . forkChild ) ;
438+
439+ yield * TestClock . adjust ( Duration . seconds ( 10 ) ) ;
440+
441+ const error = yield * Fiber . join ( refresh ) ;
442+ assert . instanceOf ( error , CliTokenManager . CloudCliCredentialRefreshError ) ;
443+ assert . equal ( error . requiresLogin , status === 400 ) ;
444+ assert . equal ( error . message . includes ( "t3 connect login" ) , status === 400 ) ;
445+ assert . isTrue ( yield * Fiber . join ( hasCredential ) ) ;
446+ } ) . pipe (
447+ Effect . provide (
448+ CliTokenManager . layer . pipe (
449+ Layer . provide (
450+ Layer . mergeAll (
451+ layerStalledBody ( status ) ,
452+ Layer . mock ( ServerSecretStore . ServerSecretStore ) ( {
453+ get : ( ) => Effect . succeedSome ( expiredStoredToken ) ,
454+ } ) ,
455+ Layer . mock ( ExternalLauncher . ExternalLauncher ) ( { } ) ,
456+ NodeServices . layer ,
457+ ) ,
458+ ) ,
459+ ) ,
460+ ) ,
461+ provideTestEnv ,
462+ ) ,
463+ ) ;
464+
366465it . layer ( NodeServices . layer ) ( "CliTokenManager.deviceAuthorizationLogin" , ( it ) => {
367466 it . effect ( "requests a device code, shows it, and polls until Clerk grants the token" , ( ) =>
368467 Effect . gen ( function * ( ) {
@@ -525,7 +624,7 @@ it.layer(NodeServices.layer)("CliTokenManager.deviceAuthorizationLogin", (it) =>
525624 it . effect ( "fails instead of hanging when the device authorization response stalls" , ( ) =>
526625 Effect . gen ( function * ( ) {
527626 const fiber = yield * CliTokenManager . deviceAuthorizationLogin ( ( ) => Effect . void ) . pipe (
528- Effect . provide ( layerStalledBody ) ,
627+ Effect . provide ( layerStalledBody ( 200 ) ) ,
529628 provideTestEnv ,
530629 Effect . flip ,
531630 Effect . forkChild ,
0 commit comments