core/Projektarbeit-MYP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix auth, update image

Browse Source
This commit is contained in:
Torben Haack 2024-10-10 15:33:11 +02:00
parent 4fec0fb433
commit b798040704
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packages/reservation-platform/docker/myp-rp_latest.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

18
packages/reservation-platform/src/app/auth/login/callback/route.ts
View File

@ -9,6 +9,13 @@ import { cookies } from "next/headers";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
interface GithubEmailResponse {
email: string;
primary: boolean;
verified: boolean;
visibility: string;
}
export async function GET(request: Request): Promise<Response> { export async function GET(request: Request): Promise<Response> {
const url = new URL(request.url); const url = new URL(request.url);
const code = url.searchParams.get("code"); const code = url.searchParams.get("code");
@ -35,7 +42,16 @@ export async function GET(request: Request): Promise<Response> {
}); });
const githubUser: GitHubUserResult = await githubUserResponse.json(); const githubUser: GitHubUserResult = await githubUserResponse.json();
// Replace this with your own DB client. // Sometimes email can be null in the user query.
if (githubUser.email === null || githubUser.email === undefined) {
const githubEmailResponse = await fetch("https://git.i.mercedes-benz.com/api/v3/user/emails", {
headers: {
Authorization: `Bearer ${tokens.accessToken}`,
},
});
const githubUserEmail: GithubEmailResponse[] = await githubEmailResponse.json();
githubUser.email = githubUserEmail[0].email;
}
const existingUser = await db.query.users.findFirst({ const existingUser = await db.query.users.findFirst({
where: eq(users.github_id, githubUser.id), where: eq(users.github_id, githubUser.id),
}); });