onairos 0.1.2 → 0.1.4

package/README.md

@@ -46,7 +46,7 @@ Individual Request Information:
  - `description`: Description to display to users about your request
  - `reward`: Reward Given to User for granting Data Request
 
-Then instantiate the Onairos object from the Onairos package - passing in your Onairos Developer ID and your Request Object
+Then instantiate the Onairos object from the Onairos package - passing in your Request Object and other meta info
 ```jsx
 <Onairos requestData={requestData} webpageName={webpageName} proofMode={proofMode} />
 ```
@@ -68,6 +68,7 @@ event.data.type === 'API_URL_RESPONSE'
 ```
 
 You will also be given an ACCESS TOKEN which you must use in any API requests from that specific client.
+
 This is a short lived token, for usage on your developer registered domain only, and lasts for 1 hour from issue.
 
 For example:
@@ -127,6 +128,7 @@ Example JSON body for the POST request:
 ```
 
 You can then call the Inference API with the Inference object created above.
+
 Remember to include the access token in the Authorization header of your API request.
 
 

package/dist/onairos.js

@@ -4,17 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _OnairosBlack = _interopRequireDefault(require("./OnairosBlack.png"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function Onairos(_ref) {
   let {
     requestData,
-    onairosID,
-    access_token,
     proofMode = false,
     webpageName
   } = _ref;
+  const [token, setToken] = (0, _react.useState)();
   const OnairosAnime = async () => {
     try {
       console.log("Clicked Onairos Connect");
@@ -24,18 +25,36 @@ function Onairos(_ref) {
       console.error("Error connecting to Onairos", error);
     }
   };
+  const requestToken = async () => {
+    const domain = window.location.hostname;
+    const response = await fetch('https://api2.onairos.uk/dev/request-token', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        domain
+      })
+    });
+    if (!response.ok) {
+      throw new Error('Token request failed: ' + response.statusText);
+    }
+    const data = await response.json();
+    setToken(data.token);
+    // this.token = data.token; // Store the token
+  };
+
   const ConnectOnairos = async () => {
     // Title here has to match a model in the Users : accountInfo.AccountInfo.models
     // Prepare the data to be sent
     // Send the data to the content script
+
+    await requestToken();
     window.postMessage({
       source: 'webpage',
       type: 'GET_API_URL',
       webpageName: webpageName,
-      onairosID: onairosID,
-      access_token: access_token,
-      account: "ConnectedAccountRef.current",
-      //No Longer needed, REMOVE
+      access_token: token,
       requestData: requestData,
       proofMode: proofMode
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onairos",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "dependencies": {
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
@@ -48,7 +48,7 @@
   "main": "dist/onairos.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/zd819/OnairosNPM.git"
+    "url": "git+https://github.com/zd819/onairos-npm"
   },
   "keywords": [
     "Onairos",

package/src/onairos.jsx

@@ -30,7 +30,7 @@ function Onairos( {requestData, proofMode=false,webpageName}) {
     const data = await response.json();
     setToken(data.token);
     // this.token = data.token; // Store the token
-}
+  }
 
   const ConnectOnairos = async () => {
     // Title here has to match a model in the Users : accountInfo.AccountInfo.models
@@ -43,9 +43,7 @@ function Onairos( {requestData, proofMode=false,webpageName}) {
       source: 'webpage',
       type: 'GET_API_URL',
       webpageName: webpageName,
-      onairosID:'onairosID', // Remove
       access_token:token,
-      account:"ConnectedAccountRef.current", //No Longer needed, REMOVE
       requestData: requestData,
       proofMode:proofMode
     });
@@ -66,71 +64,3 @@ function Onairos( {requestData, proofMode=false,webpageName}) {
 
 export default Onairos;
 
-
-// import React from 'react';
-// import onairosLogo from "./OnairosBlack.png";
-
-// class Onairos {
-//   constructor({ requestData, onairosID, proofMode = false, webpageName }) {
-//     const OnairosAnime = async () => {
-//       try {
-//         console.log("Clicked Onairos Connect");
-//         await ConnectOnairos();
-//       } catch (error) {
-//         // Handle any errors here
-//         console.error("Error connecting to Onairos", error);
-//       }
-//     };
-
-//     const requestToken = async () => {
-//       const domain = window.location.hostname;
-//       // const response = await fetch('https://api2.onairos.uk/request-token', {
-//         const response = await fetch('http://localhost:8000/request-token', {
-//           method: 'POST',
-//         headers: {
-//           'Content-Type': 'application/json',
-//         },
-//         body: JSON.stringify({ domain }),
-//       });
-
-//       if (!response.ok) {
-//         throw new Error('Token request failed: ' + response.statusText);
-//       }
-
-//       const data = await response.json();
-//       this.token = data.token; // Store the token
-//     };
-
-//     const ConnectOnairos = async () => {
-//       // Title here has to match a model in the Users : accountInfo.AccountInfo.models
-//       // Prepare the data to be sent
-//       // Send the data to the content script
-//       await requestToken();
-
-//       window.postMessage({
-//         source: 'webpage',
-//         type: 'GET_API_URL',
-//         webpageName: webpageName,
-//         onairosID: onairosID,
-//         access_token: "access_token",
-//         account: "ConnectedAccountRef.current",
-//         requestData: requestData,
-//         proofMode: proofMode
-//       });
-//     };
-
-//     return (
-//       <div>
-//         <button
-//           className="OnairosConnect w-20 h-20 flex flex-col items-center justify-center text-white font-bold py-2 px-4 rounded cursor-pointer"
-//           onClick={OnairosAnime}
-//         >
-//           <img src={onairosLogo} alt="Onairos Logo" className="w-16 h-16 object-contain mb-2" /> {/* Adjust size as needed */}
-//           <span className="whitespace-nowrap">Connect to Onairos</span> {/* Prevent text from wrapping */}
-//         </button>
-//       </div>
-//     );
-//   }
-// }
-
-// export default Onairos;