From 5355269f5d1cbcb2cd0eaf960fcffad36c80d9f4 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 28 Nov 2019 00:44:59 +0100
Subject: [PATCH] Check if external app by object (#4280)

* Check if external app by object

* Update core.ts

* Conditional chaining

* add babel optional chaining
---
 build-scripts/babel.js  |  1 +
 package.json            |  1 +
 src/entrypoints/core.ts |  5 ++++-
 yarn.lock               | 15 +++++++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/build-scripts/babel.js b/build-scripts/babel.js
index 67021b92c4..f17e55b584 100644
--- a/build-scripts/babel.js
+++ b/build-scripts/babel.js
@@ -33,6 +33,7 @@ module.exports.babelLoaderConfig = ({ latestBuild }) => {
               pragma: "h",
             },
           ],
+          "@babel/plugin-proposal-optional-chaining",
           [
             require("@babel/plugin-proposal-decorators").default,
             { decoratorsBeforeExport: true },
diff --git a/package.json b/package.json
index 7aafc6f63f..0e2d973d9e 100644
--- a/package.json
+++ b/package.json
@@ -110,6 +110,7 @@
     "@babel/plugin-proposal-class-properties": "^7.7.4",
     "@babel/plugin-proposal-decorators": "^7.7.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.7.4",
     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
     "@babel/plugin-transform-react-jsx": "^7.7.4",
     "@babel/preset-env": "^7.7.4",
diff --git a/src/entrypoints/core.ts b/src/entrypoints/core.ts
index 1159021f21..2515f4e86b 100644
--- a/src/entrypoints/core.ts
+++ b/src/entrypoints/core.ts
@@ -23,7 +23,10 @@ declare global {
   }
 }
 
-const isExternal = location.search.includes("external_auth=1");
+const isExternal =
+  window.externalApp ||
+  window.webkit?.messageHandlers?.getExternalAuth ||
+  location.search.includes("external_auth=1");
 
 const authProm = isExternal
   ? () =>
diff --git a/yarn.lock b/yarn.lock
index 016459d6e1..e63a4f791e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -540,6 +540,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
 
+"@babel/plugin-proposal-optional-chaining@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.4.tgz#3f04c2de1a942cbd3008324df8144b9cbc0ca0ba"
+  integrity sha512-JmgaS+ygAWDR/STPe3/7y0lNlHgS+19qZ9aC06nYLwQ/XB7c0q5Xs+ksFU3EDnp9EiEsO0dnRAOKeyLHTZuW3A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.7.4"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
@@ -625,6 +633,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-optional-chaining@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz#c91fdde6de85d2eb8906daea7b21944c3610c901"
+  integrity sha512-2MqYD5WjZSbJdUagnJvIdSfkb/ucOC9/1fRJxm7GAxY6YQLWlUvkfxoNbUPcPLHJyetKUDQ4+yyuUyAoc0HriA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-top-level-await@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"