@ankhorage/studio 1.12.0 → 1.12.1

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,UA4I7F"}
+{"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,UAoJ7F"}

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

@@ -3,13 +3,15 @@ import { routeNameToGroupedHref } from '../utils/routes';
 export function getAuthOAuthCallbackTsx(args) {
     const signInTarget = escapeStringLiteral(routeNameToGroupedHref(args.signInRoute, 'auth'));
     const postSignInTarget = escapeStringLiteral(routeNameToGroupedHref(args.postSignInRoute, 'app'));
-    return `import * as Linking from 'expo-linking';
-import { Stack, useRouter } from 'expo-router';
-import { useEffect, useRef, useState } from 'react';
+    return `import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { ActivityIndicator, Pressable, StyleSheet, View } from 'react-native';
 import { Text, useZoraTheme } from '@ankhorage/zora';
 
-import { completeOAuthCallback } from '@/auth/oauth';
+import {
+  completeOAuthCallback,
+  resolveOAuthCallbackUrl,
+} from '@/auth/oauth';
 
 const SIGN_IN_ROUTE = '${signInTarget}';
 const POST_SIGN_IN_ROUTE = '${postSignInTarget}';
@@ -44,7 +46,14 @@ function completeOAuthCallbackOnce(callbackUrl: string) {
 
 export default function OAuthCallbackScreen() {
   const router = useRouter();
-  const callbackUrl = Linking.useURL();
+  const callbackParams = useLocalSearchParams<Record<string, string | string[] | undefined>>();
+  const callbackUrl = useMemo(() => {
+    try {
+      return resolveOAuthCallbackUrl(callbackParams);
+    } catch {
+      return null;
+    }
+  }, [callbackParams]);
   const { theme } = useZoraTheme();
   const handledOutcomeRef = useRef(false);
   const [message, setMessage] = useState('Completing secure sign in…');
@@ -53,17 +62,16 @@ export default function OAuthCallbackScreen() {
   useEffect(() => {
     let active = true;
     void (async () => {
-      const deliveredUrl = callbackUrl ?? (await Linking.getInitialURL());
-      if (!deliveredUrl) {
+      if (!callbackUrl) {
         if (active && !handledOutcomeRef.current) {
           handledOutcomeRef.current = true;
           setFailed(true);
-          setMessage('The OAuth callback URL is unavailable.');
+          setMessage('The OAuth callback URL could not be resolved.');
         }
         return;
       }
 
-      const outcome = await completeOAuthCallbackOnce(deliveredUrl);
+      const outcome = await completeOAuthCallbackOnce(callbackUrl);
       if (!active || handledOutcomeRef.current) return;
       handledOutcomeRef.current = true;
 

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;;;;;;;;yBAQgB,YAAY;8BACP,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8H7C,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;;;;;;;;;;yBAUgB,YAAY;8BACP,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoI7C,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,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAEnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAG5E,UAAU,4BAA6B,SAAQ,mBAAmB;IAChE,QAAQ,CAAC,aAAa,EAAE,0BAA0B,CAAC;CACpD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,4BAA4B,UAoZvE"}
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/oauth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAEnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAG5E,UAAU,4BAA6B,SAAQ,mBAAmB;IAChE,QAAQ,CAAC,aAAa,EAAE,0BAA0B,CAAC;CACpD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,4BAA4B,UAsZvE"}

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

@@ -28,8 +28,7 @@ import {
 } from './session';
 
 const OAUTH_CALLBACK_ROUTE = '${callbackRoute}';
-const OAUTH_TRANSPORT_ATTEMPT_KEY = 'ankh.auth.oauth.transport.v2';
-const LEGACY_OAUTH_TRANSPORT_ATTEMPT_KEY = 'ankh.auth.oauth.transport.v1';
+const OAUTH_TRANSPORT_ATTEMPT_KEY = 'ankh.auth.oauth.transport';
 const GENERATED_OAUTH_PROVIDERS = ${providers} as const;
 const GENERATED_NATIVE_SCHEMES = {
   android: ${androidScheme},
@@ -48,10 +47,13 @@ export type GeneratedOAuthTransportOutcome =
   | { status: 'error'; message: string; recoverable: boolean };
 
 interface StoredTransportAttempt {
-  version: 1;
   attemptId: string;
 }
 
+export type OAuthCallbackRouteParams = Readonly<
+  Record<string, string | string[] | undefined>
+>;
+
 let activeAuthorization: Promise<GeneratedOAuthTransportOutcome> | null = null;
 
 export function startOAuthAuthorization(
@@ -122,7 +124,6 @@ async function runOAuthAuthorization(
 
   try {
     await writeTransportAttempt({
-      version: 1,
       attemptId: started.data.attemptId,
     });
   } catch {
@@ -211,6 +212,19 @@ function waitForFullPageNavigation(): Promise<never> {
   });
 }
 
+export function resolveOAuthCallbackUrl(params: OAuthCallbackRouteParams): string {
+  const callbackUrl = new URL(resolveOAuthRedirectUri());
+  for (const [name, value] of Object.entries(params)) {
+    if (name === '#') continue;
+    if (Array.isArray(value)) {
+      for (const item of value) callbackUrl.searchParams.append(name, item);
+      continue;
+    }
+    if (typeof value === 'string') callbackUrl.searchParams.append(name, value);
+  }
+  return callbackUrl.toString();
+}
+
 export async function completeOAuthCallback(
   callbackUrl: string,
 ): Promise<GeneratedOAuthTransportOutcome> {
@@ -351,23 +365,18 @@ async function cancelOAuthAttempt(
 }
 
 async function writeTransportAttempt(attempt: StoredTransportAttempt): Promise<void> {
-  await clearLegacyTransportAttempt();
   await authSessionStorage.setItem(OAUTH_TRANSPORT_ATTEMPT_KEY, JSON.stringify(attempt));
 }
 
 async function readTransportAttempt(): Promise<StoredTransportAttempt | null> {
   const raw = await authSessionStorage.getItem(OAUTH_TRANSPORT_ATTEMPT_KEY);
-  if (!raw) {
-    await clearLegacyTransportAttempt();
-    return null;
-  }
+  if (!raw) return null;
   try {
     const value: unknown = JSON.parse(raw);
     if (isRecord(value)) {
-      const version = Reflect.get(value, 'version');
       const attemptId = Reflect.get(value, 'attemptId');
-      if (version === 1 && typeof attemptId === 'string' && attemptId.trim().length > 0) {
-        return { version, attemptId };
+      if (typeof attemptId === 'string' && attemptId.trim().length > 0) {
+        return { attemptId };
       }
     }
   } catch {
@@ -378,14 +387,7 @@ async function readTransportAttempt(): Promise<StoredTransportAttempt | null> {
 }
 
 async function clearTransportAttempt(): Promise<void> {
-  await Promise.all([
-    safeRemoveTransportItem(OAUTH_TRANSPORT_ATTEMPT_KEY),
-    safeRemoveTransportItem(LEGACY_OAUTH_TRANSPORT_ATTEMPT_KEY),
-  ]);
-}
-
-async function clearLegacyTransportAttempt(): Promise<void> {
-  await safeRemoveTransportItem(LEGACY_OAUTH_TRANSPORT_ATTEMPT_KEY);
+  await safeRemoveTransportItem(OAUTH_TRANSPORT_ATTEMPT_KEY);
 }
 
 async function safeRemoveTransportItem(key: string): Promise<void> {

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":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAMtE,MAAM,UAAU,qBAAqB,CAAC,IAAkC;IACtE,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,aAAa,GACjB,IAAI,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS;QACtC,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC;IAC7D,MAAM,SAAS,GACb,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,SAAS;QAClC,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;IAEzD,OAAO;;;;;;;;;;;;;;;;;;;gCAmBuB,aAAa;;;oCAGT,SAAS;;aAEhC,aAAa;SACjB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8WjB,CAAC;AACF,CAAC"}
+{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../src/host/layout/templates/auth/oauth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAMtE,MAAM,UAAU,qBAAqB,CAAC,IAAkC;IACtE,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,aAAa,GACjB,IAAI,CAAC,aAAa,CAAC,OAAO,KAAK,SAAS;QACtC,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC;IAC7D,MAAM,SAAS,GACb,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,SAAS;QAClC,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;IAEzD,OAAO;;;;;;;;;;;;;;;;;;;gCAmBuB,aAAa;;oCAET,SAAS;;aAEhC,aAAa;SACjB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiXjB,CAAC;AACF,CAAC"}

package/package.json

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