diff --git a/assets/client_test/developers.html b/assets/client_test/developers.html
index 1673e982..23d0c3f1 100644
--- a/assets/client_test/developers.html
+++ b/assets/client_test/developers.html
@@ -1,41 +1,43 @@
<!DOCTYPE html>
<html class="theme-dark" data-theme="dark">
- <head>
- <meta charset="utf-8" />
- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" name="viewport" />
- <link rel="stylesheet" href="/assets/532.03aaeef88460fae60534.css" integrity="" />
- <link rel="icon" href="/assets/07dca80a102d4149e9736d4b162cff6f.ico" />
- <title>Discord Test Client Developer Portal</title>
- <meta charset="utf-8" data-react-helmet="true" />
- </head>
+<head>
+ <meta charset="utf-8" />
+ <meta content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" name="viewport" />
- <body>
- <div id="app-mount"></div>
- <script>
- window.GLOBAL_ENV = {
- API_VERSION: 9,
- API_ENDPOINT: "/api",
- WEBAPP_ENDPOINT: "",
- CDN_HOST: `${location.hostname}:3003`,
+ <link rel="stylesheet" href="/assets/532.03aaeef88460fae60534.css" integrity="" />
+ <link rel="icon" href="/assets/07dca80a102d4149e9736d4b162cff6f.ico" />
+ <title>Discord Test Client Developer Portal</title>
+ <meta charset="utf-8" data-react-helmet="true" />
+</head>
- BRAINTREE_KEY: "production_5st77rrc_49pp2rp4phym7387",
- STRIPE_KEY: "pk_live_CUQtlpQUF0vufWpnpUmQvcdi",
- MARKETING_ENDPOINT: "//discord.com",
- RELEASE_CHANNEL: "stable",
- ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0"
- };
- GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST;
- // TODO: remote auth
- // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
- localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
- localStorage.setItem(
- "DeveloperOptionsStore",
- `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
- );
- </script>
- <script src="/assets/41fde19fdf180f3d4315.js" integrity=""></script>
- <script src="/assets/7b04a3ab10e05dd9054e.js" integrity=""></script>
- <script src="/assets/d1f811da193e5648048b.js" integrity=""></script>
- </body>
-</html>
+<body>
+ <div id="app-mount"></div>
+ <script>
+ window.GLOBAL_ENV = {
+ API_VERSION: 9,
+ API_ENDPOINT: "/api",
+ WEBAPP_ENDPOINT: "",
+ CDN_HOST: `${location.hostname}:3003`,
+
+ BRAINTREE_KEY: "production_5st77rrc_49pp2rp4phym7387",
+ STRIPE_KEY: "pk_live_CUQtlpQUF0vufWpnpUmQvcdi",
+ MARKETING_ENDPOINT: "//discord.com",
+ RELEASE_CHANNEL: "stable",
+ ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0"
+ };
+ GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST;
+ // TODO: remote auth
+ // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
+ window.localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
+ window.localStorage.setItem(
+ "DeveloperOptionsStore",
+ `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
+ );
+ </script>
+ <script src="/assets/41fde19fdf180f3d4315.js" integrity=""></script>
+ <script src="/assets/7b04a3ab10e05dd9054e.js" integrity=""></script>
+ <script src="/assets/d1f811da193e5648048b.js" integrity=""></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/assets/client_test/index.html b/assets/client_test/index.html
index da6e2854..f3dbd514 100644
--- a/assets/client_test/index.html
+++ b/assets/client_test/index.html
@@ -41,8 +41,8 @@
GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST;
// TODO: remote auth
// window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
- localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
- localStorage.setItem(
+ window.localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
+ window.localStorage.setItem(
"DeveloperOptionsStore",
`{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
);
diff --git a/assets/preload-plugins/checkLocale.js b/assets/preload-plugins/checkLocale.js
index 0fbc73ee..1b5e7b71 100644
--- a/assets/preload-plugins/checkLocale.js
+++ b/assets/preload-plugins/checkLocale.js
@@ -1,11 +1,3 @@
-// TODO: remote auth
-// window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
-localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
-localStorage.setItem(
- "DeveloperOptionsStore",
- `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
-);
-
const supportedLocales = [
"bg",
"cs",
@@ -38,9 +30,9 @@ const supportedLocales = [
"zh-TW"
];
-const settings = JSON.parse(localStorage.getItem("UserSettingsStore"));
+const settings = JSON.parse(window.localStorage.getItem("UserSettingsStore"));
if (settings && !supportedLocales.includes(settings.locale)) {
// fix client locale wrong and client not loading at all
settings.locale = "en-US";
- localStorage.setItem("UserSettingsStore", JSON.stringify(settings));
+ window.localStorage.setItem("UserSettingsStore", JSON.stringify(settings));
}
\ No newline at end of file
diff --git a/assets/preload-plugins/fosscord-login.js b/assets/preload-plugins/fosscord-login.js
deleted file mode 100644
index 38f82200..00000000
--- a/assets/preload-plugins/fosscord-login.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Remove `<link id="logincss" rel="stylesheet" href="/assets/fosscord-login.css" />` from header when we're not accessing `/login` or `/register`
-// fosscord-login.css replaces discord's TOS tooltip with something more fitting for fosscord, which when included in the main app, causes other tooltips
-// to be affected, which is potentially unwanted.
-//
-// This script removes fosscord-login.css when a user reloads the page. From testing, it appears fosscord already properly removes
-// fosscord-login.css after login is successful, but not if you reload the page after logging in. This script is to remove fosscord-login.css in
-// that specific case.
-
-var token = JSON.parse(localStorage.getItem("token"));
-if (!token && location.pathname !== "/login" && location.pathname !== "/register") {
- document.getElementById("logincss").remove();
-}
diff --git a/assets/preload-plugins/loginRedirect.js b/assets/preload-plugins/loginRedirect.js
index cda4da44..0b5e443a 100644
--- a/assets/preload-plugins/loginRedirect.js
+++ b/assets/preload-plugins/loginRedirect.js
@@ -1,7 +1,7 @@
if (window.location.hostname !== "127.0.0.1" && window.location.hostname !== "localhost") {
const redirectIfOnLogin = () => {
const path = window.location.pathname;
- if (path == "/login" || path == "/register" || !localStorage.getItem("token")) {
+ if (path == "/login" || path == "/register" || !window.localStorage.getItem("token")) {
window.location.pathname = "/login";
//window.location.reload();
}
|
