@bongos/core 1.21.93 → 1.21.95

package/tests/provisioning_github_app_routes.mjs

@@ -39,8 +39,18 @@ branding.branding = () => ({ ...realBranding(), identity: { ...(realBranding().i
 const api = require(`${ROOT}/src/module-api.js`);
 api.requireBuilder = (req, _res, next) => { req.builder = { id: 7, github_login: 'owner' }; next(); };
 
+// The verified-facts read (task 1004649) is the one DB query the github-setup routes make;
+// stub it on the cached module like the data-access fns above.
+const githubSetup = require(`${ROOT}/modules/provisioning/github-setup.js`);
+let facts = {};
+const reported = [];
+githubSetup.githubSetupFacts = async () => facts;
+const prevRecord = provisioning.recordEvent;
+provisioning.recordEvent = async (_db, e) => { reported.push(e); return prevRecord(); };
+
 const express = require('express');
 const provisioningRoutes = require(`${ROOT}/modules/provisioning/routes/provisioning.js`);
+const githubSetupRoutes = require(`${ROOT}/modules/provisioning/routes/github-setup.js`);
 const app = express();
 app.use(express.json());
 // res.fail is mounted globally by the core error middleware in production; add a minimal
@@ -53,6 +63,7 @@ app.use((_req, res, next) => {
   next();
 });
 app.use('/api/bongos', provisioningRoutes());
+app.use('/api/bongos', githubSetupRoutes());
 
 const server = app.listen(0);
 await new Promise((r) => server.once('listening', r));
@@ -70,6 +81,7 @@ console.log('POST /provisioning/instances/:id/github-app (mint the one-click lin
   t('manifest.redirect_url is the MOTHERSHIP callback', j.manifest && j.manifest.redirect_url === 'https://cloudbongos.com/api/bongos/provisioning/github-app/callback', j.manifest && j.manifest.redirect_url);
   t('manifest.callback_urls are the INSTANCE sign-in (both prefixes)', j.manifest && j.manifest.callback_urls[0] === 'https://mercury.example.com/api/gds/auth/web/callback' && j.manifest.callback_urls[1] === 'https://mercury.example.com/api/bongos/auth/web/callback');
   t('manifest.name is the instance domain (unique + matches the consent-screen redirect) within 34 chars', j.manifest && j.manifest.name === 'mercury.example.com' && j.manifest.name.length <= 34, j.manifest && j.manifest.name);
+  t('manifest.setup_url sends an install back to the MOTHERSHIP setup route (task 1004649)', j.manifest && j.manifest.setup_url === 'https://cloudbongos.com/api/bongos/provisioning/github-app/setup' && j.manifest.setup_on_update === true, j.manifest && j.manifest.setup_url);
   t('org_url derived from the target_ref owner (acme)', j.org_url === `https://github.com/organizations/acme/settings/apps/new?state=${j.state}`, j.org_url);
   t('the attempt row was persisted with the minted state', !!(stored && stored.instanceId === 42 && stored.state === j.state && stored.requestedBy === 7));
 }
@@ -93,24 +105,97 @@ console.log('\nGET /provisioning/github-app/callback (the public GitHub redirect
 {
   const res = await fetch(`${base}/provisioning/github-app/callback?code=GHCODE123&state=GOODSTATE`);
   const html = await res.text();
-  t('good state → 200 text/html hand-back page', res.status === 200 && /text\/html/.test(res.headers.get('content-type') || '') && /GitHub app created/.test(html) && /__CB_SETUP__/.test(html) && html.includes('GOODSTATE'), `status=${res.status}`);
-  t('the page names the instance host', /mercury\.example\.com/.test(html));
-  // task 1004548: the founder no longer waits here — the page hands them back to the
-  // checklist, which shows the wait. A manual way back is always on the page.
-  t('carries a plain "back to my checklist" link (works without script)', /<a class="btn" id="back" href="\/projects\?view=new">Back to my checklist/.test(html));
+  t('good state → 200 text/html one-trip page', res.status === 200 && /text\/html/.test(res.headers.get('content-type') || '') && /GitHub app created/.test(html) && /__CB_SETUP__/.test(html) && html.includes('GOODSTATE'), `status=${res.status}`);
+  // task 1004649: GitHub's half of the approval is done — the SAME tab goes on to the install
+  t('says the next step is installing it on the repo', /Next, install it on your repo/.test(html));
+  // task 1004650: the way back is the return route, which names the project on the server
+  t('carries a plain way back to the project (works without script)', html.includes('<a class="btn" id="back" href="/api/bongos/provisioning/github-app/return?state=GOODSTATE">Back to my project'));
+  // the script's config is the one the page SERVED, not a copy (task 1004650)
+  const servedCfg = JSON.parse((html.match(/window\.__CB_SETUP__=(\{[^<]*?\});/) || [])[1] || '{}');
+  t('the served config sends the founder to the return route, never to a bare create page', servedCfg.back === '/api/bongos/provisioning/github-app/return?state=GOODSTATE', JSON.stringify(servedCfg));
   t('no progress stepper or countdown left on the page', !/id="steps"/.test(html) && !/Placing credentials/.test(html) && !/location\.href=target/.test(html));
 
-  // Run the served script itself (not a copy) against a minimal DOM, once as the
-  // wizard's pop-up and once as a same-tab return, and watch what it does.
+  // Run the served INSTALL script (not a copy): it polls the real status shape and goes on.
+  const installScript = (html.match(/<script>\s*(\(function\(\)\{[\s\S]*?)<\/script>\s*<\/body>/) || [])[1];
+  t('the one-trip page ships its client script', typeof installScript === 'string' && /installations|install_url/.test(installScript));
+  async function runInstall(statuses, repoAnswer) {
+    const vm = await import('node:vm');
+    const back = { href: '' }, note = { textContent: '' };
+    const timers = [], fetched = [];
+    const calls = { replaced: null };
+    const sandbox = {
+      __CB_SETUP__: servedCfg,
+      document: { getElementById: (id) => (id === 'back' ? back : id === 'note' ? note : null) },
+      location: { replace: (u) => { calls.replaced = u; } },
+      setTimeout: (fn) => { timers.push(fn); return timers.length; },
+      encodeURIComponent, String,
+      fetch: async (url) => {
+        fetched.push(url);
+        if (/api\.github\.com\/repos\//.test(url)) return repoAnswer ? { ok: true, json: async () => repoAnswer } : { ok: false, json: async () => ({}) };
+        const body = statuses.length > 1 ? statuses.shift() : statuses[0];
+        return { ok: true, json: async () => body };
+      },
+    };
+    sandbox.window = sandbox;
+    vm.runInNewContext(installScript, sandbox);
+    for (let i = 0; i < 20 && !calls.replaced; i++) {
+      await new Promise((r) => setImmediate(r));
+      if (!calls.replaced && timers.length) timers.shift()();
+    }
+    return { ...calls, fetched, note: note.textContent };
+  }
+  // the REAL status route's answer for this attempt, before and after the runner named the app
+  const statusOf = async () => (await fetch(`${base}/provisioning/github-app/status?state=GOODSTATE`)).json();
+  const prevGet = provisioning.getOAuthManifestByState;
+  provisioning.getOAuthManifestByState = async () => ({ id: 99, instance_id: 42, state: 'GOODSTATE', status: 'converting', attempts: 1, expires_at: new Date(Date.now() + 600000).toISOString() });
+  const waiting = await statusOf();
+  provisioning.getOAuthManifestByState = async () => ({ id: 99, instance_id: 42, state: 'GOODSTATE', status: 'converting', attempts: 1, app_id: 5, app_slug: 'mercury-app', expires_at: new Date(Date.now() + 600000).toISOString() });
+  const named = await statusOf();
+  provisioning.getOAuthManifestByState = prevGet;
+  t('the real status: no install link until the app is named, then the one-trip link with the state', waiting.install_url === null && named.install_url === 'https://github.com/apps/mercury-app/installations/new?state=GOODSTATE' && named.repo === 'acme/mercury', JSON.stringify({ waiting: waiting.install_url, named: named.install_url }));
+  const narrowed = await runInstall([waiting, named], { id: 777, owner: { id: 42424 } });
+  t('waits for the app, then sends the founder to install it on THEIR repo, preselected', narrowed.replaced === 'https://github.com/apps/mercury-app/installations/new/permissions?state=GOODSTATE&suggested_target_id=42424&repository_ids[]=777', JSON.stringify(narrowed));
+  const plain = await runInstall([named], null);
+  t('a repo GitHub will not describe (private) falls back to the plain install page', plain.replaced === 'https://github.com/apps/mercury-app/installations/new?state=GOODSTATE', JSON.stringify(plain));
+  const doneAlready = await runInstall([{ ...named, checklist: { ...named.checklist, install: 'done' } }], null);
+  t('already installed → straight back to the checklist', doneAlready.replaced === '/api/bongos/provisioning/github-app/return?state=GOODSTATE', JSON.stringify(doneAlready));
+  const stopped = await runInstall([{ ...named, status: 'error' }], null);
+  t('a stopped attempt → back to the checklist, which says what stopped', stopped.replaced === '/api/bongos/provisioning/github-app/return?state=GOODSTATE', JSON.stringify(stopped));
+}
+
+console.log('\nGET /provisioning/github-app/setup (the App\'s setup_url — task 1004649):');
+{
+  reported.length = 0;
+  const prevGet = provisioning.getOAuthManifestByState;
+  provisioning.getOAuthManifestByState = async (_db, s) => (s === 'abcdef0123456789abcdef' ? { id: 99, instance_id: 42, requested_by: 7, state: s, status: 'done', app_slug: 'mercury-app' } : null);
+  const res = await fetch(`${base}/provisioning/github-app/setup?installation_id=123456&setup_action=install&state=abcdef0123456789abcdef`);
+  const html = await res.text();
+  t('a known state → 200 hand-back page to the checklist, carrying the attempt', res.status === 200 && /Installed on GitHub/.test(html) && html.includes('abcdef0123456789abcdef') && /Back to my checklist/.test(html), `status=${res.status}`);
+  t('records only that an install was REPORTED (the id is unverified), for the runner to check', reported.length === 1 && reported[0].event === 'github-app-install-reported' && /installation 123456, unverified/.test(reported[0].detail), JSON.stringify(reported));
+  reported.length = 0;
+  const forged = await fetch(`${base}/provisioning/github-app/setup?installation_id=1;rm%20-rf&state=abcdef0123456789abcdef`);
+  t('a non-numeric installation id never reaches the record', forged.status === 200 && reported.length === 1 && !/rm/.test(reported[0].detail), JSON.stringify(reported));
+  reported.length = 0;
+  const unknown = await fetch(`${base}/provisioning/github-app/setup?installation_id=1&state=NOPE`);
+  const uh = await unknown.text();
+  t('an unknown or missing state → the same way back, nothing recorded, no oracle', unknown.status === 200 && /Back to my projects/.test(uh) && reported.length === 0, `status=${unknown.status}`);
+  provisioning.getOAuthManifestByState = prevGet;
+}
+{
+  // the plain hand-back page (now the setup_url's) still behaves as before (task 1004548)
+  const callbackPage = require(`${ROOT}/modules/provisioning/routes/callback-page.js`).callbackPage;
+  const html = callbackPage({ ok: true, title: 'Installed on GitHub', state: 'GOODSTATE', domain: 'mercury.example.com' });
+  t('carries a plain "back to my checklist" link (works without script)', html.includes('<a class="btn" id="back" href="/api/bongos/provisioning/github-app/return?state=GOODSTATE">Back to my checklist'));
+  const servedCfg = JSON.parse((html.match(/window\.__CB_SETUP__=(\{[^<]*?\});/) || [])[1] || '{}');
   const script = (html.match(/<script>\s*(\(function\(\)\{[\s\S]*?)<\/script>\s*<\/body>/) || [])[1];
   t('the hand-back page ships the client script', typeof script === 'string' && script.length > 100);
   async function runCallback({ opener }) {
     const vm = await import('node:vm');
-    const back = { href: '/projects?view=new' };
+    const back = { href: '' };
     const timers = [];
     const calls = { close: 0, focusOpener: 0, replaced: null };
     const sandbox = {
-      __CB_SETUP__: { state: 'GOODSTATE', domain: 'mercury.example.com', back: '/projects?view=new' },
+      __CB_SETUP__: servedCfg,
       opener: opener ? { closed: false, focus: () => { calls.focusOpener++; } } : null,
       close: () => { calls.close++; },
       document: { getElementById: (id) => (id === 'back' ? back : null) },
@@ -124,12 +209,12 @@ console.log('\nGET /provisioning/github-app/callback (the public GitHub redirect
     while (timers.length) timers.shift()();
     return { ...calls, replacedBeforeTimer, backHref: back.href };
   }
-  const want = '/projects?view=new#ghstate=GOODSTATE';
+  const want = '/api/bongos/provisioning/github-app/return?state=GOODSTATE';
   const popup = await runCallback({ opener: true });
   t('as the wizard’s pop-up it focuses the checklist tab and closes itself', popup.focusOpener === 1 && popup.close === 1 && popup.replacedBeforeTimer === null, JSON.stringify(popup));
   t('…and if the browser refuses the close, the pop-up becomes the checklist', popup.replaced === want, JSON.stringify(popup));
   const sameTab = await runCallback({ opener: false });
-  t('as a same-tab return it goes straight back to the checklist, carrying the attempt in the fragment', sameTab.close === 0 && sameTab.replaced === want && sameTab.backHref === want, JSON.stringify(sameTab));
+  t('as a same-tab return it goes straight back through the return route, carrying the attempt', sameTab.close === 0 && sameTab.replaced === want && sameTab.backHref === want, JSON.stringify(sameTab));
 }
 {
   const res = await fetch(`${base}/provisioning/github-app/callback?code=X&state=NOPE`);
@@ -155,7 +240,13 @@ console.log('\nGET /provisioning/github-app/status (the page poll → auto-open
     : null);
   const res = await fetch(`${base}/provisioning/github-app/status?state=GOODSTATE`);
   const j = await res.json();
-  t("status 'done' → ready:true + terminal:true", res.status === 200 && j.ready === true && j.terminal === true, JSON.stringify(j));
+  // task 1004649: sign-in verified is not the end of the trip — the install still is ahead
+  t("status 'done', install not verified → ready:true, NOT terminal, the install still ahead", res.status === 200 && j.ready === true && j.terminal === false && j.checklist && j.checklist.sign_in === 'done' && j.checklist.install === 'todo', JSON.stringify(j));
+  facts = { installedAt: new Date().toISOString() };
+  provisioning.getOAuthManifestByState = async () => ({ id: 99, instance_id: 42, state: 'GOODSTATE', status: 'done', app_slug: 'mercury-app', resolved_at: new Date(Date.now() - 3 * 3600 * 1000).toISOString(), expires_at: new Date().toISOString() });
+  const j2 = await (await fetch(`${base}/provisioning/github-app/status?state=GOODSTATE`)).json();
+  t('installed + sign-in verified, the runner done checking → connected, terminal, no install link', j2.checklist.connected === true && j2.checklist.device_flow === 'later' && j2.terminal === true && j2.install_url === null, JSON.stringify(j2));
+  facts = {};
   provisioning.getOAuthManifestByState = prev;
 }
 {

package/tests/wizard_draft_resume.mjs

@@ -247,6 +247,10 @@ function runEnter({ draftStep, focus = false, resumeIntent = false, created = {
   const log = { shown: [], created: [], offer: undefined };
   const sandbox = {
     authKnown: true, me: { github_login: 'probe' }, resumeIntent,
+    // the server's resume read (task 1004650) already answered for this page load —
+    // this slice is about the record the tab stored (tests/github_handback_any_device.mjs
+    // holds the server's half)
+    resumeAsked: true, handbackProject: null, askServerResume() { throw new Error('not asked twice'); },
     state: { step: draftStep },
     createdRecord: () => created,
     enterCreated: (rec, f) => log.created.push({ id: rec.id, focus: f }),

package/tests/wizard_github_feedback.mjs

@@ -69,7 +69,8 @@ test('publicGithubApp: effective status, failure only on error, started_at, and
 
 // ── 2. the words for each stage ─────────────────────────────────────────────
 
-const RS = SCRIPT.indexOf('    /* oauth-app — the ADR 0133 one-click GitHub-App manifest flow');
+// from the shared helpers of the four GitHub steps (task 1004649) to the next step
+const RS = SCRIPT.indexOf('    /* The four GitHub steps of part 03');
 const RE = SCRIPT.indexOf('    /* device-flow', RS);
 const RENDER = SCRIPT.slice(RS, RE);
 
@@ -80,7 +81,8 @@ test('the GitHub step region is still findable (a rename must fail loudly)', ()
 
 function stage(live, { stale = false } = {}) {
   const sandbox = {
-    live: { manifest: null, manifestMsg: '', manifestCode: '', manifestFailure: null, appSlug: null, instStatus: 'active', addrReady: true, ...live },
+    live: { manifest: null, manifestMsg: '', manifestCode: '', manifestFailure: null, appSlug: null, setup: null, installUrl: null, instStatus: 'active', addrReady: true, ...live },
+    state: { name: 'Mercury', slug: 'mercury' },
     manifestStale: stale,
     autoOpenArmed: false,
     resolvedDomain: () => 'mercury.example.com',
@@ -109,7 +111,8 @@ test('pending: waiting for approval, and says where a missing GitHub tab went',
 test('converting is the SAME stage as code_received — approved, placing credentials — never "waiting for approval"', () => {
   for (const m of ['code_received', 'converting']) {
     const html = stage({ manifest: m });
-    assert.match(html, /GitHub’s part is done/, m);
+    assert.match(html, /Approved on GitHub/, m);
+    assert.match(html, /goes on to installing it on your repo/, `${m}: the trip carries on to the install (task 1004649)`);
     assert.match(html, /<prog now=1 done=1/, `${m}: the strip is past the approval stage`);
     assert.doesNotMatch(html, /Waiting for your approval/, m);
   }
@@ -161,8 +164,9 @@ const SEED = SCRIPT.slice(SS, SE);
 test('the reload regions are still findable (a rename must fail loudly)', () => {
   assert.ok(WS > 0 && WE > WS, 'wait-timer boundaries found');
   assert.ok(SS > 0 && SE > SS, 'instance-read seed boundaries found');
-  assert.match(SCRIPT, /if \(!terminal \|\| manifestInFlight\(\)\) pollTimer = setTimeout\(tick, 5000\);/,
-    'a GitHub leg in flight keeps the instance read alive once the project is up — after a reload it is the only watcher');
+  // the pace slows while the tab is hidden, never stops (task 1004650)
+  assert.match(SCRIPT, /if \(!terminal \|\| manifestInFlight\(\) \|\| setupOpen\(\)\) pollTimer = setTimeout\(tick, wizPollDelay\(5000\)\);/,
+    'a GitHub leg in flight — or an install not yet verified (task 1004649) — keeps the instance read alive once the project is up');
 });
 
 // A page that RELOADED: no click in this tab, no manifest poll, just the instance read.