fix: move proxy context to URL path

README.md

@@ -175,7 +175,6 @@ const res = await client.proxy.request({
     body: { user: "%USER_ID%" },
     // Optional per-call overrides:
     // environment: "other-env-id",
-    // usePersonal: false,
 });
 ```
 

src/enkryptify.ts

@@ -18,7 +18,7 @@ import { KubernetesExchangeManager } from "@/kubernetes-exchange";
 import { EnkryptifyProxy, sendProxyWire } from "@/proxy";
 import { HttpInterceptor } from "@/interceptor";
 
-const DEFAULT_PROXY_URL = "https://proxy.enkryptify.com";
+const DEFAULT_PROXY_URL = "https://proxy.enkryptify.com/v1/proxy";
 
 export class Enkryptify implements IEnkryptify {
     #api: EnkryptifyApi;
@@ -121,7 +121,6 @@ export class Enkryptify implements IEnkryptify {
             workspace: this.#workspace,
             project: this.#project,
             environment: this.#environment,
-            usePersonalValues: this.#usePersonalValues,
             logger: this.#logger,
             isDestroyed: () => this.#destroyed,
         });
@@ -140,7 +139,6 @@ export class Enkryptify implements IEnkryptify {
                     workspace: this.#workspace,
                     project: this.#project,
                     environment: this.#environment,
-                    usePersonalValues: this.#usePersonalValues,
                 },
                 logger: this.#logger,
             });

src/interceptor.ts

@@ -33,7 +33,6 @@ export interface HttpInterceptorInit {
         workspace: string;
         project: string;
         environment: string;
-        usePersonalValues: boolean;
     };
     logger: Logger;
 }
@@ -215,12 +214,9 @@ export class HttpInterceptor {
             method,
             headers: mergedHeaders,
             body: finalBody,
-            config: {
-                workspace: rule.workspace ?? this.#defaults.workspace,
-                project: rule.project ?? this.#defaults.project,
-                "environment-id": rule.environment ?? this.#defaults.environment,
-                "is-personal": rule.usePersonal ?? this.#defaults.usePersonalValues,
-            },
+            workspace: rule.workspace ?? this.#defaults.workspace,
+            project: rule.project ?? this.#defaults.project,
+            "environment-id": rule.environment ?? this.#defaults.environment,
         };
     }
 

src/proxy.ts

@@ -20,7 +20,6 @@ export interface EnkryptifyProxyInit {
     workspace: string;
     project: string;
     environment: string;
-    usePersonalValues: boolean;
     logger: Logger;
     isDestroyed: () => boolean;
 }
@@ -35,12 +34,9 @@ export interface ProxyWireBody {
     method: ProxyMethod;
     headers?: Record<string, string>;
     body?: JsonValue;
-    config: {
-        workspace: string;
-        project: string;
-        "environment-id": string;
-        "is-personal": boolean;
-    };
+    workspace: string;
+    project: string;
+    "environment-id": string;
 }
 
 /**
@@ -82,15 +78,15 @@ export async function sendProxyWire(
     const wireBody: Record<string, unknown> = {
         url: body.url,
         method: body.method,
-        config: body.config,
     };
     if (body.headers !== undefined) wireBody.headers = body.headers;
     if (body.body !== undefined) wireBody.body = body.body;
 
+    const proxyRequestUrl = buildProxyRequestUrl(ctx.proxyUrl, body.workspace, body.project, body["environment-id"]);
     ctx.logger.debug(`Proxy request: ${body.method} ${body.url}`);
     const start = Date.now();
 
-    const response = await fetch(ctx.proxyUrl, {
+    const response = await fetch(proxyRequestUrl, {
         method: "POST",
         headers: {
             Authorization: `Bearer ${token}`,
@@ -121,7 +117,6 @@ export class EnkryptifyProxy implements IEnkryptifyProxy {
     #workspace: string;
     #project: string;
     #environment: string;
-    #usePersonalValues: boolean;
 
     // Public-surface methods — rebound in the constructor so that
     // `const { fetch } = client.proxy` (the pattern users need for wiring into
@@ -140,7 +135,6 @@ export class EnkryptifyProxy implements IEnkryptifyProxy {
         this.#workspace = init.workspace;
         this.#project = init.project;
         this.#environment = init.environment;
-        this.#usePersonalValues = init.usePersonalValues;
 
         this.fetch = this.#fetchImpl.bind(this);
         this.request = this.#requestImpl.bind(this);
@@ -179,7 +173,7 @@ export class EnkryptifyProxy implements IEnkryptifyProxy {
                 method,
                 headers,
                 body,
-                config: this.#buildConfig(),
+                ...this.#buildScope(),
             },
             init?.signal ?? null,
         );
@@ -202,11 +196,10 @@ export class EnkryptifyProxy implements IEnkryptifyProxy {
             );
         }
 
-        const config = this.#buildConfig({
+        const scope = this.#buildScope({
             workspace: options.workspace,
             project: options.project,
             environment: options.environment,
-            usePersonal: options.usePersonal,
         });
 
         return sendProxyWire(
@@ -216,23 +209,21 @@ export class EnkryptifyProxy implements IEnkryptifyProxy {
                 method,
                 headers: options.headers,
                 body: options.body,
-                config,
+                ...scope,
             },
             null,
         );
     }
 
-    #buildConfig(overrides?: {
+    #buildScope(overrides?: {
         workspace?: string;
         project?: string;
         environment?: string;
-        usePersonal?: boolean;
-    }): ProxyWireBody["config"] {
+    }): Pick<ProxyWireBody, "workspace" | "project" | "environment-id"> {
         return {
             workspace: overrides?.workspace ?? this.#workspace,
             project: overrides?.project ?? this.#project,
             "environment-id": overrides?.environment ?? this.#environment,
-            "is-personal": overrides?.usePersonal ?? this.#usePersonalValues,
         };
     }
 }
@@ -309,3 +300,8 @@ function bodyTypeError(typeName: string): EnkryptifyError {
             "Docs: https://docs.enkryptify.com/sdk/proxy",
     );
 }
+
+function buildProxyRequestUrl(baseUrl: string, workspace: string, project: string, environmentId: string): string {
+    const normalizedBaseUrl = baseUrl.replace(/\/+$/, "");
+    return `${normalizedBaseUrl}/${encodeURIComponent(workspace)}/${encodeURIComponent(project)}/${encodeURIComponent(environmentId)}`;
+}

src/types.ts

@@ -163,8 +163,6 @@ export interface ProxyRequestOptions {
     project?: string;
     /** Override the client's environment for this request. */
     environment?: string;
-    /** Override the client's `usePersonalValues` setting for this request. */
-    usePersonal?: boolean;
 }
 
 export interface IEnkryptifyProxy {
@@ -250,8 +248,6 @@ export interface InterceptorRule {
     project?: string;
     /** Override the client's environment for this rule. */
     environment?: string;
-    /** Override the client's `usePersonalValues` setting for this rule. */
-    usePersonal?: boolean;
 
     /**
      * How to handle intercepted requests whose body cannot be represented on

tests/interceptor.test.ts

@@ -78,7 +78,7 @@ async function findProxyCall(fetchMock: ReturnType<typeof vi.fn>): Promise<Recor
         if (!parsed) continue;
         // mswjs sometimes normalises the URL with a trailing slash when it
         // runs through URL(); accept both shapes.
-        if (parsed.url === "https://proxy.test.com" || parsed.url === "https://proxy.test.com/") {
+        if (parsed.url.startsWith("https://proxy.test.com/")) {
             if (parsed.bodyText === null) return null;
             try {
                 return JSON.parse(parsed.bodyText) as Record<string, unknown>;
@@ -359,7 +359,7 @@ describe("interceptor — rule matching", () => {
 });
 
 describe("interceptor — ProxyWireBody shape", () => {
-    it("includes config block with client defaults", async () => {
+    it("puts client default context in the proxy URL path", async () => {
         fetchMock.mockResolvedValue(new Response("{}", { status: 200 }));
 
         activeClient = new Enkryptify(
@@ -377,16 +377,12 @@ describe("interceptor — ProxyWireBody shape", () => {
 
         await fetch("https://api.example.com/v1");
 
-        const wire = await findProxyCall(fetchMock);
-        expect(wire?.config).toEqual({
-            workspace: "ws-x",
-            project: "prj-y",
-            "environment-id": "env-z",
-            "is-personal": false,
-        });
+        await findProxyCall(fetchMock);
+        const proxyCall = await findCallByUrlPrefix(fetchMock, "https://proxy.test.com/");
+        expect(proxyCall?.url).toBe("https://proxy.test.com/ws-x/prj-y/env-z");
     });
 
-    it("rule-level workspace/project/environment/usePersonal override defaults", async () => {
+    it("rule-level workspace/project/environment override defaults", async () => {
         fetchMock.mockResolvedValue(new Response("{}", { status: 200 }));
 
         activeClient = new Enkryptify(
@@ -399,7 +395,6 @@ describe("interceptor — ProxyWireBody shape", () => {
                             workspace: "override-ws",
                             project: "override-prj",
                             environment: "override-env",
-                            usePersonal: false,
                         },
                     ],
                 },
@@ -409,13 +404,9 @@ describe("interceptor — ProxyWireBody shape", () => {
 
         await fetch("https://api.example.com/v1");
 
-        const wire = await findProxyCall(fetchMock);
-        expect(wire?.config).toEqual({
-            workspace: "override-ws",
-            project: "override-prj",
-            "environment-id": "override-env",
-            "is-personal": false,
-        });
+        await findProxyCall(fetchMock);
+        const proxyCall = await findCallByUrlPrefix(fetchMock, "https://proxy.test.com/");
+        expect(proxyCall?.url).toBe("https://proxy.test.com/override-ws/override-prj/override-env");
     });
 
     it("sends Authorization: Bearer <token> on the proxy call", async () => {

tests/proxy.test.ts

@@ -47,20 +47,14 @@
 
         expect(fetchMock).toHaveBeenCalledTimes(1);
         const url = fetchMock.mock.calls[0]?.[0] as string;
-        expect(url).toBe("https://proxy.test.com");
+        expect(url).toBe("https://proxy.test.com/v1/proxy/ws-1/prj-1/env-1");
         const opts = fetchMock.mock.calls[0]?.[1] as RequestInit;
         expect(opts.method).toBe("POST");
 
         const body = getCallBody(fetchMock.mock.calls[0] as unknown[]);
         expect(body).toMatchObject({
             url: "https://upstream/x?k=%K%",
             method: "GET",
-            config: {
-                workspace: "ws-1",
-                project: "prj-1",
-                "environment-id": "env-1",
-                "is-personal": true,
-            },
         });
         expect(body.body).toBeUndefined();
         expect(body.headers).toBeUndefined();
@@ -211,7 +205,7 @@
 });
 
 describe("client.proxy.request — low-level API", () => {
-    it("sends exact config in kebab-case", async () => {
+    it("sends wire body and routes context in URL path", async () => {
         fetchMock.mockResolvedValue(new Response("{}", { status: 200 }));
         const client = new Enkryptify(makeConfig());
 
@@ -226,13 +220,8 @@
             url: "https://upstream/x",
             method: "POST",
             body: { foo: "%BAR%" },
-            config: {
-                workspace: "ws-1",
-                project: "prj-1",
-                "environment-id": "env-1",
-                "is-personal": true,
-            },
         });
+        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://proxy.test.com/ws-1/prj-1/env-1");
     });
 
     it("applies per-call environment override", async () => {
@@ -245,11 +234,10 @@
             environment: "other-env",
         });
 
-        const body = getCallBody(fetchMock.mock.calls[0] as unknown[]);
-        expect((body.config as Record<string, unknown>)["environment-id"]).toBe("other-env");
+        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://proxy.test.com/ws-1/prj-1/other-env");
     });
 
-    it("applies per-call workspace/project/usePersonal overrides", async () => {
+    it("applies per-call workspace/project overrides", async () => {
         fetchMock.mockResolvedValue(new Response("{}", { status: 200 }));
         const client = new Enkryptify(makeConfig());
 
@@ -258,16 +246,9 @@
             method: "GET",
             workspace: "other-ws",
             project: "other-prj",
-            usePersonal: false,
         });
 
-        const body = getCallBody(fetchMock.mock.calls[0] as unknown[]);
-        expect(body.config).toEqual({
-            workspace: "other-ws",
-            project: "other-prj",
-            "environment-id": "env-1",
-            "is-personal": false,
-        });
+        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://proxy.test.com/other-ws/other-prj/env-1");
     });
 
     it("rejects GET with body", async () => {
@@ -449,7 +430,7 @@
         const client = new Enkryptify(makeConfig({ proxy: { url: "https://config.test.com" } }));
         await client.proxy.fetch("https://upstream/x");
 
-        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://config.test.com");
+        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://config.test.com/ws-1/prj-1/env-1");
     });
 
     it("falls back to ENKRYPTIFY_PROXY_URL env var", async () => {
@@ -459,7 +440,7 @@
         const client = new Enkryptify(makeConfig({ proxy: undefined }));
         await client.proxy.fetch("https://upstream/x");
 
-        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://env.test.com");
+        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://env.test.com/ws-1/prj-1/env-1");
     });
 
     it("falls back to default POC URL when nothing else is set", async () => {
@@ -469,7 +450,7 @@
         const client = new Enkryptify(makeConfig({ proxy: undefined }));
         await client.proxy.fetch("https://upstream/x");
 
-        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://proxy.enkryptify.com");
+        expect(fetchMock.mock.calls[0]?.[0]).toBe("https://proxy.enkryptify.com/ws-1/prj-1/env-1");
     });
 });