@@ -140,6 +140,17 @@ const tokenGranted = {
140140 } ) ,
141141} ;
142142
143+ const rotatedTokenGranted = {
144+ status : 200 ,
145+ body : encodeTestTokenResponse ( {
146+ access_token : "access-token-2" ,
147+ refresh_token : "refresh-token-2" ,
148+ id_token : idTokenWithEmail ,
149+ expires_in : 3600 ,
150+ token_type : "bearer" ,
151+ } ) ,
152+ } ;
153+
143154const layerDeviceFlow = ( server : DeviceFlowServer ) =>
144155 Layer . succeed (
145156 HttpClient . HttpClient ,
@@ -189,6 +200,140 @@ const expiredStoredToken = new TextEncoder().encode(
189200 JSON . stringify ( { accessToken : "expired" , refreshToken : "refresh-token-1" , expiresAtEpochMs : 0 } ) ,
190201) ;
191202
203+ const layerRefreshResponse = ( reply : { readonly status : number ; readonly body : string } ) =>
204+ Layer . succeed (
205+ HttpClient . HttpClient ,
206+ HttpClient . make ( ( request ) =>
207+ Effect . succeed (
208+ HttpClientResponse . fromWeb (
209+ request ,
210+ new Response ( reply . body , {
211+ status : reply . status ,
212+ headers : { "content-type" : "application/json" } ,
213+ } ) ,
214+ ) ,
215+ ) ,
216+ ) ,
217+ ) ;
218+
219+ it . effect ( "persists a rotated refresh token before parent interruption is delivered" , ( ) =>
220+ Effect . gen ( function * ( ) {
221+ const requestStarted = yield * Deferred . make < void > ( ) ;
222+ const releaseRequest = yield * Deferred . make < void > ( ) ;
223+ const persistStarted = yield * Deferred . make < Uint8Array > ( ) ;
224+ const releasePersist = yield * Deferred . make < void > ( ) ;
225+ let persisted : Uint8Array | undefined ;
226+
227+ const httpClient = Layer . succeed (
228+ HttpClient . HttpClient ,
229+ HttpClient . make ( ( request ) =>
230+ Effect . gen ( function * ( ) {
231+ yield * Deferred . succeed ( requestStarted , undefined ) ;
232+ yield * Deferred . await ( releaseRequest ) ;
233+ return HttpClientResponse . fromWeb (
234+ request ,
235+ new Response ( rotatedTokenGranted . body , {
236+ status : rotatedTokenGranted . status ,
237+ headers : { "content-type" : "application/json" } ,
238+ } ) ,
239+ ) ;
240+ } ) ,
241+ ) ,
242+ ) ;
243+ const secrets = Layer . mock ( ServerSecretStore . ServerSecretStore ) ( {
244+ get : ( ) => Effect . succeedSome ( expiredStoredToken ) ,
245+ set : ( _name , value ) =>
246+ Effect . gen ( function * ( ) {
247+ yield * Deferred . succeed ( persistStarted , value ) ;
248+ yield * Deferred . await ( releasePersist ) ;
249+ persisted = value ;
250+ } ) ,
251+ } ) ;
252+ yield * Effect . gen ( function * ( ) {
253+ const manager = yield * CliTokenManager . CloudCliTokenManager ;
254+ const refresh = yield * manager . getExisting . pipe ( Effect . forkChild ) ;
255+
256+ yield * Deferred . await ( requestStarted ) ;
257+ const interruption = yield * Effect . forkChild ( Fiber . interrupt ( refresh ) , {
258+ startImmediately : true ,
259+ } ) ;
260+ yield * Deferred . succeed ( releaseRequest , undefined ) ;
261+ const persistedBeforeExit = yield * Effect . raceFirst (
262+ Deferred . await ( persistStarted ) . pipe ( Effect . as ( true ) ) ,
263+ Fiber . await ( refresh ) . pipe ( Effect . as ( false ) ) ,
264+ ) ;
265+ assert . isTrue ( persistedBeforeExit , "refresh exited before persistence started" ) ;
266+ yield * Deferred . succeed ( releasePersist , undefined ) ;
267+ yield * Fiber . join ( interruption ) ;
268+
269+ // The queued interruption may be delivered immediately after the
270+ // uninterruptible refresh transaction completes. Either exit is valid;
271+ // the important guarantee is that persistence finished first.
272+ yield * Fiber . await ( refresh ) ;
273+ assert . isDefined ( persisted ) ;
274+ assert . equal (
275+ JSON . parse ( new TextDecoder ( ) . decode ( persisted ! ) ) . refreshToken ,
276+ "refresh-token-2" ,
277+ ) ;
278+ } ) . pipe (
279+ Effect . provide (
280+ CliTokenManager . layer . pipe (
281+ Layer . provide (
282+ Layer . mergeAll (
283+ httpClient ,
284+ secrets ,
285+ Layer . mock ( ExternalLauncher . ExternalLauncher ) ( { } ) ,
286+ NodeServices . layer ,
287+ ) ,
288+ ) ,
289+ ) ,
290+ ) ,
291+ provideTestEnv ,
292+ ) ;
293+ } ) ,
294+ ) ;
295+
296+ it . effect . each ( [
297+ { status : 400 , requiresLogin : true } ,
298+ { status : 401 , requiresLogin : true } ,
299+ { status : 403 , requiresLogin : true } ,
300+ { status : 408 , requiresLogin : false } ,
301+ { status : 429 , requiresLogin : false } ,
302+ { status : 500 , requiresLogin : false } ,
303+ ] ) ( "marks refresh status $status as requiresLogin=$requiresLogin" , ( { status, requiresLogin } ) =>
304+ Effect . gen ( function * ( ) {
305+ const manager = yield * CliTokenManager . CloudCliTokenManager ;
306+ const error = yield * manager . getExisting . pipe ( Effect . flip ) ;
307+
308+ assert . instanceOf ( error , CliTokenManager . CloudCliCredentialRefreshError ) ;
309+ assert . equal ( error . requiresLogin , requiresLogin ) ;
310+ assert . equal ( error . message . includes ( "t3 connect login" ) , requiresLogin ) ;
311+ assert . notInclude ( error . message , "private-oauth-diagnostic" ) ;
312+ } ) . pipe (
313+ Effect . provide (
314+ CliTokenManager . layer . pipe (
315+ Layer . provide (
316+ Layer . mergeAll (
317+ layerRefreshResponse ( {
318+ status,
319+ body : JSON . stringify ( {
320+ error : "invalid_grant" ,
321+ error_description : "private-oauth-diagnostic" ,
322+ } ) ,
323+ } ) ,
324+ Layer . mock ( ServerSecretStore . ServerSecretStore ) ( {
325+ get : ( ) => Effect . succeedSome ( expiredStoredToken ) ,
326+ } ) ,
327+ Layer . mock ( ExternalLauncher . ExternalLauncher ) ( { } ) ,
328+ NodeServices . layer ,
329+ ) ,
330+ ) ,
331+ ) ,
332+ ) ,
333+ provideTestEnv ,
334+ ) ,
335+ ) ;
336+
192337it . effect ( "a stalled token refresh fails and releases the credential lock" , ( ) =>
193338 Effect . gen ( function * ( ) {
194339 const manager = yield * CliTokenManager . CloudCliTokenManager ;
0 commit comments