@ankhorage/studio 1.6.0 → 1.8.0

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

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

@@ -12,6 +12,11 @@ export function getAuthOAuthRuntimeTs(args) {
   AuthOAuthCompletionResult,
   AuthOAuthTransportCancellationReason,
 } from '@ankhorage/contracts/auth';
+import {
+  resolveExpoOAuthBrowserException,
+  resolveExpoOAuthBrowserResult,
+} from '@ankhorage/expo-runtime/oauth-browser';
+import { resolveExpoOAuthBrowserRuntimeReadiness } from '@ankhorage/expo-runtime/oauth-browser-runtime';
 import * as Linking from 'expo-linking';
 import * as WebBrowser from 'expo-web-browser';
 import { Platform } from 'react-native';
@@ -90,6 +95,17 @@ async function runOAuthAuthorization(
     };
   }
 
+  if (Platform.OS !== 'web') {
+    const runtimeReadiness = resolveExpoOAuthBrowserRuntimeReadiness();
+    if (runtimeReadiness.status !== 'ready') {
+      return {
+        status: 'error',
+        message: runtimeReadiness.message,
+        recoverable: true,
+      };
+    }
+  }
+
   const started = await oauth.startAuthorization({
     provider: provider.id,
     redirectUri,
@@ -126,32 +142,35 @@ async function runOAuthAuthorization(
     });
   }
 
-  let browserResult: WebBrowser.WebBrowserAuthSessionResult;
+  let browserResponse;
   try {
-    browserResult = await WebBrowser.openAuthSessionAsync(
+    const browserResult = await WebBrowser.openAuthSessionAsync(
       started.data.authorizationUrl,
       started.data.redirectUri,
     );
+    browserResponse = resolveExpoOAuthBrowserResult(browserResult);
+  } catch {
+    browserResponse = resolveExpoOAuthBrowserException();
+  }
+
+  if (browserResponse.type === 'callback') {
+    return completeOAuthCallback(browserResponse.url);
+  }
+
+  let completed: AuthOAuthCompletionResult;
+  try {
+    completed = await oauth.completeAuthorization({
+      attemptId: started.data.attemptId,
+      response: browserResponse,
+    });
   } catch {
-    await cancelOAuthAttempt(started.data.attemptId, 'browser_dismissed');
     await clearTransportAttempt();
     return {
       status: 'error',
-      message: 'The system authentication browser could not be opened.',
+      message: 'The OAuth browser result could not be completed.',
       recoverable: true,
     };
   }
-
-  if (browserResult.type === 'success' && typeof browserResult.url === 'string') {
-    return completeOAuthCallback(browserResult.url);
-  }
-
-  const cancellationReason =
-    browserResult.type === 'dismiss' ? 'browser_dismissed' : 'user_cancelled';
-  const completed = await oauth.completeAuthorization({
-    attemptId: started.data.attemptId,
-    response: { type: 'cancelled', reason: cancellationReason },
-  });
   await clearTransportAttempt();
   return toTransportOutcome(completed);
 }

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;;;;;;;;;;;;;;gCAcuB,aAAa;;;oCAGT,SAAS;;aAEhC,aAAa;SACjB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgWjB,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;;;oCAGT,SAAS;;aAEhC,aAAa;SACjB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8WjB,CAAC;AACF,CAAC"}

package/dist/host/orchestrator/templates.js

@@ -8,7 +8,7 @@ const UTILITY_VERSION = '^0.2.0';
 const SUPABASE_AUTH_VERSION = '^1.1.2';
 const SUPABASE_DB_VERSION = '^1.0.0';
 const ZORA_VERSION = '^2.9.0';
-const EXPO_RUNTIME_VERSION = '^2.2.1';
+const EXPO_RUNTIME_VERSION = '^2.5.0';
 const EXPO_DOCUMENT_PICKER_VERSION = '~14.0.8';
 const EXPO_FILE_SYSTEM_VERSION = '~19.0.23';
 const EXPO_IMAGE_PICKER_VERSION = '~17.0.11';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ankhorage/studio",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "Studio authoring package for Ankhorage apps",
   "license": "MIT",
   "homepage": "https://github.com/ankhorage/studio#readme",
@@ -205,7 +205,7 @@
     "@ankhorage/color-theory": "^0.0.8",
     "@ankhorage/contracts": "^7.8.0",
     "@ankhorage/data-sources": "^1.0.1",
-    "@ankhorage/expo-runtime": "^2.3.0",
+    "@ankhorage/expo-runtime": "^2.5.0",
     "@ankhorage/infra": "^3.3.0",
     "@ankhorage/orchestrator": "^0.3.0",
     "@ankhorage/orchestrator-module-expo-google-fonts": "^0.2.0",