From 298aba26f4e0b9bf1e5a131a145afd31d81e15e6 Mon Sep 17 00:00:00 2001
From: Tristan Edwards <tristan.edwards@me.com>
Date: Thu, 9 May 2019 12:17:01 +0200
Subject: [PATCH 1/3] Support Safello redirect URLs

When the user buys bitcoin through Safello, they will be redirected to
the Yoti app to verify their identity.

Previously, when the process was done, they
would be redirected to a browser window to continue their purchase, but
since bluewallet has a `bluewallet://` redirect URI associated to its
app ID, we can redirect them back to the app with a
`safello-state-token` query parameter appended to the URI instead.

Bluewallet then simply needs to check if that query parameter is
present, and if so, open a new WebView with the same Safello URL +
`stateToken=xxx` in order to resume the user's session. This way, the
whole buying process can take place inside Bluewallet's app, which
is a clear improvement in terms of user experience.
---
 App.js                       | 21 +++++++++++++++++++++
 screen/wallets/buyBitcoin.js | 24 +++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/App.js b/App.js
index 72a17defe..7b2f419a8 100644
--- a/App.js
+++ b/App.js
@@ -95,6 +95,12 @@ export default class App extends React.Component {
     return isValidLightningInvoice;
   }
 
+  isSafelloRedirect(event) {
+    let urlObject = url.parse(event.url, true) // eslint-disable-line
+
+    return !!urlObject.query["safello-state-token"]
+  }
+
   handleOpenURL = event => {
     if (event.url === null) {
       return;
@@ -122,6 +128,21 @@ export default class App extends React.Component {
             },
           }),
         );
+    } else if (this.isSafelloRedirect(event)) {
+      let urlObject = url.parse(event.url, true) // eslint-disable-line
+
+       const safelloStateToken = urlObject.query["safello-state-token"]
+
+       this.navigator &&
+        this.navigator.dispatch(
+          NavigationActions.navigate({
+            routeName: "BuyBitcoin",
+            params: {
+              uri: event.url,
+              safelloStateToken,
+            },
+          }),
+        )
     } else {
       let urlObject = url.parse(event.url, true); // eslint-disable-line
       console.log('parsed', urlObject);
diff --git a/screen/wallets/buyBitcoin.js b/screen/wallets/buyBitcoin.js
index 764203961..d5b274987 100644
--- a/screen/wallets/buyBitcoin.js
+++ b/screen/wallets/buyBitcoin.js
@@ -63,7 +63,29 @@ export default class BuyBitcoin extends Component {
       return <BlueLoading />;
     }
 
-    return <WebView source={{ uri: 'https://bluewallet.io/buy-bitcoin-redirect.html?address=' + this.state.address }} />;
+    const { safelloStateToken } = this.props.navigation.state.params
+
+     if (safelloStateToken) {
+      return (
+        <WebView
+          source={{
+            uri:
+              "https://app.safello.com/sdk/quickbuy.html?appId=1234-5678&stateToken=" +
+              safelloStateToken,
+          }}
+        />
+      )
+    }
+
+     return (
+      <WebView
+        source={{
+          uri:
+            "https://bluewallet.io/buy-bitcoin-redirect.html?address=" +
+            this.state.address,
+        }}
+      />
+    )
   }
 }
 

From 1a1557255f214594271176ffa02eb285d742e164 Mon Sep 17 00:00:00 2001
From: Tristan Edwards <tristan.edwards@me.com>
Date: Thu, 9 May 2019 14:06:44 +0200
Subject: [PATCH 2/3] Add safelloStateToken PropType

---
 screen/wallets/buyBitcoin.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/screen/wallets/buyBitcoin.js b/screen/wallets/buyBitcoin.js
index d5b274987..5bb2ae003 100644
--- a/screen/wallets/buyBitcoin.js
+++ b/screen/wallets/buyBitcoin.js
@@ -96,6 +96,7 @@ BuyBitcoin.propTypes = {
       params: PropTypes.shape({
         address: PropTypes.string,
         secret: PropTypes.string,
+        safelloStateToken: PropTypes.string,
       }),
     }),
   }),

From 9981ebe4f78f26e32c95d08bdb0a3e8d0e6b1cd5 Mon Sep 17 00:00:00 2001
From: Tristan Edwards <tristan.edwards@me.com>
Date: Fri, 10 May 2019 13:52:08 +0200
Subject: [PATCH 3/3] Use bluewallet redirect URL

---
 screen/wallets/buyBitcoin.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/screen/wallets/buyBitcoin.js b/screen/wallets/buyBitcoin.js
index 5bb2ae003..3406d852f 100644
--- a/screen/wallets/buyBitcoin.js
+++ b/screen/wallets/buyBitcoin.js
@@ -65,24 +65,16 @@ export default class BuyBitcoin extends Component {
 
     const { safelloStateToken } = this.props.navigation.state.params
 
-     if (safelloStateToken) {
-      return (
-        <WebView
-          source={{
-            uri:
-              "https://app.safello.com/sdk/quickbuy.html?appId=1234-5678&stateToken=" +
-              safelloStateToken,
-          }}
-        />
-      )
+    let uri = "https://bluewallet.io/buy-bitcoin-redirect.html?address=" + this.state.address
+
+    if (safelloStateToken) {
+      uri += "&safelloStateToken=" + safelloStateToken
     }
 
      return (
       <WebView
         source={{
-          uri:
-            "https://bluewallet.io/buy-bitcoin-redirect.html?address=" +
-            this.state.address,
+          uri,
         }}
       />
     )