core: fix safari weirdness on async methods and window open

koush · Feb 25, 2023 · 3812ad9 · 3812ad9
1 parent 0bdb402
commit 3812ad9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/plugins/core/package-lock.json b/plugins/core/package-lock.json
diff --git a/plugins/core/package.json b/plugins/core/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/core",
-   "version": "0.1.92",
+   "version": "0.1.93",
    "description": "Scrypted Core plugin. Provides the UI, websocket, and engine.io APIs.",
    "author": "Scrypted",
    "license": "Apache-2.0",

diff --git a/plugins/core/ui/src/interfaces/OauthClient.vue b/plugins/core/ui/src/interfaces/OauthClient.vue
@@ -17,6 +17,8 @@ export default {
       }
     },
     onClick: function () {
+      // https://stackoverflow.com/a/39387533
+      const windowReference = this.isIFrame() ? window.open(undefined, '_blank') : undefined;
       this.rpc()
         .getOauthUrl()
         .then(data => {
@@ -47,8 +49,10 @@ export default {
             r: window.location.toString(),
           });
           url.search = qs.stringify(querystring);
-          const target = this.isIFrame() ? '_blank' : undefined;
-          window.open(url.toString(), target);
+          if (windowReference)
+            windowReference.location = url.toString();
+          else
+            window.location = url.toString();
         });
     }
   }