okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Completely fix api calls

Browse source 
Fix web browser api call
This commit is contained in:
Brandon Plank 2021-12-06 17:27:56 -05:00
parent a7d1ce0069
commit 56defb0e5b
4 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/cider-ui-tests/index.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en" xmlns:v-bind="http://www.w3.org/1999/xhtml">
<head> <head>
<link rel="preconnect" href="https://amp-api.music.apple.com/" crossorigin/> <link rel="preconnect" href="https://amp-api.music.apple.com/" crossorigin/>

11
resources/cider-ui-tests/index.js
View file

@ -779,9 +779,10 @@ const app = new Vue({
document.addEventListener('musickitloaded', function () { document.addEventListener('musickitloaded', function () {
// MusicKit global is now defined // MusicKit global is now defined
ipcRenderer.on('devkey', (event, key) => { function initMusicKit () {
let parsedJson = JSON.parse(this.responseText)
MusicKit.configure({ MusicKit.configure({
developerToken: key, developerToken: parsedJson.Key,
app: { app: {
name: 'My Cool Web App', name: 'My Cool Web App',
build: '1978.4.1' build: '1978.4.1'
@ -790,7 +791,11 @@ document.addEventListener('musickitloaded', function () {
setTimeout(() => { setTimeout(() => {
app.init() app.init()
}, 1000) }, 1000)
}) }
const request = new XMLHttpRequest();
request.addEventListener("load", initMusicKit);
request.open("GET", "https://devkey.cider.sh/");
request.send();
}); });
function xmlToJson(xml) { function xmlToJson(xml) {

13
resources/functions/cider-base.js
View file

@ -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 return win
}, },
async InitWebServer() { async InitWebServer() {

3
resources/preload/cider-preload.js
View file

@ -1,7 +1,8 @@
const electron = require('electron') const electron = require('electron')
console.log('preload is in baby') console.log('Loaded Preload')
process.once('loaded', () => { process.once('loaded', () => {
console.log("Setting ipcRenderer")
global.ipcRenderer = electron.ipcRenderer; global.ipcRenderer = electron.ipcRenderer;
}); });