diff --git a/resources/cider-ui-tests/index.html b/resources/cider-ui-tests/index.html
index 445ad7ea..03f6f495 100644
--- a/resources/cider-ui-tests/index.html
+++ b/resources/cider-ui-tests/index.html
@@ -1,5 +1,5 @@
-
+
diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui-tests/index.js
index 961d08cd..b0db084c 100644
--- a/resources/cider-ui-tests/index.js
+++ b/resources/cider-ui-tests/index.js
@@ -779,9 +779,10 @@ const app = new Vue({
document.addEventListener('musickitloaded', function () {
// MusicKit global is now defined
- ipcRenderer.on('devkey', (event, key) => {
+ function initMusicKit () {
+ let parsedJson = JSON.parse(this.responseText)
MusicKit.configure({
- developerToken: key,
+ developerToken: parsedJson.Key,
app: {
name: 'My Cool Web App',
build: '1978.4.1'
@@ -790,7 +791,11 @@ document.addEventListener('musickitloaded', function () {
setTimeout(() => {
app.init()
}, 1000)
- })
+ }
+ const request = new XMLHttpRequest();
+ request.addEventListener("load", initMusicKit);
+ request.open("GET", "https://devkey.cider.sh/");
+ request.send();
});
function xmlToJson(xml) {
diff --git a/resources/functions/cider-base.js b/resources/functions/cider-base.js
index 1b59a6de..334c5366 100644
--- a/resources/functions/cider-base.js
+++ b/resources/functions/cider-base.js
@@ -107,19 +107,6 @@ const CiderBase = {
}
})
}
-
- win.webContents.on('did-finish-load', () => {
- let authFile = require("../auth.json")
- request({url: "https://devkey.cider.sh/",
- headers: {
- "Authorization": "Bearer "+authFile.authHeader
- }
- }, function (error, response, body) {
- if (error) return console.log(error);
- let parsedJson = JSON.parse(body)
- win.webContents.send("devkey", parsedJson.Key)
- })
- })
return win
},
async InitWebServer() {
diff --git a/resources/preload/cider-preload.js b/resources/preload/cider-preload.js
index 0c1240f1..b8089fc4 100644
--- a/resources/preload/cider-preload.js
+++ b/resources/preload/cider-preload.js
@@ -1,7 +1,8 @@
const electron = require('electron')
-console.log('preload is in baby')
+console.log('Loaded Preload')
process.once('loaded', () => {
+ console.log("Setting ipcRenderer")
global.ipcRenderer = electron.ipcRenderer;
});
\ No newline at end of file