fix(sdk): initialize Aztec when document is ready

AztecProtocol · Feb 13, 2020 · 3beac02 · 3beac02
1 parent 0bcb489
commit 3beac02
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/packages/extension/src/background/tasks/acceptConnection.js b/packages/extension/src/background/tasks/acceptConnection.js
@@ -21,7 +21,7 @@ export default function acceptConnection() {
         type: backgroundReadyEvent,
     }, '*');
 
-    const connection = Connection;
+    const connection = new Connection();
     let networkConfig;
 
     window.addEventListener('message', async (event) => {

diff --git a/packages/extension/src/background/utils/connection.js b/packages/extension/src/background/utils/connection.js
@@ -492,4 +492,4 @@ class Connection {
     }
 }
 
-export default new Connection();
+export default Connection;
diff --git a/packages/extension/src/client/Aztec/ApiManager.js b/packages/extension/src/client/Aztec/ApiManager.js
@@ -9,6 +9,8 @@ import ConnectionService from '~/client/services/ConnectionService';
 
 export default class ApiManager {
     constructor() {
+        ConnectionService.init();
+
         this.eventListeners = new EventListeners(['profileChanged']);
         this.enableProfileChangeListener = null;
         this.enabledOptions = null;
@@ -206,6 +208,7 @@ export default class ApiManager {
     }
 
     async refreshSession(options, cb, setApis) {
+        this.enabledOptions = null;
         await this.disable(setApis);
         return this.enable(options, cb, setApis);
     }

diff --git a/packages/extension/src/client/Aztec/index.js b/packages/extension/src/client/Aztec/index.js
@@ -4,10 +4,12 @@ import {
 } from '~/utils/log';
 import ApiManager from './ApiManager';
 
-const manager = new ApiManager();
+let manager;
 
 class Aztec {
     constructor() {
+        manager = new ApiManager();
+
         const apis = manager.generateDefaultApis();
         Object.keys(apis).forEach((apiName) => {
             this[apiName] = apis[apiName];

diff --git a/packages/extension/src/client/services/ConnectionService/index.js b/packages/extension/src/client/services/ConnectionService/index.js
@@ -36,10 +36,10 @@ import getApiKeyApproval from '~/client/utils/getApiKeyApproval';
 import backgroundFrame from './backgroundFrame';
 
 class ConnectionService {
-    constructor() {
+    async init() {
         this.clientId = randomId();
         this.setInitialVars();
-        backgroundFrame.init();
+        await backgroundFrame.init();
     }
 
     setInitialVars() {

diff --git a/packages/extension/src/index.js b/packages/extension/src/index.js
@@ -1,9 +1,11 @@
 import Aztec from '~/client/Aztec';
 
-window.aztec = new Aztec();
+document.addEventListener('DOMContentLoaded', () => {
+    window.aztec = new Aztec();
 
-// TODO - callback's name should be configurable through url:
-// /sdk/aztec/?key=API_KEY&callback=aztecCallback
-if (typeof window.aztecCallback === 'function') {
-    window.aztecCallback();
-}
+    // TODO - callback's name should be configurable through url:
+    // /sdk/aztec/?key=API_KEY&callback=aztecCallback
+    if (typeof window.aztecCallback === 'function') {
+        window.aztecCallback();
+    }
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -492,4 +492,4 @@ class Connection { @@
         }
     }
-    export default new Connection();
+    export default Connection;