diff options
-rw-r--r-- | .env.example | 3 | ||||
-rw-r--r-- | src/app.d.ts | 18 | ||||
-rw-r--r-- | src/hooks.ts | 28 | ||||
-rw-r--r-- | src/lib/APITypes.d.ts | 30 | ||||
-rw-r--r-- | src/lib/LoginButton.svelte | 32 | ||||
-rw-r--r-- | src/lib/api.ts | 2 | ||||
-rw-r--r-- | src/routes/index.svelte | 21 | ||||
-rw-r--r-- | src/routes/loggedin.ts | 8 | ||||
-rw-r--r-- | src/routes/logout.ts | 34 | ||||
-rw-r--r-- | src/routes/player/[player]/[profile].svelte | 2 | ||||
-rw-r--r-- | src/routes/player/index.ts | 4 | ||||
-rw-r--r-- | src/routes/profile.svelte | 79 | ||||
-rw-r--r-- | src/routes/verify.svelte | 63 | ||||
-rw-r--r-- | src/routes/verify.ts | 104 | ||||
-rw-r--r-- | static/discord-mark-light.svg | 10 | ||||
-rw-r--r-- | static/discord-mark.svg | 10 |
16 files changed, 426 insertions, 22 deletions
diff --git a/.env.example b/.env.example index 313d6ac..df54f6a 100644 --- a/.env.example +++ b/.env.example @@ -1 +1,2 @@ -DISCORD_CLIENT_ID=The client/application ID of the Discord app.
\ No newline at end of file +DISCORD_CLIENT_ID=The client/application ID of the Discord app. (optional) +SKYBLOCK_STATS_API_KEY=This should be the same as your `key` environment variable in your skyblock-api instance. (optional) diff --git a/src/app.d.ts b/src/app.d.ts index efdb902..ddaae39 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -2,14 +2,16 @@ // // See https://kit.svelte.dev/docs/typescript // // for information about these interfaces -// declare namespace App { -// interface Locals { -// userid: string; -// } +declare namespace App { + interface Locals { + sid: string | undefined + } -// interface Platform {} + // interface Platform {} -// interface Session {} + interface Session { + sid: string | undefined + } -// interface Stuff {} -// } + // interface Stuff {} +} diff --git a/src/hooks.ts b/src/hooks.ts index 9cd6ca4..5b3464c 100644 --- a/src/hooks.ts +++ b/src/hooks.ts @@ -1,11 +1,16 @@ import cookie from 'cookie' -import { v4 as uuid } from '@lukeed/uuid' -import type { Handle } from '@sveltejs/kit' +import type { ExternalFetch, GetSession, Handle } from '@sveltejs/kit' + +const SKYBLOCK_STATS_API_KEY = process.env.SKYBLOCK_STATS_API_KEY +if (!SKYBLOCK_STATS_API_KEY) + console.warn('SKYBLOCK_STATS_API_KEY is not set as an environment variable. This is required for logging in with Skyblock Stats to work. It should be the same as the `key` environment variable in skyblock-api.') export const handle: Handle = async ({ event, resolve }) => { - // const cookies = cookie.parse(event.request.headers.get('cookie') || ''); + const cookies = cookie.parse(event.request.headers.get('cookie') || '') // event.locals.userid = cookies.userid || uuid(); + event.locals.sid = cookies.sid + const response = await resolve(event) // if (!cookies.userid) { @@ -22,3 +27,20 @@ export const handle: Handle = async ({ event, resolve }) => { return response } + +export const getSession: GetSession = async ({ locals }) => { + return { + sid: locals.sid + } +} + +export const externalFetch: ExternalFetch = async (request) => { + if (SKYBLOCK_STATS_API_KEY && request.url.startsWith('https://skyblock-api.matdoes.dev/')) { + // add the key as a header + request.headers.set('key', SKYBLOCK_STATS_API_KEY) + } + + console.log('request', request.url) + + return fetch(request) +}
\ No newline at end of file diff --git a/src/lib/APITypes.d.ts b/src/lib/APITypes.d.ts index 3a54cea..b0deee0 100644 --- a/src/lib/APITypes.d.ts +++ b/src/lib/APITypes.d.ts @@ -162,4 +162,32 @@ export interface ElectionData { year: number candidates: Candidate[] } | null -}
\ No newline at end of file +} + +interface SessionSchema { + _id?: string + refresh_token: string + discord_user: { + id: string + name: string + } + lastUpdated: Date +} + +export interface AccountCustomization { + backgroundUrl?: string + pack?: string + emoji?: string +} + +export interface AccountSchema { + _id?: string + discordId: string + minecraftUuid?: string + customization?: AccountCustomization +} + +export interface CleanSocialMedia { + discord: string | null + forums: string | null +} diff --git a/src/lib/LoginButton.svelte b/src/lib/LoginButton.svelte new file mode 100644 index 0000000..bba078e --- /dev/null +++ b/src/lib/LoginButton.svelte @@ -0,0 +1,32 @@ +<script lang="ts"> + export let loggedIn: boolean +</script> + +<div class="login-button-container"> + {#if loggedIn} + <a href="/profile"><button class="login-button">Edit profile</button></a> + {:else} + <a href="/login"> + <button class="login-button" + ><img src="/discord-mark-light.svg" alt="Discord logo" />Log in with Discord</button + > + </a> + {/if} +</div> + +<style> + .login-button-container { + position: absolute; + top: 0.5em; + right: 0.5em; + } + .login-button { + color: var(--theme-main-text); + } + img { + height: 1em; + vertical-align: middle; + margin-right: 0.3em; + opacity: 0.9; + } +</style> diff --git a/src/lib/api.ts b/src/lib/api.ts index db6bf81..243cf2b 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -1 +1 @@ -export const API_URL = 'https://skyblock-api.matdoes.dev/'
\ No newline at end of file +export const API_URL = 'https://skyblock-api.matdoes.dev/' diff --git a/src/routes/index.svelte b/src/routes/index.svelte index 6f6bae1..54843bd 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -1,13 +1,28 @@ +<script lang="ts" context="module"> + import type { Load } from '@sveltejs/kit' + import { API_URL } from '$lib/api' + + export const load: Load = async ({ params, fetch, session }) => { + return { + props: { + loggedIn: session.sid !== undefined, + }, + } + } +</script> + <script lang="ts"> import Username from '$lib/minecraft/Username.svelte' import SearchUser from '$lib/SearchUser.svelte' - import type { CleanUser } from '$lib/APITypes' import donators from '../_donators.json' import Head from '$lib/Head.svelte' import Emoji from '$lib/Emoji.svelte' + import LoginButton from '$lib/LoginButton.svelte' - export const prerender = true + // export const prerender = true export const hydrate = false + + export let loggedIn: boolean </script> <svelte:head> @@ -20,6 +35,7 @@ /> <main> + <LoginButton {loggedIn} /> <section class="title-section"> <h1>SkyBlock Stats</h1> <SearchUser> @@ -56,7 +72,6 @@ <section> <h2>Info</h2> <p>Website made by <a href="https://matdoes.dev">mat</a>.</p> - <p>Join the <a href="https://discord.gg/nWQKpzPCPJ">Forum Sweats</a> Discord server.</p> <p> Resource packs: <a href="//packshq.com">PacksHQ</a> (default), <a href="//hypixel.net/threads/2138599">Furfsky</a>, diff --git a/src/routes/loggedin.ts b/src/routes/loggedin.ts index eb7236d..9eadf67 100644 --- a/src/routes/loggedin.ts +++ b/src/routes/loggedin.ts @@ -2,15 +2,17 @@ import { API_URL } from '$lib/api' import type { RequestHandler } from '@sveltejs/kit' import type { JSONValue } from '@sveltejs/kit/types/internal' -export const get: RequestHandler = async ({ params }) => { - const code = params.code +export const get: RequestHandler = async ({ url }) => { + const code = url.searchParams.get('code') + const redirectUri = `${url.protocol}//${url.host}/loggedin` const response = await fetch(`${API_URL}accounts/createsession`, { method: 'POST', headers: { 'content-type': 'application/json', }, body: JSON.stringify({ - code + code, + redirectUri: redirectUri }), }).then(res => { if (res.status !== 200) diff --git a/src/routes/logout.ts b/src/routes/logout.ts new file mode 100644 index 0000000..f2f5e33 --- /dev/null +++ b/src/routes/logout.ts @@ -0,0 +1,34 @@ +import { API_URL } from '$lib/api' +import type { RequestHandler } from '@sveltejs/kit' + +const DISCORD_CLIENT_ID = process.env.DISCORD_CLIENT_ID +if (!DISCORD_CLIENT_ID) + console.warn('DISCORD_CLIENT_ID is not set as an environment variable. This is required for logging in with Discord to work.') + +export const get: RequestHandler = async ({ request, params, locals, url }) => { + // if the sid is wrong, nothing to do + console.log(url.searchParams.get('sid'), locals.sid) + if (url.searchParams.has('sid') && url.searchParams.get('sid') === locals.sid) { + console.log('ok sent logout') + await fetch(`${API_URL}accounts/session`, { + method: 'DELETE', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + uuid: locals.sid + }), + }).then(res => { + if (res.status !== 200) + throw new Error(res.statusText) + }) + } + return { + status: 303, + headers: { + location: '/', + 'Set-Cookie': 'sid=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;' + } + } + +} diff --git a/src/routes/player/[player]/[profile].svelte b/src/routes/player/[player]/[profile].svelte index b87741c..02c46bb 100644 --- a/src/routes/player/[player]/[profile].svelte +++ b/src/routes/player/[player]/[profile].svelte @@ -39,7 +39,7 @@ pack = (await import('skyblock-assets/matchers/worlds_and_beyond.json')) as any break default: - // packshq is the default pack + // furfsky reborn is the default pack pack = (await import('skyblock-assets/matchers/furfsky_reborn.json')) as any break } diff --git a/src/routes/player/index.ts b/src/routes/player/index.ts index c9d1b90..4644499 100644 --- a/src/routes/player/index.ts +++ b/src/routes/player/index.ts @@ -1,4 +1,6 @@ -export async function post({ request }) { +import type { RequestHandler } from '@sveltejs/kit' + +export const post: RequestHandler = async ({ request }) => { const form = await request.formData() const player = form.get('user-search') diff --git a/src/routes/profile.svelte b/src/routes/profile.svelte new file mode 100644 index 0000000..c88b8fe --- /dev/null +++ b/src/routes/profile.svelte @@ -0,0 +1,79 @@ +<script lang="ts" context="module"> + import type { Load } from '@sveltejs/kit' + import { API_URL } from '$lib/api' + import type { AccountSchema, CleanMemberProfile, CleanUser, SessionSchema } from '$lib/APITypes' + import Head from '$lib/Head.svelte' + import Header from '$lib/Header.svelte' + + export const load: Load = async ({ params, fetch, session }) => { + const sessionResponse: { session: SessionSchema | null; account: AccountSchema | null } | null = + await fetch(`${API_URL}accounts/session`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + uuid: session.sid, + }), + }).then(r => r.json()) + + const playerResponse = sessionResponse?.account + ? await fetch( + `${API_URL}player/${sessionResponse.account.minecraftUuid}?customization=true` + ).then(r => r.json()) + : null + + // redirect to /login if the user is not logged in + if (!sessionResponse?.account) { + return { redirect: '/login', status: 303 } + } + + return { + props: { + session: sessionResponse.session, + account: sessionResponse.account, + player: playerResponse, + }, + } + } +</script> + +<script lang="ts"> + import Emoji from '$lib/Emoji.svelte' + + export let session: SessionSchema | null + export let account: AccountSchema | null + export let player: CleanUser | null +</script> + +<Head title="Customize Profile" /> +<Header /> + +<main> + {#if session && session._id} + <a href="/logout?sid={session._id}" class="logout"><button>Log out</button></a> + {/if} + <h1>Customize Profile</h1> + <noscript> + <p><Emoji value="⚠" /> Please enable JavaScript to use this page.</p> + </noscript> + {#if player && player.player} + <a href="/player/{player.player.username}">View profile</a> + {:else} + <p><Emoji value="⚠" /> No linked Minecraft account</p> + {/if} + <p> + Pack: <select> + <option value="default">Default</option> + <option value="custom">Custom</option> + </select> + </p> +</main> + +<style> + .logout { + position: absolute; + top: 0.5em; + right: 0.5em; + } +</style> diff --git a/src/routes/verify.svelte b/src/routes/verify.svelte new file mode 100644 index 0000000..e900a5f --- /dev/null +++ b/src/routes/verify.svelte @@ -0,0 +1,63 @@ +<script lang="ts" context="module"> + import type { Load } from '@sveltejs/kit' + export const load: Load = async ({ params, fetch, session, url }) => { + if (session.sid === undefined) { + return { redirect: '/login', status: 303 } + } + return { + props: { + errorCode: url.searchParams.get('error'), + current: url.searchParams.get('current'), + correct: url.searchParams.get('correct'), + }, + } + } +</script> + +<script lang="ts"> + import Emoji from '$lib/Emoji.svelte' + import Head from '$lib/Head.svelte' + import Header from '$lib/Header.svelte' + + export let errorCode: string | null + export let current: string | null + export let correct: string | null + + const errorCodes = { + NO_IGN: 'Please enter a valid Minecraft username.', + NOT_LINKED: + 'Please link your Discord in Hypixel by doing /profile -> Social media -> Discord. If you just changed it, wait a few minutes and try again.', + WRONG_NAME: `You're linked to ${current} on Hypixel. Please change this to ${correct} by doing /profile -> Social media -> Discord. If you just changed it, wait a few minutes and try again.`, + NO_KEY: + "This instance of skyblock-stats doesn't have a skyblock-api key set. Please contact the owner of the website if you believe this to be a mistake.", + } +</script> + +<Head title="Verify Account" /> +<Header /> + +<main> + <h1>Verify Minecraft account</h1> + <p>Please enter your Minecraft username to verify that this is your account.</p> + <p>This will check with the Hypixel API that your Discord username matches your Hypixel name.</p> + {#if errorCode && errorCode in errorCodes} + <div class="error"> + <Emoji value="🚫" /> + {errorCodes[errorCode]} + </div> + {/if} + <form method="post" action="/verify"> + <input placeholder="Username or UUID" name="ign" required /> + <input type="submit" value="Enter" /> + </form> +</main> + +<style> + p { + margin: 0; + } + .error { + font-weight: bold; + margin: 1em 0; + } +</style> diff --git a/src/routes/verify.ts b/src/routes/verify.ts new file mode 100644 index 0000000..5951314 --- /dev/null +++ b/src/routes/verify.ts @@ -0,0 +1,104 @@ +import { API_URL } from '$lib/api' +import type { AccountSchema, CleanUser, SessionSchema } from '$lib/APITypes' +import type { RequestHandler } from '@sveltejs/kit' + +function redirect(status: number, location: string) { + return { + status, + headers: { + location, + }, + } +} + +export const post: RequestHandler = async ({ request, locals }) => { + console.log('ok!') + if (!process.env.SKYBLOCK_STATS_API_KEY) { + return redirect(303, `/verify?error=NO_KEY`) + } + console.log('sid check') + if (locals.sid === undefined) { + // return { + // status: 303, + // redirect: '/login', + // } + return redirect(303, '/login') + } + + const form = await request.formData() + + // username or uuid + const playerIdentifier = form.get('ign') + console.log('ign check') + if (!playerIdentifier) { + // return { + // status: 303, + // redirect: '/verify?error=NO_IGN', + // } + return redirect(303, `/verify?error=NO_IGN`) + } + + const playerResponse: CleanUser = await fetch(`${API_URL}player/${playerIdentifier}`).then(res => res.json()) + const sessionResponse: { session: SessionSchema | null, account: AccountSchema | null } = await fetch(`${API_URL}accounts/session`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + uuid: locals.sid, + }), + }).then(r => r.json()) + + console.log('session check') + if (!sessionResponse.session) + // return { + // status: 303, + // redirect: '/login', + // } + return redirect(303, '/login') + + const hypixelDiscordName = playerResponse.player?.socials.discord + + console.log('discord check') + if (!hypixelDiscordName) + // return { + // status: 303, + // redirect: '/verify?error=NOT_LINKED', + // } + return redirect(303, `/verify?error=NOT_LINKED`) + + + const discordUser = sessionResponse.session.discord_user + const actualDiscordName = discordUser.name + // some people link themselves as <id>#<discrim> instead of <name>#<discrim> + const actualDiscordIdDiscrim = `${discordUser.id}#${discordUser.name.split('#')[1]}` + + console.log('name check') + if (!(hypixelDiscordName === actualDiscordName || hypixelDiscordName === actualDiscordIdDiscrim)) + // return { + // status: 303, + // redirect: `/verify?error=WRONG_NAME?current=${hypixelDiscordName}&correct=${actualDiscordName}`, + // } + return redirect(303, `/verify?error=WRONG_NAME¤t=${encodeURIComponent(hypixelDiscordName)}&correct=${encodeURIComponent(actualDiscordName)}`) + + const updatedAccount: AccountSchema = { + discordId: sessionResponse.session.discord_user.id, + minecraftUuid: playerResponse.player?.uuid + } + + await fetch(`${API_URL}accounts/update`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + key: process.env.SKYBLOCK_STATS_API_KEY + }, + body: JSON.stringify(updatedAccount), + }).then(r => r.json()) + + console.log('epic') + // return { + // status: 303, + // redirect: '/profile' + // } + return redirect(303, '/profile') +}
\ No newline at end of file diff --git a/static/discord-mark-light.svg b/static/discord-mark-light.svg new file mode 100644 index 0000000..f905d23 --- /dev/null +++ b/static/discord-mark-light.svg @@ -0,0 +1,10 @@ +<svg width="71" height="55" viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0)"> +<path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" fill="#ffffff"/> +</g> +<defs> +<clipPath id="clip0"> +<rect width="71" height="55" fill="white"/> +</clipPath> +</defs> +</svg> diff --git a/static/discord-mark.svg b/static/discord-mark.svg new file mode 100644 index 0000000..3efe1ec --- /dev/null +++ b/static/discord-mark.svg @@ -0,0 +1,10 @@ +<svg width="71" height="55" viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0)"> +<path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" fill="#5865F2"/> +</g> +<defs> +<clipPath id="clip0"> +<rect width="71" height="55" fill="white"/> +</clipPath> +</defs> +</svg> |