Fix issues with Discord OAuth:

* Fix 401 error when fetching GuildMember
* Ensure user cannot access pages without being logged in
* Redirect user back to original URL after OAuth authentication

Author: AlexthePear

src/lib/discord/api.ts

@@ -15,11 +15,11 @@ function makeGetGuildMemberURL(r: GetGuildMemberRequest, apiURL = API_URL): stri
 export async function getGuildMember(r: GetGuildMemberRequest): Promise<APIGuildMember> {
 	const response = await fetch(makeGetGuildMemberURL(r), {
 		headers: {
-			Authorization: `Bearer ${r.botToken}`
+			Authorization: `Bot ${r.botToken}`
 		}
 	});
 	if (!response.ok) {
-		throw new Error(`Failed to get guild member: ${response.statusText}`);
+		throw new Error(`Failed to get guild member: ${response.status} ${response.statusText}`);
 	}
 
 	return await response.json();
@@ -49,7 +49,7 @@ export async function createMessage(r: CreateMessageRequest): Promise<APIGuildMe
 	const response = await fetch(makeCreateMessageURL(r), {
 		method: 'POST',
 		headers: {
-			Authorization: `Bearer ${r.botToken}`
+			Authorization: `Bot ${r.botToken}`
 		},
 		body: JSON.stringify(r.body)
 	});

src/routes/discord_oauth2/+server.ts

@@ -34,7 +34,8 @@ export const GET: RequestHandler = async ({ url, locals }) => {
 		return makeRedirect(
 			makeOAuth2URL({
 				clientID: DISCORD_CLIENT_ID,
-				redirectURI: DISCORD_REDIRECT_URI
+				redirectURI: DISCORD_REDIRECT_URI,
+				state: JSON.stringify({ destination: state.destination })
 			})
 		);
 	}

src/routes/forms/+layout.server.ts

@@ -17,6 +17,6 @@ import { makeOAuth2URL } from '$lib/oauth2';
 
 export const load: LayoutServerLoad = async ({ locals, url }) => {
 	if (!locals.user) {
-		redirect(303, makeOAuth2URL(url.toString()));
+		throw redirect(303, makeOAuth2URL(url.toString()));
 	}
 };