amalgm 0.1.138 → 0.1.139

package/runtime/scripts/proxy-token-store.js

@@ -1,16 +1,15 @@
 'use strict';
 
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
+const { amalgmDir, runtimeStateDir } = require('./lib/runtime-paths');
 
 const DEFAULT_PROXY_BASE_URL = 'https://amalgm-api-proxy-v2.fly.dev';
 const REFRESH_BUFFER_MS = 10 * 60 * 1000;
 
-const AMALGM_DIR = process.env.AMALGM_DIR || path.join(os.homedir(), '.amalgm');
+const AMALGM_DIR = amalgmDir();
 const AMALGM_RUNTIME_LABEL = normalizeRuntimeLabel(process.env.AMALGM_RUNTIME_LABEL || process.env.AMALGM_BRANCH);
-const AMALGM_RUNTIME_STATE_DIR = process.env.AMALGM_RUNTIME_STATE_DIR
-  || path.join(AMALGM_DIR, 'runtimes', AMALGM_RUNTIME_LABEL);
+const AMALGM_RUNTIME_STATE_DIR = runtimeStateDir();
 const COMPUTER_FILE = path.join(AMALGM_DIR, 'computer.json');
 const AUTH_FILE = path.join(AMALGM_DIR, 'auth.json');
 const RUNTIME_COMPUTER_FILE = path.join(AMALGM_RUNTIME_STATE_DIR, 'computer.json');
@@ -146,6 +145,10 @@ async function refreshProxyToken() {
     schema_version: 1,
     computer_id: computerId,
     device_id: deviceId,
+    user_id: cleanString(record?.user_id) || cleanString(auth?.user_id),
+    user_email: cleanString(refreshed.user_email).toLowerCase()
+      || cleanString(record?.user_email).toLowerCase()
+      || cleanString(auth?.user_email).toLowerCase(),
     app_url: appUrl,
     proxy: {
       ...(auth.proxy || {}),

package/runtime/scripts/proxy-token-store.test.js

@@ -0,0 +1,112 @@
+'use strict';
+
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const ORIGINAL_ENV = { ...process.env };
+const SCRIPTS_DIR = __dirname;
+
+function resetEnv() {
+  for (const key of Object.keys(process.env)) {
+    if (key.startsWith('AMALGM_') || key === 'HOME') delete process.env[key];
+  }
+  for (const [key, value] of Object.entries(ORIGINAL_ENV)) {
+    if (key.startsWith('AMALGM_') || key === 'HOME') continue;
+    process.env[key] = value;
+  }
+}
+
+function clearRuntimeModules() {
+  for (const key of Object.keys(require.cache)) {
+    if (key.startsWith(SCRIPTS_DIR)) delete require.cache[key];
+  }
+}
+
+function writeJson(file, data) {
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, `${JSON.stringify(data, null, 2)}\n`);
+}
+
+function readJson(file) {
+  return JSON.parse(fs.readFileSync(file, 'utf8'));
+}
+
+test.afterEach(() => {
+  resetEnv();
+  clearRuntimeModules();
+});
+
+test('proxy token refresh persists user_email while keeping refresh request uuid-only', async () => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'amalgm-proxy-token-'));
+  const previousFetch = globalThis.fetch;
+  try {
+    const home = path.join(root, 'amalgm');
+    const emailDir = path.join(home, 'users', 'person@example.com');
+    const legacyDir = path.join(home, 'users', 'user-uuid');
+    fs.mkdirSync(path.join(emailDir, 'runtimes', 'main'), { recursive: true });
+    fs.symlinkSync('person@example.com', legacyDir);
+
+    const runtimeDir = path.join(legacyDir, 'runtimes', 'main');
+    writeJson(path.join(runtimeDir, 'computer.json'), {
+      computer_id: 'computer-a',
+      device_id: 'device-a',
+      user_id: 'user-uuid',
+      runtime_label: 'main',
+      app_url: 'https://app.example.test',
+    });
+    writeJson(path.join(runtimeDir, 'auth.json'), {
+      schema_version: 1,
+      computer_id: 'computer-a',
+      device_id: 'device-a',
+      user_id: 'user-uuid',
+      app_url: 'https://app.example.test',
+      machine: { token: 'machine-token' },
+      proxy: {
+        token: 'old-token',
+        expires_at: new Date(Date.now() - 1000).toISOString(),
+      },
+    });
+
+    process.env.HOME = root;
+    process.env.AMALGM_HOME = home;
+    process.env.AMALGM_DIR = legacyDir;
+    process.env.AMALGM_RUNTIME_STATE_DIR = runtimeDir;
+    process.env.AMALGM_RUNTIME_LABEL = 'main';
+
+    let refreshBody = null;
+    globalThis.fetch = async (url, init) => {
+      assert.equal(String(url), 'https://app.example.test/api/computers/proxy-token');
+      assert.equal(init?.headers?.authorization, 'Bearer machine-token');
+      refreshBody = JSON.parse(String(init?.body || '{}'));
+      return {
+        ok: true,
+        json: async () => ({
+          proxy_token: 'new-token',
+          proxy_token_expires_in: 3600,
+          proxy_token_expires_at: '2030-01-01T00:00:00.000Z',
+          user_email: 'Person@Example.com',
+        }),
+      };
+    };
+
+    const { ensureFreshProxyToken } = require('./proxy-token-store');
+    const token = await ensureFreshProxyToken({ force: true });
+
+    assert.equal(token, 'new-token');
+    assert.deepEqual(refreshBody, {
+      computer_id: 'computer-a',
+      device_id: 'device-a',
+    });
+
+    const nextAuth = readJson(path.join(runtimeDir, 'auth.json'));
+    assert.equal(nextAuth.user_id, 'user-uuid');
+    assert.equal(nextAuth.user_email, 'person@example.com');
+    assert.equal(nextAuth.proxy.token, 'new-token');
+  } finally {
+    globalThis.fetch = previousFetch;
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});