Merge pull request #1020 from Max-Health-Inc/develop

🧪 Auto-PR: Merge `develop` → `test`

Author: proxy-smart-releaser[bot]

.github/scripts/inferno-oauth-automation.js

@@ -766,10 +766,40 @@ async function runEhrLaunchTests(sessionId, browser) {
   }
 }
 
+/**
+ * Find the authorization URL a waiting test is blocked on.
+ *
+ * Prefers a recorded outgoing request (an exact URL) over one parsed out of the
+ * wait message's prose, which is how the EHR launch URL lost its query string.
+ * Returns null if nothing looks like an authorize URL yet.
+ */
+function findAuthorizeUrl(results) {
+  for (const result of results || []) {
+    if (result.result !== 'wait') continue;
+
+    for (const req of result.requests || []) {
+      if (req.direction === 'outgoing' && req.url && req.url.includes('authorize')) {
+        return req.url;
+      }
+    }
+
+    for (const field of ['wait_message', 'result_message', 'messages']) {
+      if (!result[field]) continue;
+      const content = typeof result[field] === 'string' ? result[field] : JSON.stringify(result[field]);
+      const match = content.match(/https?:\/\/[^\s<>"')]+?authorize[^\s<>"')]*/);
+      if (match) return match[0].replace(/[.,;:!?]+$/, '');
+    }
+  }
+  return null;
+}
+
 /**
  * Wait for EHR Launch test completion.
- * Similar to waitForSimpleTestCompletion but looks for Inferno's launch URL
- * (containing /launch) instead of an authorize URL.
+ *
+ * Two phases, and the loop used to serve only the first: the EHR hands the app its
+ * launch context, and THEN the app performs the authorization redirect the user has
+ * to complete. Once `launchAttempted` was set nothing acted again, so the run sat in
+ * `waiting` until the 3-minute timeout with `smart_app_redirect_stu2` never resolved.
  */
 async function waitForEhrLaunchCompletion(sessionId, runId, browser) {
   const maxWait = 180000; // 3 minutes
@@ -778,6 +808,8 @@ async function waitForEhrLaunchCompletion(sessionId, runId, browser) {
   let page = null;
   let launchAttempted = false;
   let launchAttemptCount = 0;
+  let authorizeAttempted = false;
+  let authorizeAttemptCount = 0;
   const MAX_LAUNCH_ATTEMPTS = 3;
 
   console.log(`Waiting for EHR Launch test run ${runId} to complete (timeout: 3 minutes)...`);
@@ -896,6 +928,31 @@ async function waitForEhrLaunchCompletion(sessionId, runId, browser) {
           }
         }
       }
+    } else if (runStatus.status === 'waiting' && browser && launchAttempted && !authorizeAttempted
+               && authorizeAttemptCount < MAX_LAUNCH_ATTEMPTS) {
+      // Phase 2: the app has its launch context and now redirects the user to
+      // authorize. Same handling as the standalone group.
+      const authUrl = findAuthorizeUrl(runStatus.results);
+
+      if (!authUrl) {
+        // No URL yet is normal for a poll or two. Say what the payload holds so a
+        // persistent stall names its own cause instead of timing out silently.
+        const waitIds = (runStatus.results || [])
+          .filter(r => r.result === 'wait')
+          .map(r => r.test_id || 'unknown');
+        console.log(`  Post-launch: waiting for an authorization URL (blocked on: ${waitIds.join(', ') || 'nothing'})`);
+      } else {
+        authorizeAttemptCount++;
+        console.log(`  Post-launch authorization (attempt ${authorizeAttemptCount}/${MAX_LAUNCH_ATTEMPTS}): ${authUrl.substring(0, 140)}`);
+        try {
+          if (!page) page = await browser.newPage();
+          await handleOAuthFlow(page, authUrl);
+          authorizeAttempted = true;
+          console.log('  EHR Launch authorization completed, continuing to poll...');
+        } catch (authError) {
+          console.error(`  EHR Launch authorization failed: ${authError.message}`);
+        }
+      }
     } else if (runStatus.status === 'waiting') {
       if (launchAttemptCount >= MAX_LAUNCH_ATTEMPTS) {
         console.error(`  EHR Launch OAuth failed after ${MAX_LAUNCH_ATTEMPTS} attempts — aborting wait`);

backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "proxy-smart-backend",
   "displayName": "Proxy Smart Backend",
-  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
+  "version": "0.3.14-alpha.202608131946.961ab42c4",
   "type": "module",
   "scripts": {
     "test": "bun test --isolate",

config/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proxy-smart/eslint-config",
-  "version": "0.3.14-alpha.202608131924.cfdc0c7f7",
+  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
   "private": true,
   "type": "module",
   "exports": {

deploy/infra/package.json

@@ -2,7 +2,7 @@
   "name": "proxy-smart-infra",
   "displayName": "Proxy Smart Infrastructure",
   "description": "AWS CDK infrastructure for Proxy Smart production deployment",
-  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
+  "version": "0.3.14-alpha.202608131946.961ab42c4",
   "private": true,
   "type": "module",
   "scripts": {

frontend/smart-dicom-template/package.json

@@ -3,7 +3,7 @@
   "displayName": "SMART DICOM Algorithm Template",
   "description": "Starter kit for building SMART on FHIR imaging algorithm apps. Clone, implement your algorithm in src/algorithm.ts, and deploy as a SMART app.",
   "private": true,
-  "version": "0.3.14-alpha.202608131924.cfdc0c7f7",
+  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
   "type": "module",
   "scripts": {
     "dev": "vite --port 5180",

frontend/ui/package.json

@@ -3,7 +3,7 @@
   "displayName": "Proxy Smart Admin UI",
   "description": "A web-based administration interface for managing healthcare applications and resources via Proxy Smart.",
   "private": true,
-  "version": "0.3.14-alpha.202608131924.cfdc0c7f7",
+  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
   "type": "module",
   "scripts": {
     "dev": "vite",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "proxy-smart",
-  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
+  "version": "0.3.14-alpha.202608131946.961ab42c4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Max-Health-Inc/proxy-smart.git"

packages/app-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proxy-smart/app-store",
-  "version": "0.3.14-alpha.202608131924.cfdc0c7f7",
+  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
   "private": false,
   "type": "module",
   "description": "SMART on FHIR app store — manifest discovery, visibility configuration, and registry CRUD. Framework-agnostic.",

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proxy-smart/auth",
-  "version": "0.3.14-alpha.202608131924.cfdc0c7f7",
+  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
   "private": false,
   "type": "module",
   "description": "SMART on FHIR STU 2.2.0 server-side authorization proxy — launch context, session management, token enrichment. Framework-agnostic, IdP-pluggable.",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proxy-smart/cli",
-  "version": "0.3.14-alpha.202608131924.cfdc0c7f7",
+  "version": "0.3.14-beta.202608131924.cfdc0c7f7",
   "private": false,
   "type": "module",
   "description": "Admin CLI for the proxy-smart SMART on FHIR authorization proxy. Authenticates via Keycloak OAuth (device flow or client_credentials) and drives the admin REST API.",