@oxyhq/services 23.0.2 → 23.1.0

package/lib/module/ui/oauth/browserAuthTransport.js

@@ -0,0 +1,167 @@
+"use strict";
+
+/**
+ * The single web entry point for third-party "Sign in with Oxy".
+ *
+ * Picks the transport (`popup` or `redirect`), drives it, and returns ONE typed
+ * result — so callers (`OxySignInButton`, and any RP with its own button) never
+ * touch `window.open`, `postMessage`, or the token exchange themselves.
+ *
+ * Popup mode keeps the relying party mounted: its route, scroll position, and
+ * unsaved state survive because the tab never navigates. Redirect mode is the
+ * compatibility fallback, and is also where popup mode lands when the browser
+ * blocks the window — a blocked popup must still sign the user in, not dead-end.
+ *
+ * Native is NOT handled here: `openAuthorizeUrlNative` (an in-app auth session)
+ * remains the native lane and is untouched by this module.
+ */
+
+import { logger, persistOAuthHandshake } from '@oxyhq/core';
+import { redirectToAuthorize } from "../components/oauthNavigation.js";
+import { isWebBrowser } from "../utils/isWebBrowser.js";
+import { completeOAuthCode } from "./completeOAuthCode.js";
+import { prepareAuthorizeRequest } from "./oauthHandshake.js";
+import { awaitOAuthPopupResult, closeOAuthPopup, navigateOAuthPopup, openOAuthPopup } from "./oauthPopup.js";
+
+/** Provider-owned wiring for a web sign-in — everything that is not per-press. */
+
+/** Per-press inputs for {@link startWebOAuthSignIn}. */
+
+export async function startWebOAuthSignIn(context, options) {
+  if (!isWebBrowser()) {
+    closeOAuthPopup(options.popup ?? null);
+    return {
+      status: 'unsupported',
+      reason: 'no-browser'
+    };
+  }
+  if (context.identityBound) {
+    closeOAuthPopup(options.popup ?? null);
+    return {
+      status: 'unsupported',
+      reason: 'identity-bound'
+    };
+  }
+  if (!context.clientId) {
+    closeOAuthPopup(options.popup ?? null);
+    return {
+      status: 'unsupported',
+      reason: 'missing-client-id'
+    };
+  }
+
+  // Claim the window BEFORE the first `await` below, so a caller that invoked us
+  // straight from the click still has gesture attribution. An explicit `null`
+  // means the caller already tried and was blocked.
+  const popup = context.mode === 'popup' && options.popup === undefined ? openOAuthPopup() : options.popup ?? null;
+  if (context.mode === 'redirect') {
+    closeOAuthPopup(popup);
+    return startRedirectSignIn(context, options, 'redirect-mode');
+  }
+  if (!popup) {
+    logger.warn('OAuth sign-in popup was blocked; falling back to a full-page redirect', {
+      component: 'browserAuthTransport'
+    });
+    return startRedirectSignIn(context, options, 'popup-blocked');
+  }
+  try {
+    const prepared = await prepareAuthorizeRequest({
+      clientId: context.clientId,
+      redirectUri: options.redirectUri,
+      authorizeBaseUrl: context.authorizeBaseUrl,
+      scope: options.scope,
+      responseMode: 'web_message'
+    });
+    if (!navigateOAuthPopup(popup, prepared.authorizeUrl)) {
+      return startRedirectSignIn(context, options, 'popup-navigation-failed');
+    }
+    const outcome = await awaitOAuthPopupResult({
+      popup,
+      expectedOrigin: prepared.authorizeOrigin,
+      expectedState: prepared.handshake.state,
+      redirectUri: options.redirectUri,
+      ...(options.timeoutMs !== undefined ? {
+        timeoutMs: options.timeoutMs
+      } : {})
+    });
+    switch (outcome.kind) {
+      case 'code':
+        {
+          const completion = await completeOAuthCode({
+            oxyServices: context.oxyServices,
+            clientId: context.clientId,
+            code: outcome.code,
+            returnedState: outcome.state,
+            handshake: prepared.handshake,
+            redirectUri: options.redirectUri,
+            commitSession: context.commitSession
+          });
+          return completion.ok ? {
+            status: 'signed-in'
+          } : {
+            status: 'failed',
+            reason: completion.reason
+          };
+        }
+      case 'oauth-error':
+        return {
+          status: 'failed',
+          reason: 'idp-error',
+          description: outcome.errorDescription ?? outcome.error
+        };
+      case 'state-mismatch':
+        return {
+          status: 'failed',
+          reason: 'state-mismatch'
+        };
+      case 'closed':
+        return {
+          status: 'cancelled'
+        };
+      case 'timed-out':
+        return {
+          status: 'timed-out'
+        };
+      case 'unsupported':
+        return {
+          status: 'unsupported',
+          reason: 'no-browser'
+        };
+    }
+  } finally {
+    // Covers throws after open (prepare/exchange/commit) and every settled outcome.
+    closeOAuthPopup(popup);
+  }
+}
+
+/**
+ * Full-page hand-off to the IdP. The document is destroyed by the navigation, so
+ * the handshake MUST reach `sessionStorage` first — without it the return trip
+ * cannot validate `state`, and starting the redirect anyway would strand the
+ * user at a callback that can only refuse them.
+ */
+async function startRedirectSignIn(context, options, via) {
+  // Narrowed by the caller; repeated here so this helper is safe on its own.
+  if (!context.clientId) return {
+    status: 'unsupported',
+    reason: 'missing-client-id'
+  };
+  const prepared = await prepareAuthorizeRequest({
+    clientId: context.clientId,
+    redirectUri: options.redirectUri,
+    authorizeBaseUrl: context.authorizeBaseUrl,
+    scope: options.scope
+  });
+  if (!persistOAuthHandshake(prepared.handshake.state, prepared.handshake.codeVerifier, options.redirectUri)) {
+    return {
+      status: 'failed',
+      reason: 'handshake-storage'
+    };
+  }
+  redirectToAuthorize(prepared.authorizeUrl);
+  return {
+    status: 'redirecting',
+    via
+  };
+}
+//# sourceMappingURL=browserAuthTransport.js.map

package/lib/module/ui/oauth/browserAuthTransport.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["logger","persistOAuthHandshake","redirectToAuthorize","isWebBrowser","completeOAuthCode","prepareAuthorizeRequest","awaitOAuthPopupResult","closeOAuthPopup","navigateOAuthPopup","openOAuthPopup","startWebOAuthSignIn","context","options","popup","status","reason","identityBound","clientId","mode","undefined","startRedirectSignIn","warn","component","prepared","redirectUri","authorizeBaseUrl","scope","responseMode","authorizeUrl","outcome","expectedOrigin","authorizeOrigin","expectedState","handshake","state","timeoutMs","kind","completion","oxyServices","code","returnedState","commitSession","ok","description","errorDescription","error","via","codeVerifier"],"sourceRoot":"../../../../src","sources":["ui/oauth/browserAuthTransport.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,MAAM,EAAEC,qBAAqB,QAAQ,aAAa;AAE3D,SAASC,mBAAmB,QAAQ,kCAA+B;AACnE,SAASC,YAAY,QAAQ,0BAAuB;AACpD,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SAASC,uBAAuB,QAAQ,qBAAkB;AAC1D,SAASC,qBAAqB,EAAEC,eAAe,EAAEC,kBAAkB,EAAEC,cAAc,QAAQ,iBAAc;;AASzG;;AAeA;;AAwBA,OAAO,eAAeC,mBAAmBA,CACvCC,OAAiC,EACjCC,OAAmC,EACJ;EAC/B,IAAI,CAACT,YAAY,CAAC,CAAC,EAAE;IACnBI,eAAe,CAACK,OAAO,CAACC,KAAK,IAAI,IAAI,CAAC;IACtC,OAAO;MAAEC,MAAM,EAAE,aAAa;MAAEC,MAAM,EAAE;IAAa,CAAC;EACxD;EACA,IAAIJ,OAAO,CAACK,aAAa,EAAE;IACzBT,eAAe,CAACK,OAAO,CAACC,KAAK,IAAI,IAAI,CAAC;IACtC,OAAO;MAAEC,MAAM,EAAE,aAAa;MAAEC,MAAM,EAAE;IAAiB,CAAC;EAC5D;EACA,IAAI,CAACJ,OAAO,CAACM,QAAQ,EAAE;IACrBV,eAAe,CAACK,OAAO,CAACC,KAAK,IAAI,IAAI,CAAC;IACtC,OAAO;MAAEC,MAAM,EAAE,aAAa;MAAEC,MAAM,EAAE;IAAoB,CAAC;EAC/D;;EAEA;EACA;EACA;EACA,MAAMF,KAAK,GACTF,OAAO,CAACO,IAAI,KAAK,OAAO,IAAIN,OAAO,CAACC,KAAK,KAAKM,SAAS,GAAGV,cAAc,CAAC,CAAC,GAAGG,OAAO,CAACC,KAAK,IAAI,IAAI;EAEpG,IAAIF,OAAO,CAACO,IAAI,KAAK,UAAU,EAAE;IAC/BX,eAAe,CAACM,KAAK,CAAC;IACtB,OAAOO,mBAAmB,CAACT,OAAO,EAAEC,OAAO,EAAE,eAAe,CAAC;EAC/D;EACA,IAAI,CAACC,KAAK,EAAE;IACVb,MAAM,CAACqB,IAAI,CAAC,uEAAuE,EAAE;MACnFC,SAAS,EAAE;IACb,CAAC,CAAC;IACF,OAAOF,mBAAmB,CAACT,OAAO,EAAEC,OAAO,EAAE,eAAe,CAAC;EAC/D;EAEA,IAAI;IACF,MAAMW,QAAQ,GAAG,MAAMlB,uBAAuB,CAAC;MAC7CY,QAAQ,EAAEN,OAAO,CAACM,QAAQ;MAC1BO,WAAW,EAAEZ,OAAO,CAACY,WAAW;MAChCC,gBAAgB,EAAEd,OAAO,CAACc,gBAAgB;MAC1CC,KAAK,EAAEd,OAAO,CAACc,KAAK;MACpBC,YAAY,EAAE;IAChB,CAAC,CAAC;IAEF,IAAI,CAACnB,kBAAkB,CAACK,KAAK,EAAEU,QAAQ,CAACK,YAAY,CAAC,EAAE;MACrD,OAAOR,mBAAmB,CAACT,OAAO,EAAEC,OAAO,EAAE,yBAAyB,CAAC;IACzE;IAEA,MAAMiB,OAAO,GAAG,MAAMvB,qBAAqB,CAAC;MAC1CO,KAAK;MACLiB,cAAc,EAAEP,QAAQ,CAACQ,eAAe;MACxCC,aAAa,EAAET,QAAQ,CAACU,SAAS,CAACC,KAAK;MACvCV,WAAW,EAAEZ,OAAO,CAACY,WAAW;MAChC,IAAIZ,OAAO,CAACuB,SAAS,KAAKhB,SAAS,GAAG;QAAEgB,SAAS,EAAEvB,OAAO,CAACuB;MAAU,CAAC,GAAG,CAAC,CAAC;IAC7E,CAAC,CAAC;IAEF,QAAQN,OAAO,CAACO,IAAI;MAClB,KAAK,MAAM;QAAE;UACX,MAAMC,UAAU,GAAG,MAAMjC,iBAAiB,CAAC;YACzCkC,WAAW,EAAE3B,OAAO,CAAC2B,WAAW;YAChCrB,QAAQ,EAAEN,OAAO,CAACM,QAAQ;YAC1BsB,IAAI,EAAEV,OAAO,CAACU,IAAI;YAClBC,aAAa,EAAEX,OAAO,CAACK,KAAK;YAC5BD,SAAS,EAAEV,QAAQ,CAACU,SAAS;YAC7BT,WAAW,EAAEZ,OAAO,CAACY,WAAW;YAChCiB,aAAa,EAAE9B,OAAO,CAAC8B;UACzB,CAAC,CAAC;UACF,OAAOJ,UAAU,CAACK,EAAE,GAChB;YAAE5B,MAAM,EAAE;UAAY,CAAC,GACvB;YAAEA,MAAM,EAAE,QAAQ;YAAEC,MAAM,EAAEsB,UAAU,CAACtB;UAAO,CAAC;QACrD;MACA,KAAK,aAAa;QAChB,OAAO;UACLD,MAAM,EAAE,QAAQ;UAChBC,MAAM,EAAE,WAAW;UACnB4B,WAAW,EAAEd,OAAO,CAACe,gBAAgB,IAAIf,OAAO,CAACgB;QACnD,CAAC;MACH,KAAK,gBAAgB;QACnB,OAAO;UAAE/B,MAAM,EAAE,QAAQ;UAAEC,MAAM,EAAE;QAAiB,CAAC;MACvD,KAAK,QAAQ;QACX,OAAO;UAAED,MAAM,EAAE;QAAY,CAAC;MAChC,KAAK,WAAW;QACd,OAAO;UAAEA,MAAM,EAAE;QAAY,CAAC;MAChC,KAAK,aAAa;QAChB,OAAO;UAAEA,MAAM,EAAE,aAAa;UAAEC,MAAM,EAAE;QAAa,CAAC;IAC1D;EACF,CAAC,SAAS;IACR;IACAR,eAAe,CAACM,KAAK,CAAC;EACxB;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,eAAeO,mBAAmBA,CAChCT,OAAiC,EACjCC,OAAmC,EACnCkC,GAA2B,EACI;EAC/B;EACA,IAAI,CAACnC,OAAO,CAACM,QAAQ,EAAE,OAAO;IAAEH,MAAM,EAAE,aAAa;IAAEC,MAAM,EAAE;EAAoB,CAAC;EAEpF,MAAMQ,QAAQ,GAAG,MAAMlB,uBAAuB,CAAC;IAC7CY,QAAQ,EAAEN,OAAO,CAACM,QAAQ;IAC1BO,WAAW,EAAEZ,OAAO,CAACY,WAAW;IAChCC,gBAAgB,EAAEd,OAAO,CAACc,gBAAgB;IAC1CC,KAAK,EAAEd,OAAO,CAACc;EACjB,CAAC,CAAC;EAEF,IAAI,CAACzB,qBAAqB,CACxBsB,QAAQ,CAACU,SAAS,CAACC,KAAK,EACxBX,QAAQ,CAACU,SAAS,CAACc,YAAY,EAC/BnC,OAAO,CAACY,WACV,CAAC,EAAE;IACD,OAAO;MAAEV,MAAM,EAAE,QAAQ;MAAEC,MAAM,EAAE;IAAoB,CAAC;EAC1D;EAEAb,mBAAmB,CAACqB,QAAQ,CAACK,YAAY,CAAC;EAC1C,OAAO;IAAEd,MAAM,EAAE,aAAa;IAAEgC;EAAI,CAAC;AACvC","ignoreList":[]}

package/lib/module/ui/oauth/completeOAuthCode.js

@@ -0,0 +1,75 @@
+"use strict";
+
+/**
+ * The ONE path from an OAuth authorization code to a committed session.
+ *
+ * Both web transports end here — the popup with an in-memory handshake, the
+ * redirect lane with one read back from `sessionStorage` — so state validation,
+ * the PKCE exchange, the session commit, and handshake cleanup exist exactly
+ * once. Duplicating any of those per transport is how the two lanes would drift
+ * apart on the security-critical steps.
+ *
+ * Ordering is deliberate and load-bearing:
+ *   1. validate `state` BEFORE anything is sent to the token endpoint,
+ *   2. exchange the code for a session,
+ *   3. run `cleanup` (drop the persisted handshake / strip `?code=` from the
+ *      URL) BEFORE the commit, so a stale code can never re-enter the exchange,
+ *   4. commit the session.
+ *
+ * `cleanup` runs exactly once on EVERY exit path, including a state mismatch
+ * and a failed exchange.
+ */
+
+import { logger } from '@oxyhq/core';
+
+/** Inputs for {@link completeOAuthCode}. */
+
+export async function completeOAuthCode(input) {
+  let cleaned = false;
+  const runCleanup = () => {
+    if (cleaned) return;
+    cleaned = true;
+    input.cleanup?.();
+  };
+  if (!input.handshake || !input.returnedState || input.handshake.state !== input.returnedState) {
+    logger.warn('OAuth completion rejected: missing or mismatched state', {
+      component: 'completeOAuthCode'
+    });
+    runCleanup();
+    return {
+      ok: false,
+      reason: 'state-mismatch'
+    };
+  }
+  try {
+    const result = await input.oxyServices.exchangeOAuthCode({
+      code: input.code,
+      clientId: input.clientId,
+      redirectUri: input.redirectUri,
+      codeVerifier: input.handshake.codeVerifier
+    });
+    runCleanup();
+    await input.commitSession({
+      sessionId: result.sessionId,
+      accessToken: result.accessToken,
+      deviceId: result.deviceId,
+      deviceSecret: result.deviceSecret,
+      userId: result.user.id,
+      expiresAt: result.expiresAt,
+      user: result.user
+    });
+    return {
+      ok: true
+    };
+  } catch (error) {
+    logger.warn('OAuth code exchange failed', {
+      component: 'completeOAuthCode'
+    }, error);
+    runCleanup();
+    return {
+      ok: false,
+      reason: 'exchange-failed'
+    };
+  }
+}
+//# sourceMappingURL=completeOAuthCode.js.map

package/lib/module/ui/oauth/completeOAuthCode.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["logger","completeOAuthCode","input","cleaned","runCleanup","cleanup","handshake","returnedState","state","warn","component","ok","reason","result","oxyServices","exchangeOAuthCode","code","clientId","redirectUri","codeVerifier","commitSession","sessionId","accessToken","deviceId","deviceSecret","userId","user","id","expiresAt","error"],"sourceRoot":"../../../../src","sources":["ui/oauth/completeOAuthCode.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA,SAASA,MAAM,QAAQ,aAAa;;AAGpC;;AA2BA,OAAO,eAAeC,iBAAiBA,CACrCC,KAA6B,EACG;EAChC,IAAIC,OAAO,GAAG,KAAK;EACnB,MAAMC,UAAU,GAAGA,CAAA,KAAY;IAC7B,IAAID,OAAO,EAAE;IACbA,OAAO,GAAG,IAAI;IACdD,KAAK,CAACG,OAAO,GAAG,CAAC;EACnB,CAAC;EAED,IAAI,CAACH,KAAK,CAACI,SAAS,IAAI,CAACJ,KAAK,CAACK,aAAa,IAAIL,KAAK,CAACI,SAAS,CAACE,KAAK,KAAKN,KAAK,CAACK,aAAa,EAAE;IAC7FP,MAAM,CAACS,IAAI,CAAC,wDAAwD,EAAE;MACpEC,SAAS,EAAE;IACb,CAAC,CAAC;IACFN,UAAU,CAAC,CAAC;IACZ,OAAO;MAAEO,EAAE,EAAE,KAAK;MAAEC,MAAM,EAAE;IAAiB,CAAC;EAChD;EAEA,IAAI;IACF,MAAMC,MAAM,GAAG,MAAMX,KAAK,CAACY,WAAW,CAACC,iBAAiB,CAAC;MACvDC,IAAI,EAAEd,KAAK,CAACc,IAAI;MAChBC,QAAQ,EAAEf,KAAK,CAACe,QAAQ;MACxBC,WAAW,EAAEhB,KAAK,CAACgB,WAAW;MAC9BC,YAAY,EAAEjB,KAAK,CAACI,SAAS,CAACa;IAChC,CAAC,CAAC;IACFf,UAAU,CAAC,CAAC;IACZ,MAAMF,KAAK,CAACkB,aAAa,CAAC;MACxBC,SAAS,EAAER,MAAM,CAACQ,SAAS;MAC3BC,WAAW,EAAET,MAAM,CAACS,WAAW;MAC/BC,QAAQ,EAAEV,MAAM,CAACU,QAAQ;MACzBC,YAAY,EAAEX,MAAM,CAACW,YAAY;MACjCC,MAAM,EAAEZ,MAAM,CAACa,IAAI,CAACC,EAAE;MACtBC,SAAS,EAAEf,MAAM,CAACe,SAAS;MAC3BF,IAAI,EAAEb,MAAM,CAACa;IACf,CAAC,CAAC;IACF,OAAO;MAAEf,EAAE,EAAE;IAAK,CAAC;EACrB,CAAC,CAAC,OAAOkB,KAAK,EAAE;IACd7B,MAAM,CAACS,IAAI,CAAC,4BAA4B,EAAE;MAAEC,SAAS,EAAE;IAAoB,CAAC,EAAEmB,KAAK,CAAC;IACpFzB,UAAU,CAAC,CAAC;IACZ,OAAO;MAAEO,EAAE,EAAE,KAAK;MAAEC,MAAM,EAAE;IAAkB,CAAC;EACjD;AACF","ignoreList":[]}

package/lib/module/ui/oauth/oauthHandshake.js

@@ -0,0 +1,50 @@
+"use strict";
+
+/**
+ * The RP half of an OAuth authorize request: a fresh CSRF `state` + PKCE pair,
+ * and the authorize URL built from them.
+ *
+ * Both web transports start here, and the ONLY difference between them is one
+ * parameter: `popup` asks the IdP for `response_mode=web_message` so the result
+ * comes back to `window.opener` instead of navigating the RP's tab. Everything
+ * else — `S256` PKCE, exact registered `redirect_uri`, random `state` — is
+ * identical, which is what lets both lanes converge on one completion path.
+ */
+
+import { buildOAuthAuthorizeUrl, generateOAuthState, generatePkcePair } from '@oxyhq/core';
+
+/** Inputs for {@link prepareAuthorizeRequest}. */
+
+/** A ready-to-use authorize request plus the secrets that finish it. */
+
+/**
+ * Generate a fresh handshake and build the authorize URL around it.
+ *
+ * The verifier is returned to the caller and never stored here: the popup
+ * transport keeps it in memory for the lifetime of the attempt, and the
+ * redirect transport persists it through `persistOAuthHandshake` because a
+ * full-page navigation destroys the running document.
+ */
+export async function prepareAuthorizeRequest(params) {
+  const [pkce, state] = await Promise.all([generatePkcePair(), generateOAuthState()]);
+  const authorizeUrl = buildOAuthAuthorizeUrl({
+    authorizeBaseUrl: params.authorizeBaseUrl,
+    clientId: params.clientId,
+    redirectUri: params.redirectUri,
+    scope: params.scope,
+    state,
+    codeChallenge: pkce.codeChallenge,
+    ...(params.responseMode ? {
+      responseMode: params.responseMode
+    } : {})
+  });
+  return {
+    authorizeUrl,
+    authorizeOrigin: new URL(authorizeUrl).origin,
+    handshake: {
+      state,
+      codeVerifier: pkce.codeVerifier
+    }
+  };
+}
+//# sourceMappingURL=oauthHandshake.js.map

package/lib/module/ui/oauth/oauthHandshake.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["buildOAuthAuthorizeUrl","generateOAuthState","generatePkcePair","prepareAuthorizeRequest","params","pkce","state","Promise","all","authorizeUrl","authorizeBaseUrl","clientId","redirectUri","scope","codeChallenge","responseMode","authorizeOrigin","URL","origin","handshake","codeVerifier"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthHandshake.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,sBAAsB,EAAEC,kBAAkB,EAAEC,gBAAgB,QAAQ,aAAa;;AAG1F;;AAkBA;;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,uBAAuBA,CAC3CC,MAAqC,EACF;EACnC,MAAM,CAACC,IAAI,EAAEC,KAAK,CAAC,GAAG,MAAMC,OAAO,CAACC,GAAG,CAAC,CAACN,gBAAgB,CAAC,CAAC,EAAED,kBAAkB,CAAC,CAAC,CAAC,CAAC;EAEnF,MAAMQ,YAAY,GAAGT,sBAAsB,CAAC;IAC1CU,gBAAgB,EAAEN,MAAM,CAACM,gBAAgB;IACzCC,QAAQ,EAAEP,MAAM,CAACO,QAAQ;IACzBC,WAAW,EAAER,MAAM,CAACQ,WAAW;IAC/BC,KAAK,EAAET,MAAM,CAACS,KAAK;IACnBP,KAAK;IACLQ,aAAa,EAAET,IAAI,CAACS,aAAa;IACjC,IAAIV,MAAM,CAACW,YAAY,GAAG;MAAEA,YAAY,EAAEX,MAAM,CAACW;IAAa,CAAC,GAAG,CAAC,CAAC;EACtE,CAAC,CAAC;EAEF,OAAO;IACLN,YAAY;IACZO,eAAe,EAAE,IAAIC,GAAG,CAACR,YAAY,CAAC,CAACS,MAAM;IAC7CC,SAAS,EAAE;MAAEb,KAAK;MAAEc,YAAY,EAAEf,IAAI,CAACe;IAAa;EACtD,CAAC;AACH","ignoreList":[]}

package/lib/module/ui/oauth/oauthPopup.js

@@ -0,0 +1,268 @@
+"use strict";
+
+/**
+ * Popup lifecycle for the web OAuth transport.
+ *
+ * Owns the window itself — opening it, navigating it, watching it, and tearing
+ * every listener and timer down — and nothing else: message validation lives in
+ * `oauthPopupMessages.ts`, and the code exchange in `completeOAuthCode.ts`.
+ *
+ * Three browser realities shape this module:
+ *
+ * - **Gesture attribution.** `window.open` only succeeds while the user's click
+ *   is still being handled. Anything awaited first (resolving the application,
+ *   generating PKCE) loses it and the popup is silently blocked. So the window
+ *   is opened EMPTY up front and navigated once the authorize URL exists —
+ *   the same shape as `passkeyHubPopup.ts`.
+ * - **No close event.** A cross-origin popup fires nothing when the user
+ *   dismisses it; polling `closed` is the only mechanism (as in core's
+ *   `AccountDialogController.watchPopup`).
+ * - **No cross-origin reads.** The popup's URL, title, and document are all
+ *   opaque. The authorization result arrives ONLY as a `postMessage`.
+ */
+
+import { canonicalizeOAuthRedirectUri, logger } from '@oxyhq/core';
+import { readOAuthPopupMessage } from "./oauthPopupMessages.js";
+/**
+ * Window name for the sign-in popup. Naming the target means a second press
+ * REUSES the same window instead of stacking a new one behind the first.
+ */
+export const OXY_OAUTH_POPUP_WINDOW_NAME = 'oxy-oauth';
+
+/** Chrome-free window roughly sized for the IdP's sign-in / QR surface. */
+const POPUP_FEATURES = 'popup=yes,width=460,height=700,menubar=no,toolbar=no,location=no,status=no';
+
+/**
+ * How long a popup sign-in may stay unanswered (ms).
+ *
+ * Generous on purpose: the IdP surface can involve scanning a QR and approving
+ * on a phone, so this tracks the authorize handle's own ~5-minute lifetime
+ * rather than a UI-scale timeout. It is a backstop against a wedged popup, not
+ * a pace-setter — a user who gives up closes the window and gets the faster
+ * `closed` outcome.
+ */
+export const DEFAULT_OAUTH_POPUP_TIMEOUT_MS = 300_000;
+
+/** How often the popup's `closed` flag is sampled (ms). */
+const CLOSE_POLL_INTERVAL_MS = 1000;
+
+/**
+ * Grace period (ms) after `closed` flips before reporting cancellation.
+ *
+ * The IdP posts its result and THEN closes itself. Both land as separate tasks,
+ * so a poll tick that happens to fall between them would otherwise turn a
+ * successful sign-in into a "user cancelled". One short grace window lets the
+ * already-queued message win.
+ */
+const CLOSE_GRACE_MS = 400;
+
+/** The `message` half of the DOM host, absent on native and during SSR. */
+
+/** The `open` half of the DOM host, absent on native and during SSR. */
+
+function messageEventHost() {
+  const win = globalThis.window;
+  if (!win || typeof win.addEventListener !== 'function' || typeof win.removeEventListener !== 'function') {
+    return null;
+  }
+  return win;
+}
+
+/**
+ * Open a new, EMPTY sign-in popup.
+ *
+ * MUST be called SYNCHRONOUSLY from a user-gesture handler, before any `await`.
+ * Returns `null` when the browser blocked it, when `window.open` threw, and on
+ * hosts with no DOM (native / SSR) — never throws, because "no popup" is an
+ * ordinary outcome the caller answers by falling back to a redirect.
+ */
+export function openOAuthPopup() {
+  const win = globalThis.window;
+  if (!win || typeof win.open !== 'function') return null;
+  try {
+    return win.open('', OXY_OAUTH_POPUP_WINDOW_NAME, POPUP_FEATURES) ?? null;
+  } catch (error) {
+    logger.warn('Could not open the OAuth sign-in popup', {
+      component: 'oauthPopup'
+    }, error);
+    return null;
+  }
+}
+
+/**
+ * Point an already-open popup at the authorize URL. Returns `false` when the
+ * assignment threw (a window closed between opening and navigating), so the
+ * caller can fall back to a redirect instead of waiting on a dead window.
+ */
+export function navigateOAuthPopup(popup, url) {
+  try {
+    popup.location.href = url;
+    return true;
+  } catch (error) {
+    logger.warn('Could not navigate the OAuth sign-in popup', {
+      component: 'oauthPopup'
+    }, error);
+    return false;
+  }
+}
+
+/** Close the popup if it is still open. Idempotent, null-safe, never throws. */
+export function closeOAuthPopup(popup) {
+  if (!popup || popup.closed) return;
+  try {
+    popup.close();
+  } catch (error) {
+    logger.debug('OAuth popup close failed', {
+      component: 'oauthPopup'
+    }, error);
+  }
+}
+
+/**
+ * When the IdP falls back to a top-level redirect inside the popup (no usable
+ * `window.opener`), a same-origin `redirect_uri` is readable from the opener.
+ * Cross-origin redirects remain opaque and are not handled here.
+ */
+function readSameOriginRedirectOutcome(popup, redirectUri, expectedState) {
+  try {
+    const href = popup.location.href;
+    if (!href) return null;
+    const popupUrl = new URL(href);
+    const expected = new URL(canonicalizeOAuthRedirectUri(redirectUri));
+    if (popupUrl.origin !== expected.origin) return null;
+    if (popupUrl.pathname !== expected.pathname) return null;
+    const oauthError = popupUrl.searchParams.get('error');
+    if (oauthError) {
+      const errorDescription = popupUrl.searchParams.get('error_description') ?? undefined;
+      return {
+        kind: 'oauth-error',
+        error: oauthError,
+        ...(errorDescription ? {
+          errorDescription
+        } : {})
+      };
+    }
+    const code = popupUrl.searchParams.get('code');
+    if (!code) return null;
+    const state = popupUrl.searchParams.get('state');
+    if (!state || state !== expectedState) return {
+      kind: 'state-mismatch'
+    };
+    return {
+      kind: 'code',
+      code,
+      state
+    };
+  } catch {
+    // Cross-origin navigation — the popup URL is opaque to the opener.
+    return null;
+  }
+}
+
+/** Inputs for {@link awaitOAuthPopupResult}. */
+
+/**
+ * Wait for the popup to deliver an authorization result.
+ *
+ * Settles EXACTLY once, with a typed outcome for every path — code, IdP error,
+ * state mismatch, user-closed, timeout — and removes its listener, its close
+ * poll, and both timers before resolving, whatever the outcome. Messages that
+ * arrive after settling reach nothing, so a duplicate delivery is inert.
+ *
+ * Never rejects: closing the window and running out of time are expected
+ * outcomes, not exceptions.
+ */
+export function awaitOAuthPopupResult(options) {
+  const {
+    popup,
+    expectedOrigin,
+    expectedState,
+    redirectUri,
+    timeoutMs = DEFAULT_OAUTH_POPUP_TIMEOUT_MS
+  } = options;
+  const host = messageEventHost();
+  if (!host) return Promise.resolve({
+    kind: 'unsupported'
+  });
+  return new Promise(resolve => {
+    let settled = false;
+    let timeoutTimer = null;
+    let closeGraceTimer = null;
+    let closePoll = null;
+    const onMessage = event => {
+      const verdict = readOAuthPopupMessage(event, {
+        expectedOrigin,
+        expectedState,
+        popup
+      });
+      switch (verdict.kind) {
+        case 'ignore':
+          return;
+        case 'code':
+          settle({
+            kind: 'code',
+            code: verdict.code,
+            state: verdict.state
+          });
+          return;
+        case 'oauth-error':
+          settle({
+            kind: 'oauth-error',
+            error: verdict.error,
+            ...(verdict.errorDescription ? {
+              errorDescription: verdict.errorDescription
+            } : {})
+          });
+          return;
+        case 'state-mismatch':
+          settle({
+            kind: 'state-mismatch'
+          });
+          return;
+      }
+    };
+    const cleanup = () => {
+      host.removeEventListener('message', onMessage);
+      if (timeoutTimer !== null) {
+        clearTimeout(timeoutTimer);
+        timeoutTimer = null;
+      }
+      if (closeGraceTimer !== null) {
+        clearTimeout(closeGraceTimer);
+        closeGraceTimer = null;
+      }
+      if (closePoll !== null) {
+        clearInterval(closePoll);
+        closePoll = null;
+      }
+    };
+    function settle(outcome) {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolve(outcome);
+    }
+    host.addEventListener('message', onMessage);
+    timeoutTimer = setTimeout(() => settle({
+      kind: 'timed-out'
+    }), timeoutMs);
+    closePoll = setInterval(() => {
+      const redirectOutcome = readSameOriginRedirectOutcome(popup, redirectUri, expectedState);
+      if (redirectOutcome) {
+        settle(redirectOutcome);
+        return;
+      }
+      if (!popup.closed) return;
+      // Stop sampling immediately: the window is gone and only the in-flight
+      // message (if any) can still change the outcome.
+      if (closePoll !== null) {
+        clearInterval(closePoll);
+        closePoll = null;
+      }
+      closeGraceTimer = setTimeout(() => settle({
+        kind: 'closed'
+      }), CLOSE_GRACE_MS);
+    }, CLOSE_POLL_INTERVAL_MS);
+  });
+}
+//# sourceMappingURL=oauthPopup.js.map

package/lib/module/ui/oauth/oauthPopup.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["canonicalizeOAuthRedirectUri","logger","readOAuthPopupMessage","OXY_OAUTH_POPUP_WINDOW_NAME","POPUP_FEATURES","DEFAULT_OAUTH_POPUP_TIMEOUT_MS","CLOSE_POLL_INTERVAL_MS","CLOSE_GRACE_MS","messageEventHost","win","globalThis","window","addEventListener","removeEventListener","openOAuthPopup","open","error","warn","component","navigateOAuthPopup","popup","url","location","href","closeOAuthPopup","closed","close","debug","readSameOriginRedirectOutcome","redirectUri","expectedState","popupUrl","URL","expected","origin","pathname","oauthError","searchParams","get","errorDescription","undefined","kind","code","state","awaitOAuthPopupResult","options","expectedOrigin","timeoutMs","host","Promise","resolve","settled","timeoutTimer","closeGraceTimer","closePoll","onMessage","event","verdict","settle","cleanup","clearTimeout","clearInterval","outcome","setTimeout","setInterval","redirectOutcome"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopup.ts"],"mappings":"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","ignoreList":[]}