better OAuth

MatthieuJnon · MatthieuJnon · commit dee164080801 · 2018-11-23T14:32:53.000+01:00
diff --git a/public/index.html b/public/index.html
@@ -19,6 +19,11 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
+    <script>
+      if(window.location.href.includes("access")) {
+        window.opener.postMessage({url : window.location.href, origin: "lyrebird"}, '*');
+      }
+    </script>
     <title>React App</title>
   </head>
   <body>
diff --git a/src/Connection/index.js b/src/Connection/index.js
@@ -1,12 +1,11 @@
 import React from "react";
 import { Login } from "./actions";
 import { connect } from "react-redux";
-import env from "utils/env"
+import env from "utils/env";
 
 import Heading from "react-bulma-components/lib/components/heading";
 import Modal from "react-bulma-components/lib/components/modal";
 
-
 class Connection extends React.Component {
   constructor(props) {
     super(props);
@@ -17,33 +16,29 @@ class Connection extends React.Component {
   checkPopup() {
     const check = setInterval(() => {
       const { popup } = this;
-      let url;
-
-      try {
-        url = popup.location.href;
-      } catch (error) {
-        url = "";
-      }
 
-      if (!popup || popup.closed || popup.closed === undefined) {
+      if ((!popup || popup.closed || popup.closed === undefined) && !this.props.logged) {
         clearInterval(check);
         this.props.Login("RESET");
-      } else if (url.includes("access")) {
-        clearInterval(check);
+      }
+    }, 100);
 
-        popup.close();
+    window.addEventListener("message", event => {
+      if (event.data.origin === "lyrebird") {
+        this.popup.close();
 
-        console.log(url);
+        let url = event.data.url;
 
         let token = url.substring(
           url.indexOf("#access_token=") + 14,
           url.indexOf("&token_type")
         );
 
-        console.log(token);
         this.props.Login("SUCCESS", token);
+      } else {
+        return;
       }
-    }, 100);
+    });
   }
 
   logIn() {
@@ -53,7 +48,6 @@ class Connection extends React.Component {
     const top = window.innerHeight / 2 - height / 2;
 
     const url = "https://myvoice.lyrebird.ai/authorize";
-    console.log(env)
     const clientId = env.clientId;
     const redirect = env.redirectUrl;
     const state = Math.floor(Math.random() * Math.floor(10000000));
@@ -91,7 +85,8 @@ class Connection extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    error: state.connection.error
+    error: state.connection.error,
+    logged: state.connection.logged
   };
 };
 
