update site
All checks were successful
Build and Push Image / spfn-website (push) Successful in 3m19s
All checks were successful
Build and Push Image / spfn-website (push) Successful in 3m19s
remove old admin panel, update plugin, etc.
This commit is contained in:
parent
bfab0c0f88
commit
7871e7917e
14 changed files with 36 additions and 112 deletions
|
|
@ -4,6 +4,6 @@ APP_PORT=80
|
|||
|
||||
# Account Client and Secret
|
||||
# Token generation will always fail if no secret is specified
|
||||
ACCOUNT_URL=https://account.spfn.net
|
||||
ACCOUNT_URL=https://account.spbr.net
|
||||
ACCOUNT_CLIENT_ID=account
|
||||
ACCOUNT_CLIENT_SECRET=secret
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ pub fn router() -> Router {
|
|||
async fn gen_token(Json(payload): Json<GenerateTokenRequest>) -> Result<Json<TokenResponse>, StatusCode> {
|
||||
let client = Client::new();
|
||||
|
||||
let account_url = env::var("ACCOUNT_URL").unwrap_or("https://account.spfn.net".into());
|
||||
let account_url = env::var("ACCOUNT_URL").unwrap_or("https://account.spbr.net".into());
|
||||
let client_id = env::var("ACCOUNT_CLIENT_ID").unwrap_or("account".into());
|
||||
let client_secret = match env::var("ACCOUNT_CLIENT_SECRET") {
|
||||
Ok(secret) => secret,
|
||||
|
|
|
|||
|
|
@ -69,17 +69,6 @@
|
|||
<p style="text-align: center;">This does not remove your account from your devices. You will need to manually remove the files with FTPiiU or by removing the files from your Cemu MLC folder. If you are not sure how to do this, <a href="https://discord.gg/grMSxZf" target="_blank">ask in the discord.</a></p>
|
||||
</div>
|
||||
|
||||
<form id="ban" class="ban-form" style="display: none;">
|
||||
<h2>Admin Panel</h2>
|
||||
<p>VERY temporary</p>
|
||||
|
||||
<label for="ban-sfid">SFID to Ban:</label>
|
||||
<input type="text" id="ban-sfid"></input>
|
||||
<button type="submit">Ban Player</button>
|
||||
|
||||
<p id="ban-status" />
|
||||
</form>
|
||||
|
||||
<script type="text/javascript" src="/js/accounts.js"></script>
|
||||
</main>
|
||||
|
||||
|
|
|
|||
|
|
@ -446,20 +446,6 @@ code {
|
|||
}
|
||||
}
|
||||
|
||||
.ban-form {
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.ban-form h2 {
|
||||
margin: 0;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.ban-form p {
|
||||
margin: 0;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.active {
|
||||
background-color: #a00b0b;
|
||||
border-color: #6d0606;
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@
|
|||
<h2 class="download-category-title">Wii U</h2>
|
||||
<div class="download-link-container">
|
||||
<div class="download-link">
|
||||
<h3 class="download-title">Inkay-spfn.wps</h3>
|
||||
<p class="download-path">SD:/wiiu/environments/SPFN/plugins/Inkay-spfn.wps</p>
|
||||
<a download href="https://git.spbr.net/spacebar/inkay/releases/download/latest/Inkay-spfn.wps"><button class="header-button">Download</button></a>
|
||||
<h3 class="download-title">Malamar-spfn.wps</h3>
|
||||
<p class="download-path">SD:/wiiu/environments/SPFN/plugins/Malamar-spfn.wps</p>
|
||||
<a download href="https://git.spbr.net/spacebar/malamar/releases/download/latest/Malamar-spfn.wps"><button class="header-button">Download</button></a>
|
||||
</div>
|
||||
<div class="download-link">
|
||||
<h3 class="download-title">Inkay-spfn.wms</h3>
|
||||
<p class="download-path">SD:/wiiu/environments/SPFN/modules/Inkay-spfn.wms</p>
|
||||
<a download href="https://git.spbr.net/spacebar/inkay/releases/download/latest/Inkay-spfn.wms"><button class="header-button">Download</button></a>
|
||||
<h3 class="download-title">Malamar-spfn.wms</h3>
|
||||
<p class="download-path">SD:/wiiu/environments/SPFN/modules/Malamar-spfn.wms</p>
|
||||
<a download href="https://git.spbr.net/spacebar/malamar/releases/download/latest/Malamar-spfn.wms"><button class="header-button">Download</button></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
<div class="download-link-container">
|
||||
<div class="download-link">
|
||||
<h3 class="download-title">network_services.xml</h3>
|
||||
<p class="download-path">%appdata%/Cemu/network_services.xml</p>
|
||||
<p class="download-path">Windows: %appdata%/Cemu/network_services.xml, Linux: $HOME/.config/Cemu/network_services.xml</p>
|
||||
<a download href="/downloads/network_services.xml"><button class="header-button">Download</button></a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
<networkname>SPFN</networkname>
|
||||
<disablesslverification>1</disablesslverification>
|
||||
<urls>
|
||||
<act>https://account.spfn.net</act>
|
||||
<act>https://account.spbr.net</act>
|
||||
<ecs>https://ecs.wup.shop.nintendo.net/ecs/services/ECommerceSOAP</ecs>
|
||||
<nus>https://nus.wup.shop.nintendo.net/nus/services/NetUpdateSOAP</nus>
|
||||
<ias>https://ias.wup.shop.nintendo.net/ias/services/IdentityAuthenticationSOAP</ias>
|
||||
<ccsu>https://ccs.wup.shop.nintendo.net/ccs/download</ccsu>
|
||||
<ccs>http://ccs.cdn.wup.shop.nintendo.net/ccs/download</ccs>
|
||||
<idbe>https://idbe-wup.cdn.nintendo.net/icondata</idbe>
|
||||
<boss>https://boss.spfn.net/p01/tasksheet</boss>
|
||||
<boss>https://boss.spbr.net/p01/tasksheet</boss>
|
||||
<tagaya>https://tagaya.wup.shop.nintendo.net/tagaya/versionlist</tagaya>
|
||||
<olv>https://discover.olv.nintendo.net/v1/endpoint</olv>
|
||||
<olv>https://discovery.olv.spbr.net/v1/endpoint</olv>
|
||||
</urls>
|
||||
</content>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ function updateUserDataDisplay(data) {
|
|||
|
||||
document.getElementById("user-info").style.display = "flex";
|
||||
|
||||
let miiLink = `https://mii.spfn.net/${data["pid"]}/main.png`
|
||||
let miiLink = `https://mii.spbr.net/${data["pid"]}/main.png`
|
||||
document.getElementById("mii-img").src = miiLink;
|
||||
|
||||
let level = userAccessLevels[data["account_level"]];
|
||||
|
|
@ -54,7 +54,7 @@ window.onload = async function() {
|
|||
if (expiry > new Date()) { // Hasn't expired - Get user data
|
||||
let token = sessionStorage.getItem("authToken");
|
||||
|
||||
const response = await fetch("https://account.spfn.net/api/v2/users/@me/profile", {
|
||||
const response = await fetch("https://account.spbr.net/api/v2/users/@me/profile", {
|
||||
method: "GET",
|
||||
headers: {
|
||||
"Authorization": `Bearer ${token}`
|
||||
|
|
@ -102,7 +102,7 @@ async function deleteAccount() {
|
|||
window.location.href = "/account/login?redirect=/account"
|
||||
}
|
||||
|
||||
const response = await fetch("https://account.spfn.net/api/v2/users/@me/delete", {
|
||||
const response = await fetch("https://account.spbr.net/api/v2/users/@me/delete", {
|
||||
method: "GET",
|
||||
headers: {
|
||||
"Authorization": `Bearer ${token}`
|
||||
|
|
@ -116,55 +116,4 @@ async function deleteAccount() {
|
|||
|
||||
document.getElementById("confirm-delete").style = "display: none;"
|
||||
document.getElementById("delete-success").style = ""
|
||||
}
|
||||
|
||||
// ADMIN PANEL - WILL BE REMOVED ONCE ACTUAL ADMIN PANEL IS FINISHED
|
||||
|
||||
document.getElementById("ban").addEventListener("submit", async function (event) {
|
||||
event.preventDefault();
|
||||
|
||||
const sfid = document.getElementById("ban-sfid").value;
|
||||
|
||||
let token;
|
||||
|
||||
let expiryStr = sessionStorage.getItem("authExpires");
|
||||
if (expiryStr) { // Expiry exists so token should exist
|
||||
token = sessionStorage.getItem("authToken");
|
||||
|
||||
let expiry = new Date(expiryStr);
|
||||
if (expiry < new Date()) { // Expired token
|
||||
window.location.href = "/account/login?redirect=/account"
|
||||
} else if (!token) { // Expiry Saved but No Token (shouldn't be possible but it'll be caught if it happens)
|
||||
window.location.href = "/account/login?redirect=/account"
|
||||
}
|
||||
} else { // Token Never Saved in Session
|
||||
window.location.href = "/account/login?redirect=/account"
|
||||
}
|
||||
|
||||
const response = await fetch("https://account.spfn.net/api/v2/admin/ban", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Authorization": `Bearer ${token}`,
|
||||
"Content-Type": "application/x-www-form-urlencoded"
|
||||
},
|
||||
body: `username=${sfid}`
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
let status = response.status;
|
||||
|
||||
if (status == 403) {
|
||||
document.getElementById("ban-status").innerText = "You are not a moderator."
|
||||
} else if (status == 400) {
|
||||
document.getElementById("ban-status").innerText = "Invalid Access Token. Refresh and log in again."
|
||||
} else if (status == 500) {
|
||||
document.getElementById("ban-status").innerText = "Server returned error whilst updating database."
|
||||
} else {
|
||||
document.getElementById("ban-status").innerText = `Server returned error: ${status}`
|
||||
}
|
||||
|
||||
throw new Error(`Error while banning player: ${status}`)
|
||||
}
|
||||
|
||||
document.getElementById("ban-status").innerText = `Successfully banned ${sfid}! Don't forget to report the ban in the Spacebar discord`
|
||||
})
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
async function requestFestInfo() {
|
||||
// DO NOT USE THIS - USE ROUTE https://boss-info.spfn.net/api/v2/fest-info
|
||||
const response = await fetch("https://account.spfn.net/api/v2/fest-info", { // ROUTE NOT IMPLEMENTED
|
||||
// DO NOT USE THIS - USE ROUTE https://boss-info.spbr.net/api/v2/fest-info
|
||||
const response = await fetch("https://account.spbr.net/api/v2/fest-info", { // ROUTE NOT IMPLEMENTED
|
||||
method: "GET"
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ Benutzer, die vorher Pretendo's Inkay Plugin verwendet haben, müssen die Dateie
|
|||
|
||||
Lade die Plugins und Modules von der [Downloadseite](/downloads/) herunter - stelle sicher das in dem Datei-Explorer, der verwendet wird, Dateinamenerweiterungen aktiv sind und merke dir die Erweiterungen.
|
||||
|
||||
- `Inkay-spfn.wps` kommt in den `plugins` Ordner
|
||||
- `Inkay-spfn.wms` kommt in den `modules` Ordner
|
||||
- `Malamar-spfn.wps` kommt in den `plugins` Ordner
|
||||
- `Malamar-spfn.wms` kommt in den `modules` Ordner
|
||||
|
||||
Mit den Dateien nun auf der SD-Karte kann man diese vom Computer entfernen und in die WiiU einlegen´.
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ Oben-Links sollte dann eine Nachricht mit dem Inhalt "Nutze SPFN" erscheinen.
|
|||
|
||||
> Wenn stattdessen die Nachricht "Nutze Pretendo Network" auftaucht, FAHRE NICHT MIT DEM GUIDE FORT. Schalte die Konsole aus und lösche, wie im Schritt 1 beschrieben, die Pretendo Plugins.
|
||||
|
||||
> Falls du die "Nutze SPFN" Nachricht nicht siehst wurde das SPFN-Plugin wahrscheinlich nicht korrekt installiert. Überprüfe die Speicherorte der `Inkay-spfn.wps` und `Inkay-spfn.wms` Dateien.
|
||||
> Falls du die "Nutze SPFN" Nachricht nicht siehst wurde das SPFN-Plugin wahrscheinlich nicht korrekt installiert. Überprüfe die Speicherorte der `Malamar-spfn.wps` und `Malamar-spfn.wms` Dateien.
|
||||
|
||||
Die Server von SPFN sind separat von Pretendo's und Nintendos Server. Deswegen muss ein neuer Account für die Nutzung der SPFN-Server erstellt werden. Da die Konsole schon mit unseren Servern verbunden ist, muss nur noch ein neuer Nutzer angelegt werden. Drücke `+` am Gamepad bei der Benutzerauswahl, um einen neuen Nutzer anzulegen. Folge den Anweisungen der WiiU bei der Accounterstellung. Wenn gefragt wird, ob man eine NNID hat, wählt man Nein aus. Anschließend wählt man ein Mii für den Account aus. Wenn danach gefragt wird, ob man einen Account verknüpfen möchte, bestätigt man dies mit "Verknüpfen".
|
||||
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ For users who previously used Pretendo's Inkay plugin, delete the files `plugins
|
|||
|
||||
Download the plugins and modules found on the [Downloads page](/downloads/) - make sure you enable file name extensions in your file browser and take note of the extension.
|
||||
|
||||
- `Inkay-spfn.wps` goes into the `plugins` folder
|
||||
- `Inkay-spfn.wms` goes into the `modules` folder
|
||||
- `Malamar-spfn.wps` goes into the `plugins` folder
|
||||
- `Malamar-spfn.wms` goes into the `modules` folder
|
||||
|
||||
With these files installed, you can eject your SD card and put it into your Wii U.
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ In the top left of your screen, you should see a message saying "Using SPFN".
|
|||
|
||||
> If you see "Using Pretendo Network", DO NOT PROGRESS. Turn off the console and delete the Pretendo plugins as mentioned in step 1.
|
||||
|
||||
> If you do not see the "Using SPFN" message, you likely didn't install the plugin correctly. Check the locations of the `Inkay-spfn.wps` and `Inkay-spfn.wms` files.
|
||||
> If you do not see the "Using SPFN" message, you likely didn't install the plugin correctly. Check the locations of the `Malamar-spfn.wps` and `Malamar-spfn.wms` files.
|
||||
|
||||
SPFN's servers are separate from both Nintendo and Pretendo, so you will need to create a new account to access our services. Now that your console is connected to our servers, you should be brought to the accounts page. Press `+` on your gamepad to create a new account. Follow the process of creating the account. Select no when prompted if you have an NNID. Select a Mii for your account. When asked to create an account, press Link.
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ Para los usuarios que anteriormente han utilizado el plugin Inkay de Pretendo, e
|
|||
|
||||
Descarga los plugins y módulos que se encuentran en la [página de descargas](/downloads/) - Asegúrate de activar los nombres de las extensiones de los archivos en tu explorador de archivos para tener a la vista las extensiones de los archivos.
|
||||
|
||||
- `Inkay-spfn.wps` va en la carpeta `plugins`
|
||||
- `Inkay-spfn.wms` va en la carpeta `modules`
|
||||
- `Malamar-spfn.wps` va en la carpeta `plugins`
|
||||
- `Malamar-spfn.wms` va en la carpeta `modules`
|
||||
|
||||
Con esos archivos instalados, puedes extraer la tarjeta SD de tu ordenador e introducirla en tu consola Wii U.
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ En la parte superior izquierda de la pantalla, debería aparecer un mensaje que
|
|||
|
||||
> Si ve el mensaje "Using Pretendo Network", NO CONTINÚE. Apague la consola y elimine los complementos de Pretendo como se indica en el paso 1.
|
||||
|
||||
> Si no ve el mensaje "Using SPFN", es probable que no haya instalado el plugin correctamente. Verifique la ubicación de los archivos `Inkay-spfn.wps` e `Inkay-spfn.wms`.
|
||||
> Si no ve el mensaje "Using SPFN", es probable que no haya instalado el plugin correctamente. Verifique la ubicación de los archivos `Malamar-spfn.wps` e `Malamar-spfn.wms`.
|
||||
|
||||
Los servidores de SPFN están separados a los de Nintendo y Pretendo, así que, tendrás que crear una nueva cuenta para acceder a nuestros servicios. Ahora que tu consola está conectada a nuestros servidores, deberías ser llevado a la página de cuentas. Presiona `+` en tu gamepad para crear una cuenta nueva. Sigue el proceso de creación de cuenta. Selecciona No cuando se te pregunte si tienes un NNID. Selecciona un Mii para tu cuenta. Cuando te pregunte de crear una cuenta, presiona Vincular.
|
||||
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ Pour les utilisateurs qui ont précédemment utilisé le plugin Inkay de Pretend
|
|||
Download the plugins and modules found on the [Downloads page](/downloads/) - make sure you enable file name extensions in your file browser and take note of the extension.
|
||||
Téléchargez les plugins et modules se trouvant sur la [page des Téléchargements](/downloads/) - assurez vous d'avoir activé les Extensions de nom de Fichier dans votre navigateur.
|
||||
|
||||
- `Inkay-spfn.wps` va dans le dossier `plugins`
|
||||
- `Inkay-spfn.wms` va dans le dossier `modules`
|
||||
- `Malamar-spfn.wps` va dans le dossier `plugins`
|
||||
- `Malamar-spfn.wms` va dans le dossier `modules`
|
||||
|
||||
With these files installed, you can eject your SD card and put it into your Wii U.
|
||||
Une fois les fichiers installés, vous pouvez éjecter votre carte SD et l'insérer dans votre Wii U.
|
||||
|
|
@ -53,7 +53,7 @@ En haut a gauche de votre écran, vous devriez voir le méssage "Using SPFN".
|
|||
|
||||
> Si vous voyez "Using Pretendo Network", NE CONTINUEZ PAS. Éteignez la console et supprimez les plugins pretendo comme mentionné dans l'étape 1.
|
||||
|
||||
> Si vous ne voyez pas le message "Using spfn", vous n'avez probablement pas installé le plugin correctement. Vérifiez l'emplacement des fichiers `Inkay-spfn.wps` et `Inkay-spfn.wms`.
|
||||
> Si vous ne voyez pas le message "Using spfn", vous n'avez probablement pas installé le plugin correctement. Vérifiez l'emplacement des fichiers `Malamar-spfn.wps` et `Malamar-spfn.wms`.
|
||||
|
||||
Les serveurs de SPFN sont séparés de ceux de Nintendo et Pretendo, vous devez donc créer un nouveau compte pour accéder a nos services. Maintenant que votre console est connectée a nos serveurs, vous pouvez ouvrir la page des comptes et appuyer sur `+` sur votre gamepad pour créer un nouvau compte. Suivez le processus de création de compte. sélectionnez "Non" lorsqu'on vous demande si vous avez un NNID. Selectoonnez un Mii pour votre compte. Lorsque vous êtes invité à créer un compte, sélectionnez "Lier".
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ For users who previously used Pretendo's Inkay plugin, delete the files `plugins
|
|||
|
||||
Download the plugins and modules found on the [Downloads page](/downloads/) - make sure you enable file name extensions in your file browser and take note of the extension.
|
||||
|
||||
- `Inkay-spfn.wps` goes into the `plugins` folder
|
||||
- `Inkay-spfn.wms` goes into the `modules` folder
|
||||
- `Malamar-spfn.wps` goes into the `plugins` folder
|
||||
- `Malamar-spfn.wms` goes into the `modules` folder
|
||||
|
||||
With these files installed, you can eject your SD card and put it into your Wii U.
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ In the top left of your screen, you should see a message saying "Using SPFN".
|
|||
|
||||
> If you see "Using Pretendo Network", DO NOT PROGRESS. Turn off the console and delete the Pretendo plugins as mentioned in step 1.
|
||||
|
||||
> If you do not see the "Using SPFN" message, you likely didn't install the plugin correctly. Check the locations of the `Inkay-spfn.wps` and `Inkay-spfn.wms` files.
|
||||
> If you do not see the "Using SPFN" message, you likely didn't install the plugin correctly. Check the locations of the `Malamar-spfn.wps` and `Malamar-spfn.wms` files.
|
||||
|
||||
SPFN's servers are separate from both Nintendo and Pretendo, so you will need to create a new account to access our services. Now that your console is connected to our servers, you should be brought to the accounts page. Press `+` on your gamepad to create a new account. Follow the process of creating the account. Select no when prompted if you have an NNID. Select a Mii for your account. When asked to create an account, press Link.
|
||||
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ SDカードをコンピュータに差し込み、 `SD:/wiiu/environments` に
|
|||
|
||||
[ダウンロードページ](https://www.google.com/search?q=/downloads/)にあるプラグインとモジュールをダウンロードします。ファイルブラウザでファイル名拡張子を有効にし、拡張子に注意してください。
|
||||
|
||||
* `Inkay-spfn.wps` は `plugins` フォルダーに入ります
|
||||
* `Inkay-spfn.wms` は `modules` フォルダーに入ります
|
||||
* `Malamar-spfn.wps` は `plugins` フォルダーに入ります
|
||||
* `Malamar-spfn.wms` は `modules` フォルダーに入ります
|
||||
|
||||
これらのファイルをインストールしたら、SDカードを取り出してWii Uに差し込みます。
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ SDカードをコンピュータに差し込み、 `SD:/wiiu/environments` に
|
|||
画面の左上に「Using SPFN」というメッセージが表示されるはずです。
|
||||
|
||||
> 「Using Pretendo Network」と表示された場合は、先に進まないでください。本体の電源を切り、ステップ1で述べたようにPretendoプラグインを削除してください。
|
||||
> 「Using SPFN」メッセージが表示されない場合は、プラグインが正しくインストールされていない可能性があります。 `Inkay-spfn.wps` と `Inkay-spfn.wms` ファイルの場所を確認してください。
|
||||
> 「Using SPFN」メッセージが表示されない場合は、プラグインが正しくインストールされていない可能性があります。 `Malamar-spfn.wps` と `Malamar-spfn.wms` ファイルの場所を確認してください。
|
||||
|
||||
SPFNのサーバーはNintendoとPretendoの両方から独立しているため、当社のサービスにアクセスするには新しいアカウントを作成する必要があります。本体が当社のサーバーに接続されたので、アカウントページが表示されるはずです。ゲームパッドの `+` を押して新しいアカウントを作成します。アカウント作成プロセスに従います。NNIDを持っているか尋ねられたら、いいえを選択します。アカウントのMiiを選択します。アカウントの作成を求められたら、Linkを押します。
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue