From 4dbc56e98ce59cb09f5992b8a0b1669ee280c462 Mon Sep 17 00:00:00 2001 From: "Kalle (Sendou)" <38327916+Sendouc@users.noreply.github.com> Date: Sat, 27 Nov 2021 16:08:32 +0200 Subject: [PATCH] Port auth --- .env | 2 +- .env.example | 5 +- app/components/Layout/UserItem.tsx | 7 +- app/root.tsx | 30 ++- app/services/user.ts | 62 +++++ package-lock.json | 399 +++++++++++++++++++++++++++++ package.json | 8 + prisma/client.ts | 3 +- server/auth.ts | 74 ++++++ server/index.ts | 23 +- 10 files changed, 597 insertions(+), 16 deletions(-) create mode 100644 app/services/user.ts create mode 100644 server/auth.ts diff --git a/.env b/.env index a1c899d42..73496e2ef 100644 --- a/.env +++ b/.env @@ -5,7 +5,7 @@ DATABASE_URL=postgresql://sendou@localhost:5432/sendou_ink_trpc?schema=public // you can get them by making an application on https://discord.com/developers DISCORD_CLIENT_ID=581483359159582722 DISCORD_CLIENT_SECRET=qxFxBlALcRsqUG2m7WYLHJ8rzjbddBTx -DISCORD_CALLBACK_URL=http://localhost:3001/auth/discord/callback +DISCORD_CALLBACK_URL=http://localhost:3000/auth/discord/callback COOKIE_SECRET=secret FRONTEND_URL=http://localhost:3000 diff --git a/.env.example b/.env.example index c5a374ac4..87aecf84b 100644 --- a/.env.example +++ b/.env.example @@ -5,8 +5,5 @@ DATABASE_URL=postgresql://sendou@localhost:5432/sendou_ink?schema=public // you can get them by making an application on https://discord.com/developers DISCORD_CLIENT_ID= DISCORD_CLIENT_SECRET= -DISCORD_CALLBACK_URL=http://localhost:3001/auth/discord/callback +DISCORD_CALLBACK_URL=http://localhost:3000/auth/discord/callback COOKIE_SECRET= -FRONTEND_URL=http://localhost:3000 - -VITE_BACKEND_URL=http://localhost:3001 diff --git a/app/components/Layout/UserItem.tsx b/app/components/Layout/UserItem.tsx index 56d9f08cb..6d95362ae 100644 --- a/app/components/Layout/UserItem.tsx +++ b/app/components/Layout/UserItem.tsx @@ -1,19 +1,20 @@ +import { useUserContext } from "~/root"; import { DiscordIcon } from "../icons/Discord"; // TODO: redirect to same page on login export function UserItem() { - const user = null; + const user = useUserContext(); if (user) return ( ); return ( -
+