Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

refactor: keep password work lease in membership boundary

Josuéb19877edf5ee
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index df9175091..16bef5e03 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.774",
+ "version": "0.1.775",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.774",
+ "version": "0.1.775",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/grok-provider-attempt-contract": "file:../packages/grok-provider-attempt-contract",
diff --git a/control-api/package.json b/control-api/package.json
index 88c098799..da5ab2454 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.774",
+ "version": "0.1.775",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/routes/admin/auth.ts b/control-api/src/routes/admin/auth.ts
index c17a1bd78..afc904449 100644
--- a/control-api/src/routes/admin/auth.ts
+++ b/control-api/src/routes/admin/auth.ts
@@ -34,13 +34,15 @@ import {
validateControlAdminPasswordResetToken,
} from '../../services/controlAdminInvitationRegistrationService.js'
import {
- type MemberPasswordWorkLease,
acceptInvitationById,
getPendingMemberInvitationForEmail,
provisionAdminDesktopWorkspace,
setInvitationPasswordForUser,
- withMemberPasswordWorkLease,
} from '../../services/directory/index.js'
+import {
+ type MemberPasswordWorkLease,
+ withMemberPasswordWorkLease,
+} from '../../services/directory/membership.js'
import { setupInitialAdminWithDesktopWorkspace } from '../../services/initialAdminSetupService.js'
import { memberRegistrationErrorResponse } from '../../services/memberRegistrationErrors.js'
import { signAdminToken } from '../../utils/auth/adminAuthToken.js'
diff --git a/control-api/src/services/directory/index.ts b/control-api/src/services/directory/index.ts
index 404e7c407..f65b79a1c 100644
--- a/control-api/src/services/directory/index.ts
+++ b/control-api/src/services/directory/index.ts
@@ -71,9 +71,6 @@ export {
setInvitationPasswordForEmail,
updateUserPassword,
} from './memberPassword.js'
-export { withPasswordWorkLease as withMemberPasswordWorkLease } from '../auth/passwordWorkOwnership.js'
-export type { MemberPasswordWorkLease } from '../auth/passwordWorkOwnership.js'
-
export {
getTeamContexts,
getUserContexts,
diff --git a/control-api/test/routes.adminAuth.test.ts b/control-api/test/routes.adminAuth.test.ts
index 329acebfd..a6a15a6af 100644
--- a/control-api/test/routes.adminAuth.test.ts
+++ b/control-api/test/routes.adminAuth.test.ts
@@ -15,6 +15,9 @@ const directorySvc = vi.hoisted(() => ({
}))
// auth.ts imports provisionAdminDesktopWorkspace from the directory barrel; mock the barrel here.
vi.mock('../src/services/directory/index.js', () => directorySvc)
+vi.mock('../src/services/directory/membership.js', () => ({
+ withMemberPasswordWorkLease: directorySvc.withMemberPasswordWorkLease,
+}))
const adminSvc = vi.hoisted(() => ({
completeControlAdminEmailChangeRequest: vi.fn(),