Skip to content

Commit 22a3e10

Browse files
authored
Merge pull request #1 from bedrock-bot/master
fix fetch is undefined error
2 parents 93857b0 + b21b1b6 commit 22a3e10

File tree

3 files changed

+103
-13
lines changed

3 files changed

+103
-13
lines changed

package-lock.json

Lines changed: 21 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,18 @@
4444
},
4545
"dependencies": {
4646
"axios": "^0.21.1",
47-
"bedrock-protocol": "^3.35.0",
47+
"bedrock-protocol": "^3.47.0",
4848
"clusterize.js": "^0.18.1",
4949
"commander": "^7.1.0",
5050
"electron-localshortcut": "^3.2.1",
5151
"electron-squirrel-startup": "^1.0.0",
5252
"electron-store": "^8.0.1",
5353
"electron-unhandled": "^3.0.2",
5454
"electron-window-state": "^5.0.3",
55+
"electron-fetch": "1.9.1",
5556
"escape-html": "^1.0.3",
5657
"md5-file": "^5.0.0",
57-
"minecraft-data": "^3.36.1",
58+
"minecraft-data": "^3.93.0",
5859
"minecraft-folder-path": "^1.1.0",
5960
"minecraft-protocol": "^1.43.0",
6061
"node-eval": "^2.0.0",
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
diff --git a/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js
2+
index 062b3c0..7c714ec 100644
3+
--- a/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js
4+
+++ b/node_modules/prismarine-auth/src/TokenManagers/LiveTokenManager.js
5+
@@ -1,5 +1,5 @@
6+
const debug = require('debug')('prismarine-auth')
7+
-
8+
+const fetch = require('electron-fetch').default;
9+
const { Endpoints } = require('../common/Constants')
10+
const { checkStatus } = require('../common/Util')
11+
12+
diff --git a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js
13+
index 06f9ed7..e0d168f 100644
14+
--- a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js
15+
+++ b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockServicesManager.js
16+
@@ -1,5 +1,5 @@
17+
const debug = require('debug')('prismarine-auth')
18+
-
19+
+const fetch = require('electron-fetch').default;
20+
const { Endpoints } = require('../common/Constants')
21+
const { checkStatus } = require('../common/Util')
22+
23+
diff --git a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js
24+
index 9c5036e..a91a61d 100644
25+
--- a/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js
26+
+++ b/node_modules/prismarine-auth/src/TokenManagers/MinecraftBedrockTokenManager.js
27+
@@ -1,5 +1,5 @@
28+
const debug = require('debug')('prismarine-auth')
29+
-
30+
+const fetch = require('electron-fetch').default;
31+
const { Endpoints } = require('../common/Constants')
32+
const { checkStatus } = require('../common/Util')
33+
34+
diff --git a/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js
35+
index c89e8f1..79df714 100644
36+
--- a/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js
37+
+++ b/node_modules/prismarine-auth/src/TokenManagers/MinecraftJavaTokenManager.js
38+
@@ -1,6 +1,6 @@
39+
const debug = require('debug')('prismarine-auth')
40+
const crypto = require('crypto')
41+
-
42+
+const fetch = require('electron-fetch').default;
43+
const { Endpoints, fetchOptions } = require('../common/Constants')
44+
const { checkStatus } = require('../common/Util')
45+
46+
diff --git a/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js
47+
index 568385d..fb24dd6 100644
48+
--- a/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js
49+
+++ b/node_modules/prismarine-auth/src/TokenManagers/MsaTokenManager.js
50+
@@ -1,6 +1,6 @@
51+
const msal = require('@azure/msal-node')
52+
const debug = require('debug')('prismarine-auth')
53+
-
54+
+const fetch = require('electron-fetch').default;
55+
class MsaTokenManager {
56+
constructor (msalConfig, scopes, cache) {
57+
this.msaClientId = msalConfig.auth.clientId
58+
diff --git a/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js
59+
index 3ba041f..4eca82c 100644
60+
--- a/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js
61+
+++ b/node_modules/prismarine-auth/src/TokenManagers/PlayfabTokenManager.js
62+
@@ -1,5 +1,5 @@
63+
const debug = require('debug')('prismarine-auth')
64+
-
65+
+const fetch = require('electron-fetch').default;
66+
const { Endpoints } = require('../common/Constants')
67+
68+
class PlayfabTokenManager {
69+
diff --git a/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js b/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js
70+
index dd79fd5..fc6e5ad 100644
71+
--- a/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js
72+
+++ b/node_modules/prismarine-auth/src/TokenManagers/XboxTokenManager.js
73+
@@ -1,5 +1,5 @@
74+
const crypto = require('crypto')
75+
-
76+
+const fetch = require('electron-fetch').default;
77+
const XboxLiveAuth = require('@xboxreplay/xboxlive-auth')
78+
const debug = require('debug')('prismarine-auth')
79+
const { SmartBuffer } = require('smart-buffer')

0 commit comments

Comments
 (0)