@ankhorage/studio 0.11.7 → 0.11.9

package/dist/host/layout/templates/auth/callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/callback.ts"],"names":[],"mappings":"AAGA,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,UA+G7F"}
+{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/callback.ts"],"names":[],"mappings":"AAGA,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,UAkI7F"}

package/dist/host/layout/templates/auth/callback.js

@@ -5,38 +5,57 @@ export function getAuthOAuthCallbackTsx(args) {
     const postSignInTarget = escapeStringLiteral(routeNameToGroupedHref(args.postSignInRoute, 'app'));
     return `import * as Linking from 'expo-linking';
 import { Stack, useRouter } from 'expo-router';
-import * as WebBrowser from 'expo-web-browser';
 import { useEffect, useRef, useState } from 'react';
-import { ActivityIndicator, Platform, Pressable, StyleSheet, View } from 'react-native';
+import { ActivityIndicator, Pressable, StyleSheet, View } from 'react-native';
 import { Text, useZoraTheme } from '@ankhorage/zora';
 
 import { completeOAuthCallback } from '@/auth/oauth';
 
 const SIGN_IN_ROUTE = '${signInTarget}';
 const POST_SIGN_IN_ROUTE = '${postSignInTarget}';
-const webBrowserCompletion =
-  Platform.OS === 'web' ? WebBrowser.maybeCompleteAuthSession() : null;
 const callbackScreenOptions = { title: 'Completing sign in' };
 
+interface ActiveCallbackCompletion {
+  callbackUrl: string;
+  promise: ReturnType<typeof completeOAuthCallback>;
+}
+
+let activeCallbackCompletion: ActiveCallbackCompletion | null = null;
+
+function completeOAuthCallbackOnce(callbackUrl: string) {
+  if (!activeCallbackCompletion || activeCallbackCompletion.callbackUrl !== callbackUrl) {
+    activeCallbackCompletion = {
+      callbackUrl,
+      promise: completeOAuthCallback(callbackUrl),
+    };
+  }
+  return activeCallbackCompletion.promise;
+}
+
 export default function OAuthCallbackScreen() {
   const router = useRouter();
   const callbackUrl = Linking.useURL();
   const { theme } = useZoraTheme();
-  const handledRef = useRef(false);
+  const handledOutcomeRef = useRef(false);
   const [message, setMessage] = useState('Completing secure sign in…');
   const [failed, setFailed] = useState(false);
 
   useEffect(() => {
-    if (webBrowserCompletion?.type === 'success' || handledRef.current) return;
-
     let active = true;
     void (async () => {
       const deliveredUrl = callbackUrl ?? (await Linking.getInitialURL());
-      if (!deliveredUrl || handledRef.current) return;
-      handledRef.current = true;
+      if (!deliveredUrl) {
+        if (active && !handledOutcomeRef.current) {
+          handledOutcomeRef.current = true;
+          setFailed(true);
+          setMessage('The OAuth callback URL is unavailable.');
+        }
+        return;
+      }
 
-      const outcome = await completeOAuthCallback(deliveredUrl);
-      if (!active) return;
+      const outcome = await completeOAuthCallbackOnce(deliveredUrl);
+      if (!active || handledOutcomeRef.current) return;
+      handledOutcomeRef.current = true;
 
       if (outcome.status === 'authenticated') {
         router.replace(POST_SIGN_IN_ROUTE);

package/dist/host/layout/templates/auth/callback.js.map

@@ -1 +1 @@
-{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,UAAU,uBAAuB,CAAC,IAAsD;IAC5F,MAAM,YAAY,GAAG,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3F,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;IAElG,OAAO;;;;;;;;;yBASgB,YAAY;8BACP,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgG7C,CAAC;AACF,CAAC"}
+{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,UAAU,uBAAuB,CAAC,IAAsD;IAC5F,MAAM,YAAY,GAAG,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3F,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;IAElG,OAAO;;;;;;;;yBAQgB,YAAY;8BACP,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoH7C,CAAC;AACF,CAAC"}

package/dist/host/layout/templates/auth/oauth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/oauth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAG5E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,UA0Q9D"}
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/oauth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAG5E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,UAoU9D"}

package/dist/host/layout/templates/auth/oauth.js

@@ -70,7 +70,17 @@ async function runOAuthAuthorization(
     };
   }
 
-  const redirectUri = resolveOAuthRedirectUri();
+  let redirectUri: string;
+  try {
+    redirectUri = resolveOAuthRedirectUri();
+  } catch {
+    return {
+      status: 'error',
+      message: 'The OAuth redirect URI could not be resolved in this environment.',
+      recoverable: true,
+    };
+  }
+
   const started = await oauth.startAuthorization({
     provider: provider.id,
     redirectUri,
@@ -101,6 +111,13 @@ async function runOAuthAuthorization(
     };
   }
 
+  if (Platform.OS === 'web') {
+    return redirectWebAuthorization({
+      attemptId: started.data.attemptId,
+      authorizationUrl: started.data.authorizationUrl,
+    });
+  }
+
   let browserResult: WebBrowser.WebBrowserAuthSessionResult;
   try {
     browserResult = await WebBrowser.openAuthSessionAsync(
@@ -131,6 +148,42 @@ async function runOAuthAuthorization(
   return toTransportOutcome(completed);
 }
 
+async function redirectWebAuthorization(args: {
+  attemptId: string;
+  authorizationUrl: string;
+}): Promise<GeneratedOAuthTransportOutcome> {
+  const location = getBrowserLocation();
+  const assign = location ? Reflect.get(location, 'assign') : undefined;
+  if (typeof assign !== 'function') {
+    await cancelOAuthAttempt(args.attemptId, 'browser_dismissed');
+    await clearTransportAttempt();
+    return {
+      status: 'error',
+      message: 'Web OAuth requires full-page browser navigation.',
+      recoverable: true,
+    };
+  }
+
+  try {
+    Reflect.apply(assign, location, [args.authorizationUrl]);
+    return waitForFullPageNavigation();
+  } catch {
+    await cancelOAuthAttempt(args.attemptId, 'browser_dismissed');
+    await clearTransportAttempt();
+    return {
+      status: 'error',
+      message: 'The browser could not navigate to the OAuth provider.',
+      recoverable: true,
+    };
+  }
+}
+
+function waitForFullPageNavigation(): Promise<never> {
+  return new Promise<never>(() => {
+    // Full-page navigation replaces this document before the promise settles.
+  });
+}
+
 export async function completeOAuthCallback(
   callbackUrl: string,
 ): Promise<GeneratedOAuthTransportOutcome> {
@@ -171,15 +224,15 @@ export async function completeOAuthCallback(
 }
 
 function resolveOAuthRedirectUri(): string {
-  const callbackPath = OAUTH_CALLBACK_ROUTE.replace(/^\/+/, '');
+  let callbackPath = OAUTH_CALLBACK_ROUTE;
+  while (callbackPath.startsWith('/')) {
+    callbackPath = callbackPath.slice(1);
+  }
   if (Platform.OS === 'web') {
-    const location = Reflect.get(globalThis, 'location');
-    if (
-      typeof location === 'object' &&
-      location !== null &&
-      typeof Reflect.get(location, 'origin') === 'string'
-    ) {
-      return new URL(\`/\${callbackPath}\`, Reflect.get(location, 'origin')).toString();
+    const location = getBrowserLocation();
+    const origin = location ? Reflect.get(location, 'origin') : undefined;
+    if (typeof origin === 'string' && origin.length > 0) {
+      return new URL(\`/\${callbackPath}\`, origin).toString();
     }
     throw new Error('Web OAuth requires a canonical browser origin.');
   }
@@ -187,6 +240,11 @@ function resolveOAuthRedirectUri(): string {
   return Linking.createURL(callbackPath);
 }
 
+function getBrowserLocation(): object | null {
+  const location = Reflect.get(globalThis, 'location');
+  return typeof location === 'object' && location !== null ? location : null;
+}
+
 function toTransportOutcome(
   result: AuthOAuthCompletionResult,
 ): GeneratedOAuthTransportOutcome {

package/dist/host/layout/templates/auth/oauth.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/oauth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEjD,OAAO;;;;;;;;;;;;;;;gCAeuB,aAAa;;oCAET,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoP5C,CAAC;AACF,CAAC"}
+{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/oauth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEjD,OAAO;;;;;;;;;;;;;;;gCAeuB,aAAa;;oCAET,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8S5C,CAAC;AACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ankhorage/studio",
-  "version": "0.11.7",
+  "version": "0.11.9",
   "description": "Studio authoring package for Ankhorage apps",
   "license": "MIT",
   "homepage": "https://github.com/ankhorage/studio#readme",