studio-engine 0.72.3 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13abdd4ef0f10262a6560c40b2bed302c16d9f3b3b21582f3569cf0a7517cdf8
-  data.tar.gz: 6f47a52a0ba75d8be96ff6200b75d30a1ff49d76db401581a17a0ea88b2dcd6c
+  metadata.gz: 60486d6f2711eb8d61d258fa6305f05cfd2d85910858aacc1506dee587f3c114
+  data.tar.gz: beb3d3a69e3c01fca35a1196e37065b56b9b563696e2d7d3c6d15d5718440fd1
 SHA512:
-  metadata.gz: 4b82e9d95ec946a5ce8fdc2d82269eadd8e300bfe21e146163aa0105a3a96254065ac10b26dd6f87a29cff5a402de1ca6d9cb0cdb53ef7119604ee0102b841d5
-  data.tar.gz: f03181c1586eb6c147b50778614df087115b27d1e76eb0dee7236f6e73c68a4509dadde3448d04cb84ea16cad4d20ffbe9eef8fcb7e96eca4be34dbd4c080d52
+  metadata.gz: c668f68df4d51e460a58a3bfb6b8608acb943b9ab75558b7676c9ed79489219e686249e45c20593ec97c70401ed34c9b8ce78fafb927201912c1d0e87012fd1e
+  data.tar.gz: f9f13b69c48bd71d7ad127e1229245a7079dd0155dcfd731fe3044b25fcd439217e6dd61ca3f33b4c73b065cd8d5629dacd500218ac1b27cd02270f528f78e3a

data/app/views/solana_sessions/phantom_callback.html.erb

@@ -137,6 +137,68 @@
     dbg('  ' + key, truncate(val, 40));
   });
 
+  // === THE REDIRECT TRANSPORT'S RETURN LEG ==============================
+  //
+  // TRIED FIRST, AND EVERYTHING BELOW IS LEFT EXACTLY AS IT WAS. The legacy
+  // block that follows handles ONE step — Phantom's signIn — with keys named
+  // phantom_dl_*, and it is what production mobile sign-in runs on TODAY. It is
+  // not touched, moved, or reworded here: a consumer that has not yet adopted
+  // the new transport must behave identically after this change, and the only
+  // honest way to promise that is to leave its code alone.
+  //
+  // GUARDED THE WAY THIS CODEBASE GUARDS EVERY OPTIONAL CAPABILITY: a host that
+  // does not load solana_studio/wallet_ops.js + wallet_journal.js has no
+  // SolanaStudio.walletOps, so this branch never runs and the legacy path is
+  // the whole program. An absent capability must not default to the permissive
+  // branch — the same rule the wallet picker's canDeepLink learned.
+  //
+  // WHY THE PENDING-JOURNAL CHECK IS PART OF THE GUARD, not just the globals:
+  // a host may load the new scripts while a signIn started under the OLD keys
+  // is still in flight — a user mid-round-trip across a deploy. Requiring an
+  // actual wallet_dl journal means that user finishes on the path they started,
+  // rather than being handed to a resumer with nothing to resume.
+  //
+  // WHAT THIS BRANCH DOES NOT DO: decrypt, verify, or know what the user was
+  // trying to accomplish. walletOps owns the step machine and the registered
+  // intent owns the outcome. This is a seam, and keeping it a seam is what lets
+  // the same callback serve sign-in and a contest entry without learning either.
+  var studio = window.SolanaStudio;
+  var hasResumer = !!(studio && studio.walletOps && typeof studio.walletOps.resume === 'function' &&
+                      studio.walletJournal && typeof studio.walletJournal.peek === 'function');
+
+  if (hasResumer && studio.walletJournal.peek()) {
+    dbg('Transport', 'wallet_dl journal present — resuming through walletOps');
+
+    studio.walletOps.resume(params, {
+      navigate: function(url) { window.location.href = url; }
+    }).then(function(result) {
+      // SUSPENDED means resume already navigated to the next hop; this document
+      // is on its way out and must not also redirect, or the two race.
+      if (result && result.suspended) {
+        dbg('Transport', 'advanced to the next hop');
+        return;
+      }
+      if (result && result.done) {
+        dbg('Transport', 'intent complete');
+        // The registered intent owns where to land — it knows what the user was
+        // doing. Falling back to '/' rather than guessing a wallet-specific
+        // destination, which this file has no business knowing.
+        window.location.href = (result.value && result.value.redirect) || '/';
+        return;
+      }
+      // No pending request is a STATE, not a failure: a stale bookmark, a second
+      // tab, a reload after the journal was consumed. peek() said otherwise a
+      // moment ago, so this is a race, and the honest answer is to start over.
+      showError('No pending wallet request. Redirecting to login...');
+    }, function(err) {
+      // A user rejection arrives here with .rejected set — the wallet's own
+      // words, already mapped. Anything else is a genuine fault.
+      dbg('Transport ERROR', (err && err.message) || String(err));
+      showError((err && err.message) || 'Wallet request failed');
+    });
+    return;
+  }
+
   // Check for Phantom error
   if (params.get('errorCode')) {
     dbg('ERROR', 'errorCode=' + params.get('errorCode'));

data/lib/studio/version.rb

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.72.3"
+  VERSION = "0.73.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.72.3
+  version: 0.73.0
 platform: ruby
 authors:
 - Alex McRitchie