11import * as NodeServices from "@effect/platform-node/NodeServices" ;
2+ import { EnvironmentId } from "@t3tools/contracts" ;
23import { expect , it } from "@effect/vitest" ;
34import * as Duration from "effect/Duration" ;
45import * as Effect from "effect/Effect" ;
@@ -7,15 +8,14 @@ import * as TestClock from "effect/testing/TestClock";
78import * as SqlClient from "effect/unstable/sql/SqlClient" ;
89
910import * as ServerConfig from "../config.ts" ;
11+ import * as ServerEnvironment from "../environment/ServerEnvironment.ts" ;
1012import { PersistenceSqlError } from "../persistence/Errors.ts" ;
1113import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts" ;
1214import * as AuthSessions from "../persistence/AuthSessions.ts" ;
1315import * as SessionStore from "./SessionStore.ts" ;
1416import * as ServerSecretStore from "./ServerSecretStore.ts" ;
1517
16- const makeServerConfigLayer = (
17- overrides ?: Partial < Pick < ServerConfig . ServerConfig [ "Service" ] , "desktopBootstrapToken" > > ,
18- ) =>
18+ const makeServerConfigLayer = ( overrides ?: Partial < ServerConfig . ServerConfig [ "Service" ] > ) =>
1919 Layer . effect (
2020 ServerConfig . ServerConfig ,
2121 Effect . gen ( function * ( ) {
@@ -27,12 +27,20 @@ const makeServerConfigLayer = (
2727 } ) ,
2828 ) . pipe ( Layer . provide ( ServerConfig . layerTest ( process . cwd ( ) , { prefix : "t3-auth-session-test-" } ) ) ) ;
2929
30+ const makeServerEnvironmentLayer = ( environmentId : EnvironmentId ) =>
31+ Layer . succeed ( ServerEnvironment . ServerEnvironment , {
32+ getEnvironmentId : Effect . succeed ( environmentId ) ,
33+ getDescriptor : Effect . die ( new Error ( "unused in SessionStore tests" ) ) ,
34+ } ) ;
35+
3036const makeSessionStoreLayer = (
31- overrides ?: Partial < Pick < ServerConfig . ServerConfig [ "Service" ] , "desktopBootstrapToken" > > ,
37+ overrides ?: Partial < ServerConfig . ServerConfig [ "Service" ] > ,
38+ environmentId = EnvironmentId . make ( "test-environment" ) ,
3239) =>
3340 SessionStore . layer . pipe (
3441 Layer . provide ( SqlitePersistenceMemory ) ,
3542 Layer . provide ( ServerSecretStore . layer ) ,
43+ Layer . provide ( makeServerEnvironmentLayer ( environmentId ) ) ,
3644 Layer . provide ( makeServerConfigLayer ( overrides ) ) ,
3745 ) ;
3846
@@ -58,10 +66,32 @@ const failingSessionLookupCredentialLayer = Layer.effect(
5866 Layer . provide ( failingSessionLookupRepositoryLayer ) ,
5967 Layer . provide ( ServerSecretStore . layer ) ,
6068 Layer . provide ( SqlitePersistenceMemory ) ,
69+ Layer . provide ( makeServerEnvironmentLayer ( EnvironmentId . make ( "test-environment" ) ) ) ,
6170 Layer . provide ( makeServerConfigLayer ( ) ) ,
6271) ;
6372
6473it . layer ( NodeServices . layer ) ( "SessionStore.layer" , ( it ) => {
74+ it . effect ( "keys remote cookies by environment identity instead of state directory" , ( ) =>
75+ Effect . gen ( function * ( ) {
76+ const cookieName = ( stateDir : string , environmentId : EnvironmentId ) =>
77+ Effect . gen ( function * ( ) {
78+ const sessions = yield * SessionStore . SessionStore ;
79+ return sessions . cookieName ;
80+ } ) . pipe (
81+ Effect . provide (
82+ makeSessionStoreLayer ( { mode : "web" , host : "192.168.1.50" , stateDir } , environmentId ) ,
83+ ) ,
84+ ) ;
85+
86+ const original = yield * cookieName ( "/srv/t3-one" , EnvironmentId . make ( "environment-one" ) ) ;
87+ const moved = yield * cookieName ( "/srv/t3-moved" , EnvironmentId . make ( "environment-one" ) ) ;
88+ const other = yield * cookieName ( "/srv/t3-one" , EnvironmentId . make ( "environment-two" ) ) ;
89+
90+ expect ( moved ) . toBe ( original ) ;
91+ expect ( other ) . not . toBe ( original ) ;
92+ } ) ,
93+ ) ;
94+
6595 it . effect ( "issues and verifies signed browser session tokens" , ( ) =>
6696 Effect . gen ( function * ( ) {
6797 const sessions = yield * SessionStore . SessionStore ;
0 commit comments