@aiam/ciba 0.9.3 → 0.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiam/ciba",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "OAuth 2.0 Device Authorization Grant CLI with cross-device push approval (Yjs sync, ECDH-encrypted token delivery, persistent device id)",
   "type": "module",
   "bin": {

package/token.mjs

@@ -30,11 +30,22 @@ const args = process.argv.slice(2);
 const get = (flag) => { const i = args.indexOf(flag); return i !== -1 ? args[i + 1] : undefined; };
 const has = (flag) => args.includes(flag);
 
-const resource = get('--resource') ?? `urn:sap:destination:${process.env.CIBA_DEFAULT_DESTINATION || 'WEBAGENTS_BACKEND'}`;
-const jsonOut  = has('--json');
-const envOut   = has('--env');
+const resource  = get('--resource') ?? `urn:sap:destination:${process.env.CIBA_DEFAULT_DESTINATION || 'WEBAGENTS_BACKEND'}`;
+const jsonOut   = has('--json');
+const envOut    = has('--env');
 const isRefresh = has('--refresh');
 
+// Collect all unrecognised --key value pairs as extra request attrs.
+// Server uses them for login-hint, tenant, scope, app_tid, etc.
+const KNOWN = new Set(['--resource', '--url', '--json', '--env', '--refresh']);
+const extraAttrs = {};
+for (let i = 0; i < args.length; i++) {
+  if (args[i].startsWith('--') && !KNOWN.has(args[i]) && i + 1 < args.length && !args[i + 1].startsWith('--')) {
+    extraAttrs[args[i].slice(2).replace(/-/g, '_')] = args[i + 1];
+    i++;
+  }
+}
+
 // ─── Config ───────────────────────────────────────────────────────────────────
 
 function loadConfig() {
@@ -198,7 +209,7 @@ if (isRefresh) {
   const requests = deviceDoc.getMap('requests');
   const newRid = randomBytes(8).toString('base64url');
   log(`→ refresh — writing request ${newRid}`);
-  requests.set(newRid, { resource, status: 'pending', created_at: new Date().toISOString() });
+  requests.set(newRid, { ...extraAttrs, resource, status: 'pending', created_at: new Date().toISOString() });
   provider.destroy();
   process.exit(0);
 }
@@ -217,13 +228,14 @@ if (found) {
 const requests = deviceDoc.getMap('requests');
 const newRid = randomBytes(8).toString('base64url');
 log(`→ cache miss — writing request ${newRid} resource=${resolvedResource}`);
-requests.set(newRid, { resource: resolvedResource, status: 'pending', created_at: new Date().toISOString() });
+requests.set(newRid, { ...extraAttrs, resource: resolvedResource, status: 'pending', created_at: new Date().toISOString() });
 
 // Wait for resources to update
 log('→ waiting for token...');
 const token = await new Promise((resolve, reject) => {
   const timer = setTimeout(() => {
     resourcesMap.unobserve(observer);
+    log(`→ timeout — resources at that point: ${JSON.stringify([...resourcesMap.entries()])}`);
     reject(new Error('Timeout waiting for token'));
   }, 30_000);
 
@@ -237,6 +249,16 @@ const token = await new Promise((resolve, reject) => {
     }
   };
   resourcesMap.observe(observer);
+  // Also observe provider synced events in case doc re-syncs
+  provider.on('synced', () => {
+    log(`→ re-synced — resources: ${JSON.stringify([...resourcesMap.entries()])}`);
+    const found = tryGet(resourcesMap, deviceDoc, resolvedResource);
+    if (found) {
+      clearTimeout(timer);
+      resourcesMap.unobserve(observer);
+      resolve(decrypt(found));
+    }
+  });
 });
 
 provider.destroy();