11// @effect -diagnostics nodeBuiltinImport:off globalFetchInEffect:off - Local mock OAuth server validates the browser callback boundary.
22import * as NodeNet from "node:net" ;
33import * as Context from "effect/Context" ;
4- import * as Exit from "effect/Exit" ;
5- import * as FileSystem from "effect/FileSystem" ;
64import * as Scope from "effect/Scope" ;
75import * as ServerConfig from "../config.ts" ;
86import * as CodexManagedTokenBroker from "./CodexManagedTokenBroker.ts" ;
@@ -1656,13 +1654,9 @@ it.effect("a running session renews its bound profile but refuses a replacement
16561654) ;
16571655
16581656const makeRenewalBroker = Effect . gen ( function * ( ) {
1659- const fs = yield * FileSystem . FileSystem ;
16601657 const oauthEntered = yield * Deferred . make < void > ( ) ;
16611658 const oauthRelease = yield * Deferred . make < void > ( ) ;
1662- const commitEntered = yield * Deferred . make < void > ( ) ;
1663- const commitRelease = yield * Deferred . make < void > ( ) ;
16641659 let pauseOAuth = false ;
1665- let pauseCommit = false ;
16661660 const refreshTokens : string [ ] = [ ] ;
16671661 const credentials = {
16681662 clientId : "oaiapp_broker" ,
@@ -1708,20 +1702,6 @@ const makeRenewalBroker = Effect.gen(function* () {
17081702 ) ;
17091703 } ) ,
17101704 ) ;
1711- const fileSystem = FileSystem . FileSystem . of ( {
1712- ...fs ,
1713- rename : ( from , to ) =>
1714- Effect . gen ( function * ( ) {
1715- if ( pauseCommit && from . endsWith ( ".tmp" ) && to . includes ( "provider-auth-" ) ) {
1716- const pending = yield * fs . readFileString ( from ) ;
1717- if ( pending . includes ( "rotated-refresh" ) ) {
1718- yield * Deferred . succeed ( commitEntered , undefined ) ;
1719- yield * Deferred . await ( commitRelease ) ;
1720- }
1721- }
1722- yield * fs . rename ( from , to ) ;
1723- } ) ,
1724- } ) ;
17251705 return yield * Effect . gen ( function * ( ) {
17261706 const store = yield * ProviderCredentialStore . make ( "codex-chatgpt" , instanceId ) ;
17271707 yield * store . set ( new TextEncoder ( ) . encode ( JSON . stringify ( credentials ) ) ) ;
@@ -1732,31 +1712,22 @@ const makeRenewalBroker = Effect.gen(function* () {
17321712 const context = yield * Layer . buildWithScope ( CodexManagedTokenBroker . layer , scope ) ;
17331713 const broker = Context . get ( context , CodexManagedTokenBroker . CodexManagedTokenBroker ) ;
17341714 const endpoint = yield * broker . endpoint ;
1735- yield * Effect . addFinalizer ( ( ) =>
1736- Deferred . succeed ( oauthRelease , undefined ) . pipe (
1737- Effect . andThen ( Deferred . succeed ( commitRelease , undefined ) ) ,
1738- ) ,
1739- ) ;
1715+ yield * Effect . addFinalizer ( ( ) => Deferred . succeed ( oauthRelease , undefined ) ) ;
17401716 return {
17411717 auth,
17421718 store,
17431719 broker,
1744- scope,
17451720 endpoint,
17461721 refreshTokens,
17471722 request : { version : 1 , instanceId, environmentId, profileKey } ,
17481723 oauthEntered,
17491724 oauthRelease,
1750- commitEntered,
1751- commitRelease,
1752- pause : ( stage : "oauth" | "commit" ) => {
1753- pauseOAuth = stage === "oauth" ;
1754- pauseCommit = stage === "commit" ;
1725+ pause : ( ) => {
1726+ pauseOAuth = true ;
17551727 } ,
17561728 } ;
17571729 } ) . pipe (
17581730 Effect . provide ( ServerSecretStore . layer ) ,
1759- Effect . provideService ( FileSystem . FileSystem , fileSystem ) ,
17601731 Effect . provideService ( HttpClient . HttpClient , http ) ,
17611732 Effect . provideService ( ServerEnvironment . ServerEnvironmentIdentity , {
17621733 getEnvironmentId : Effect . succeed ( environmentId ) ,
@@ -1796,41 +1767,26 @@ const provideBroker = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
17961767 ) ,
17971768 ) ;
17981769
1799- it . live . each ( [ "oauth-disconnect" , "commit-disconnect" , "commit-shutdown" ] as const ) (
1800- "server-owned renewal persists rotated credentials after %s" ,
1801- ( stage ) =>
1802- provideBroker (
1803- Effect . gen ( function * ( ) {
1804- const h = yield * makeRenewalBroker ;
1805- h . pause ( stage === "oauth-disconnect" ? "oauth" : "commit" ) ;
1806- const client = yield * brokerClient ( h . endpoint , h . request ) ;
1807- yield * Deferred . await ( stage === "oauth-disconnect" ? h . oauthEntered : h . commitEntered ) ;
1808- const closing =
1809- stage === "commit-shutdown"
1810- ? yield * Scope . close ( h . scope , Exit . void ) . pipe ( Effect . forkChild )
1811- : undefined ;
1812- if ( ! closing ) client . socket . destroy ( ) ;
1813- yield * Effect . promise ( ( ) => client . response ) ;
1814- assert . equal ( Option . getOrThrow ( yield * h . auth . read ) . refreshToken , "single-use-refresh" ) ;
1815- yield * Deferred . succeed ( h . oauthRelease , undefined ) ;
1816- yield * Deferred . succeed ( h . commitRelease , undefined ) ;
1817- if ( closing ) yield * Fiber . join ( closing ) ;
1818- else yield * h . broker . awaitIdle ;
1819- const persisted = Option . getOrThrow ( yield * h . auth . read ) ;
1820- assert . equal ( persisted . refreshToken , "rotated-refresh" ) ;
1821- assert . equal ( persisted . accessToken , "renewed-access" ) ;
1822- assert . equal ( ( yield * h . auth . access ) . accessToken , "renewed-access" ) ;
1823- assert . deepEqual ( h . refreshTokens , [ "single-use-refresh" ] ) ;
1824- const fs = yield * FileSystem . FileSystem ;
1825- const config = yield * ServerConfig . ServerConfig ;
1826- assert . deepEqual (
1827- ( yield * fs . readDirectory ( config . secretsDir ) ) . filter (
1828- ( name ) => name . endsWith ( ".tmp" ) || name . endsWith ( ".lock" ) ,
1829- ) ,
1830- [ ] ,
1831- ) ;
1832- } ) ,
1833- ) ,
1770+ // regression: #16132 a renewal must outlive the Codex helper that asked for it, because the
1771+ // refresh token it spends is single-use.
1772+ it . effect ( "server-owned renewal persists rotated credentials after the helper disconnects" , ( ) =>
1773+ provideBroker (
1774+ Effect . gen ( function * ( ) {
1775+ const h = yield * makeRenewalBroker ;
1776+ h . pause ( ) ;
1777+ const client = yield * brokerClient ( h . endpoint , h . request ) ;
1778+ yield * Deferred . await ( h . oauthEntered ) ;
1779+ client . socket . destroy ( ) ;
1780+ yield * Effect . promise ( ( ) => client . response ) ;
1781+ assert . equal ( Option . getOrThrow ( yield * h . auth . read ) . refreshToken , "single-use-refresh" ) ;
1782+ yield * Deferred . succeed ( h . oauthRelease , undefined ) ;
1783+ yield * h . broker . awaitIdle ;
1784+ const persisted = Option . getOrThrow ( yield * h . auth . read ) ;
1785+ assert . equal ( persisted . refreshToken , "rotated-refresh" ) ;
1786+ assert . equal ( ( yield * h . auth . access ) . accessToken , "renewed-access" ) ;
1787+ assert . deepEqual ( h . refreshTokens , [ "single-use-refresh" ] ) ;
1788+ } ) ,
1789+ ) ,
18341790) ;
18351791
18361792it . live ( "the private broker refuses another environment, instance, or sign-in profile" , ( ) =>
0 commit comments