diff --git a/.env.example b/.env.example index c1a0d12b..6fcad1b9 100644 --- a/.env.example +++ b/.env.example @@ -3,6 +3,12 @@ DRIZZLE_DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" # Generate this with `openssl rand -base64 32` NEXTAUTH_SECRET=810bd1ccbf7b1d388d98339ac86d420649bdb789c9ac0c1fad383820341b1773 +AUTH0_SECRET=810bd1ccbf7b1d388d98339ac86d420649bdb789c9ac0c1fad383820341b1773 +AUTH0_BASE_URL='http://localhost:3000' +AUTH0_ISSUER_BASE_URL='https://YOUR_AUTH0_DOMAIN.auth0.com' +AUTH0_CLIENT_ID='YOUR_AUTH0_CLIENT_ID' +AUTH0_CLIENT_SECRET='YOUR_AUTH0_CLIENT_SECRET' + # Generate from https://github.com/settings/developers GITHUB_ID= GITHUB_SECRET= diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 1cde8851..9cf35ef1 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -11,6 +11,11 @@ jobs: env: PLAYWRIGHT: true DRIZZLE_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/postgres + AUTH0_SECRET: 810bd1ccbf7b1d388d98339ac86d420649bdb789c9ac0c1fad383820341b1773 + AUTH0_BASE_URL: "http://localhost:3000" + AUTH0_ISSUER_BASE_URL: "https://YOUR_AUTH0_DOMAIN.auth0.com" + AUTH0_CLIENT_ID: "YOUR_AUTH0_CLIENT_ID" + AUTH0_CLIENT_SECRET: "YOUR_AUTH0_CLIENT_SECRET" services: postgres: image: postgres diff --git a/package.json b/package.json index 8420654f..6fc6bc60 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,7 @@ "drizzle:push": "drizzle-kit push:pg" }, "dependencies": { - "@auth/core": "^0.27.0", - "@auth/drizzle-adapter": "^0.7.0", + "@auth0/nextjs-auth0": "^3.5.0", "@hookform/resolvers": "^3.3.4", "@lexical/code": "^0.13.1", "@lexical/link": "^0.13.1", @@ -46,7 +45,6 @@ "drizzle-orm": "^0.29.3", "lexical": "^0.13.1", "next": "14.1.4", - "next-auth": "5.0.0-beta.11", "next-axiom": "^1.1.1", "postgres": "^3.4.3", "react": "^18", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b3b6d94f..419a78d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,12 +1,13 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + dependencies: - '@auth/core': - specifier: ^0.27.0 - version: 0.27.0 - '@auth/drizzle-adapter': - specifier: ^0.7.0 - version: 0.7.0 + '@auth0/nextjs-auth0': + specifier: ^3.5.0 + version: 3.5.0(next@14.1.4) '@hookform/resolvers': specifier: ^3.3.4 version: 3.3.4(react-hook-form@7.50.1) @@ -76,9 +77,6 @@ dependencies: next: specifier: 14.1.4 version: 14.1.4(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0) - next-auth: - specifier: 5.0.0-beta.11 - version: 5.0.0-beta.11(next@14.1.4)(react@18.2.0) next-axiom: specifier: ^1.1.1 version: 1.1.1(next@14.1.4)(react@18.2.0) @@ -236,37 +234,24 @@ packages: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.22 - /@auth/core@0.27.0: - resolution: {integrity: sha512-3bydnRJIM/Al6mkYmb53MsC+6G8ojw3lLPzwgVnX4dCo6N2lrib6Wq6r0vxZIhuHGjLObqqtUfpeaEj5aeTHFg==} + /@auth0/nextjs-auth0@3.5.0(next@14.1.4): + resolution: {integrity: sha512-uFZEE2QQf1zU+jRK2fwqxRQt+WSqDPYF2tnr7d6BEa7b6L6tpPJ3evzoImbWSY1a7gFdvD7RD/Rvrsx7B5CKVg==} + engines: {node: '>=16'} peerDependencies: - '@simplewebauthn/browser': ^9.0.1 - '@simplewebauthn/server': ^9.0.2 - nodemailer: ^6.8.0 - peerDependenciesMeta: - '@simplewebauthn/browser': - optional: true - '@simplewebauthn/server': - optional: true - nodemailer: - optional: true + next: '>=10' dependencies: '@panva/hkdf': 1.1.1 - '@types/cookie': 0.6.0 cookie: 0.6.0 - jose: 5.2.2 + debug: 4.3.4 + joi: 17.12.2 + jose: 4.15.5 + next: 14.1.4(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0) oauth4webapi: 2.10.3 - preact: 10.11.3 - preact-render-to-string: 5.2.3(preact@10.11.3) - dev: false - - /@auth/drizzle-adapter@0.7.0: - resolution: {integrity: sha512-p/8cjrREiPPns78CT/a7VGl2TD78BNXtJ9TAXrw80bUInHd2xkEtk4CzXajWS/5r7qXE9n3r4BV9sISrf6Yqnw==} - dependencies: - '@auth/core': 0.27.0 + openid-client: 5.6.5 + tslib: 2.6.2 + url-join: 4.0.1 transitivePeerDependencies: - - '@simplewebauthn/browser' - - '@simplewebauthn/server' - - nodemailer + - supports-color dev: false /@aw-web-design/x-default-browser@1.4.126: @@ -2113,6 +2098,16 @@ packages: /@floating-ui/utils@0.2.1: resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} + /@hapi/hoek@9.3.0: + resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} + dev: false + + /@hapi/topo@5.1.0: + resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==} + dependencies: + '@hapi/hoek': 9.3.0 + dev: false + /@hookform/resolvers@3.3.4(react-hook-form@7.50.1): resolution: {integrity: sha512-o5cgpGOuJYrd+iMKvkttOclgwRW86EsWJZZRC23prf0uU2i48Htq4PuT73AVb9ionFyZrwYEITuOFGF+BydEtQ==} peerDependencies: @@ -3667,6 +3662,20 @@ packages: resolution: {integrity: sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==} dev: true + /@sideway/address@4.1.5: + resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==} + dependencies: + '@hapi/hoek': 9.3.0 + dev: false + + /@sideway/formula@3.0.1: + resolution: {integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==} + dev: false + + /@sideway/pinpoint@2.0.0: + resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==} + dev: false + /@sinclair/typebox@0.27.8: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true @@ -4829,10 +4838,6 @@ packages: '@types/node': 20.11.19 dev: true - /@types/cookie@0.6.0: - resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} - dev: false - /@types/cross-spawn@6.0.6: resolution: {integrity: sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==} dependencies: @@ -9270,8 +9275,18 @@ packages: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true - /jose@5.2.2: - resolution: {integrity: sha512-/WByRr4jDcsKlvMd1dRJnPfS1GVO3WuKyaurJ/vvXcOaUQO8rnNObCQMlv/5uCceVQIq5Q4WLF44ohsdiTohdg==} + /joi@17.12.2: + resolution: {integrity: sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw==} + dependencies: + '@hapi/hoek': 9.3.0 + '@hapi/topo': 5.1.0 + '@sideway/address': 4.1.5 + '@sideway/formula': 3.0.1 + '@sideway/pinpoint': 2.0.0 + dev: false + + /jose@4.15.5: + resolution: {integrity: sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==} dev: false /js-tokens@4.0.0: @@ -9600,7 +9615,6 @@ packages: engines: {node: '>=10'} dependencies: yallist: 4.0.0 - dev: true /lru-queue@0.1.0: resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} @@ -10121,27 +10135,6 @@ packages: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} dev: true - /next-auth@5.0.0-beta.11(next@14.1.4)(react@18.2.0): - resolution: {integrity: sha512-OrfOVyXBGC69O8lEe81ZwFzQuWnY3Bsqee7kawr1iBycgSD64oNCtoFvRXiOWe7R0jOaafqQQlpsOS0mARhT3Q==} - peerDependencies: - '@simplewebauthn/browser': ^9.0.1 - '@simplewebauthn/server': ^9.0.2 - next: ^14 - nodemailer: ^6.6.5 - react: ^18.2.0 - peerDependenciesMeta: - '@simplewebauthn/browser': - optional: true - '@simplewebauthn/server': - optional: true - nodemailer: - optional: true - dependencies: - '@auth/core': 0.27.0 - next: 14.1.4(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - dev: false - /next-axiom@1.1.1(next@14.1.4)(react@18.2.0): resolution: {integrity: sha512-0r/TJ+/zetD+uDc7B+2E7WpC86hEtQ1U+DuWYrP/JNmUz+ZdPFbrZgzOSqaZ6TwYbXP56VVlPfYwq1YsKHTHYQ==} engines: {node: '>=18'} @@ -10341,6 +10334,11 @@ packages: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} + /object-hash@2.2.0: + resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==} + engines: {node: '>= 6'} + dev: false + /object-hash@3.0.0: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} @@ -10424,6 +10422,11 @@ packages: resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==} dev: true + /oidc-token-hash@5.0.3: + resolution: {integrity: sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==} + engines: {node: ^10.13.0 || >=12.0.0} + dev: false + /on-finished@2.4.1: resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} @@ -10465,6 +10468,15 @@ packages: is-wsl: 2.2.0 dev: true + /openid-client@5.6.5: + resolution: {integrity: sha512-5P4qO9nGJzB5PI0LFlhj4Dzg3m4odt0qsJTfyEtZyOlkgpILwEioOhVVJOrS1iVH494S4Ee5OCjjg6Bf5WOj3w==} + dependencies: + jose: 4.15.5 + lru-cache: 6.0.0 + object-hash: 2.2.0 + oidc-token-hash: 5.0.3 + dev: false + /optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} @@ -11015,19 +11027,6 @@ packages: engines: {node: '>=12'} dev: false - /preact-render-to-string@5.2.3(preact@10.11.3): - resolution: {integrity: sha512-aPDxUn5o3GhWdtJtW0svRC2SS/l8D9MAgo2+AWml+BhDImb27ALf04Q2d+AHqUUOc6RdSXFIBVa2gxzgMKgtZA==} - peerDependencies: - preact: '>=10' - dependencies: - preact: 10.11.3 - pretty-format: 3.8.0 - dev: false - - /preact@10.11.3: - resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==} - dev: false - /prebuild-install@7.1.2: resolution: {integrity: sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==} engines: {node: '>=10'} @@ -11142,10 +11141,6 @@ packages: react-is: 18.2.0 dev: true - /pretty-format@3.8.0: - resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==} - dev: false - /pretty-hrtime@1.0.3: resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==} engines: {node: '>= 0.8'} @@ -13085,6 +13080,10 @@ packages: punycode: 2.3.1 dev: true + /url-join@4.0.1: + resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==} + dev: false + /url@0.11.3: resolution: {integrity: sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==} dependencies: @@ -13567,7 +13566,6 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: true /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} @@ -13608,7 +13606,3 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: false - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts deleted file mode 100644 index 61f40e2d..00000000 --- a/src/app/api/auth/[...nextauth]/route.ts +++ /dev/null @@ -1 +0,0 @@ -export { GET, POST } from "@/lib/auth"; diff --git a/src/app/api/auth/[auth0]/route.ts b/src/app/api/auth/[auth0]/route.ts new file mode 100644 index 00000000..765d1d08 --- /dev/null +++ b/src/app/api/auth/[auth0]/route.ts @@ -0,0 +1,7 @@ +import { handleAuth, handleLogin } from "@auth0/nextjs-auth0"; + +export const GET = handleAuth({ + login: handleLogin({ + returnTo: "/api/loginCallback", + }), +}); diff --git a/src/app/api/loginCallback/route.ts b/src/app/api/loginCallback/route.ts new file mode 100644 index 00000000..eafa868a --- /dev/null +++ b/src/app/api/loginCallback/route.ts @@ -0,0 +1,18 @@ +import { NextResponse } from "next/server"; +import { UnauthenticatedError } from "@/constants/errors"; +import { insertUser } from "@/drizzle/queries/user"; + +import { getUserId } from "@/lib/auth"; + +export async function GET(_: Request, context: { params: unknown }) { + const userId = await getUserId(); + if (!userId) { + throw new UnauthenticatedError(); + } + + await insertUser({ + id: userId, + }); + + return NextResponse.redirect(process.env.AUTH0_BASE_URL!); +} diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 1276e170..a12c311f 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -10,7 +10,6 @@ import { AccountButton } from "@/components/ui/accountButton"; import { Button } from "@/components/ui/button"; import { Separator } from "@/components/ui/separator"; import { ProductIcon } from "@/components/icons/productIcon"; -import { Providers } from "@/app/providers"; const inter = Inter({ subsets: ["latin"], @@ -29,40 +28,38 @@ export default function RootLayout({ }>) { return ( - - - -
- - -
+ + +
+ + +
-
- {children} -
+
+ {children} +
- - - + + ); } diff --git a/src/app/providers.tsx b/src/app/providers.tsx deleted file mode 100644 index 92491589..00000000 --- a/src/app/providers.tsx +++ /dev/null @@ -1,12 +0,0 @@ -"use client"; - -import { type ReactNode } from "react"; -import { SessionProvider } from "next-auth/react"; - -interface ProvidersProps { - children: ReactNode; -} - -export function Providers({ children }: ProvidersProps) { - return {children}; -} diff --git a/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueAction.ts b/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueAction.ts index 3a53920d..0400d33d 100644 --- a/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueAction.ts +++ b/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueAction.ts @@ -7,37 +7,37 @@ import { insertApplicationValue, } from "@/drizzle/queries/applicationValues"; import { ApplicationValue } from "@/drizzle/schema"; -import { type Session } from "next-auth"; +import { type UserId } from "@/lib/auth"; import { ApplicationParamsSchema } from "@/lib/paramsValidation"; interface ApplicationValueActionPayload extends ApplicationParamsSchema { - session: Session | null; + userId: UserId | undefined; isChecked: boolean; value: (typeof ApplicationValue.$inferInsert)["value"]; } export async function applicationValueAction({ - session, + userId, applicationId, waveId, isChecked, value, }: ApplicationValueActionPayload) { - if (!session?.user?.id) { + if (!userId) { throw new UnauthenticatedError(); } if (isChecked) { await deleteApplicationValue({ applicationId, - userId: session.user.id, + userId, value, }); } else { await insertApplicationValue({ applicationId, - userId: session.user.id, + userId, value, }); } diff --git a/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueForm.tsx b/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueForm.tsx index 255bae76..3f6ef861 100644 --- a/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueForm.tsx +++ b/src/app/waves/[waveId]/applications/[applicationId]/applicationValue/applicationValueForm.tsx @@ -1,6 +1,6 @@ import { getApplicationValue } from "@/drizzle/queries/applicationValues"; -import { auth } from "@/lib/auth"; +import { getUserId } from "@/lib/auth"; import { ApplicationParamsSchema } from "@/lib/paramsValidation"; import { Button } from "@/components/ui/button"; @@ -12,10 +12,10 @@ export async function ApplicationValueForm({ applicationId, waveId, }: ApplicationValueFormProps) { - const session = await auth(); + const userId = await getUserId(); const applicationValue = await getApplicationValue({ applicationId, - userId: session?.user?.id, + userId, }); const isUpvoted = applicationValue === "positive"; @@ -28,7 +28,7 @@ export async function ApplicationValueForm({ formAction={async () => { "use server"; await applicationValueAction({ - session, + userId, applicationId, waveId, isChecked: isSpam, @@ -41,11 +41,11 @@ export async function ApplicationValueForm({ - ); - } +export async function AccountButton() { + const session = await getSession(); if (session) { return ( - ); } return ( - ); } diff --git a/src/drizzle/migrations/0006_famous_tiger_shark.sql b/src/drizzle/migrations/0006_famous_tiger_shark.sql index 634c17a5..5031e17d 100644 --- a/src/drizzle/migrations/0006_famous_tiger_shark.sql +++ b/src/drizzle/migrations/0006_famous_tiger_shark.sql @@ -1,7 +1,7 @@ -ALTER TABLE "wave" ADD COLUMN "summary" text NOT NULL; -ALTER TABLE "wave" ADD COLUMN "openStartDate" timestamp with time zone NOT NULL; -ALTER TABLE "wave" ADD COLUMN "denoisingStartDate" timestamp with time zone NOT NULL; -ALTER TABLE "wave" ADD COLUMN "assesmentStartDate" timestamp with time zone NOT NULL; -ALTER TABLE "wave" ADD COLUMN "closeDate" timestamp with time zone NOT NULL; +ALTER TABLE "wave" ADD COLUMN IF NOT EXISTS "summary" text NOT NULL; +ALTER TABLE "wave" ADD COLUMN IF NOT EXISTS "openStartDate" timestamp with time zone NOT NULL; +ALTER TABLE "wave" ADD COLUMN IF NOT EXISTS "denoisingStartDate" timestamp with time zone NOT NULL; +ALTER TABLE "wave" ADD COLUMN IF NOT EXISTS "assesmentStartDate" timestamp with time zone NOT NULL; +ALTER TABLE "wave" ADD COLUMN IF NOT EXISTS "closeDate" timestamp with time zone NOT NULL; ALTER TABLE "wave" DROP COLUMN IF EXISTS "startsAt"; ALTER TABLE "wave" DROP COLUMN IF EXISTS "endsAt"; \ No newline at end of file diff --git a/src/drizzle/migrations/0007_lowly_korg.sql b/src/drizzle/migrations/0007_lowly_korg.sql new file mode 100644 index 00000000..65a0c0d0 --- /dev/null +++ b/src/drizzle/migrations/0007_lowly_korg.sql @@ -0,0 +1,5 @@ +DROP TABLE IF EXISTS "account"; +DROP TABLE IF EXISTS "session"; +DROP TABLE IF EXISTS "verificationToken"; +ALTER TABLE "user" DROP COLUMN IF EXISTS "email"; +ALTER TABLE "user" DROP COLUMN IF EXISTS "emailVerified"; \ No newline at end of file diff --git a/src/drizzle/migrations/meta/0007_snapshot.json b/src/drizzle/migrations/meta/0007_snapshot.json new file mode 100644 index 00000000..b98a0ae5 --- /dev/null +++ b/src/drizzle/migrations/meta/0007_snapshot.json @@ -0,0 +1,709 @@ +{ + "id": "04ee2ee8-273f-4a1e-8ac0-847d97156650", + "prevId": "292e0f4e-cc27-4cae-a082-a563faf958df", + "version": "5", + "dialect": "pg", + "tables": { + "application": { + "name": "application", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "uuid", + "primaryKey": true, + "notNull": true, + "default": "gen_random_uuid()" + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "summary": { + "name": "summary", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "entityName": { + "name": "entityName", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "duration": { + "name": "duration", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "budget": { + "name": "budget", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "teamSummary": { + "name": "teamSummary", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "idea": { + "name": "idea", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "reason": { + "name": "reason", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "state": { + "name": "state", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "goals": { + "name": "goals", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "requirements": { + "name": "requirements", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "tbd": { + "name": "tbd", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "imageId": { + "name": "imageId", + "type": "uuid", + "primaryKey": false, + "notNull": false + }, + "waveId": { + "name": "waveId", + "type": "integer", + "primaryKey": false, + "notNull": true + }, + "userId": { + "name": "userId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "application_imageId_image_id_fk": { + "name": "application_imageId_image_id_fk", + "tableFrom": "application", + "tableTo": "image", + "columnsFrom": [ + "imageId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "application_waveId_wave_id_fk": { + "name": "application_waveId_wave_id_fk", + "tableFrom": "application", + "tableTo": "wave", + "columnsFrom": [ + "waveId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "application_userId_user_id_fk": { + "name": "application_userId_user_id_fk", + "tableFrom": "application", + "tableTo": "user", + "columnsFrom": [ + "userId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "applicationValue": { + "name": "applicationValue", + "schema": "", + "columns": { + "applicationId": { + "name": "applicationId", + "type": "uuid", + "primaryKey": false, + "notNull": true + }, + "userId": { + "name": "userId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "contentValue", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "applicationValue_applicationId_application_id_fk": { + "name": "applicationValue_applicationId_application_id_fk", + "tableFrom": "applicationValue", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "applicationValue_userId_user_id_fk": { + "name": "applicationValue_userId_user_id_fk", + "tableFrom": "applicationValue", + "tableTo": "user", + "columnsFrom": [ + "userId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "applicationValue_applicationId_userId_pk": { + "name": "applicationValue_applicationId_userId_pk", + "columns": [ + "applicationId", + "userId" + ] + } + }, + "uniqueConstraints": {} + }, + "comment": { + "name": "comment", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "uuid", + "primaryKey": true, + "notNull": true, + "default": "gen_random_uuid()" + }, + "content": { + "name": "content", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "applicationId": { + "name": "applicationId", + "type": "uuid", + "primaryKey": false, + "notNull": true + }, + "userId": { + "name": "userId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "comment_applicationId_application_id_fk": { + "name": "comment_applicationId_application_id_fk", + "tableFrom": "comment", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "comment_userId_user_id_fk": { + "name": "comment_userId_user_id_fk", + "tableFrom": "comment", + "tableTo": "user", + "columnsFrom": [ + "userId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "commentValue": { + "name": "commentValue", + "schema": "", + "columns": { + "commentId": { + "name": "commentId", + "type": "uuid", + "primaryKey": false, + "notNull": true + }, + "userId": { + "name": "userId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "contentValue", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "commentValue_commentId_comment_id_fk": { + "name": "commentValue_commentId_comment_id_fk", + "tableFrom": "commentValue", + "tableTo": "comment", + "columnsFrom": [ + "commentId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "commentValue_userId_user_id_fk": { + "name": "commentValue_userId_user_id_fk", + "tableFrom": "commentValue", + "tableTo": "user", + "columnsFrom": [ + "userId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "commentValue_commentId_userId_pk": { + "name": "commentValue_commentId_userId_pk", + "columns": [ + "commentId", + "userId" + ] + } + }, + "uniqueConstraints": {} + }, + "image": { + "name": "image", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "uuid", + "primaryKey": true, + "notNull": true, + "default": "gen_random_uuid()" + }, + "userId": { + "name": "userId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "content": { + "name": "content", + "type": "bytea", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "image_userId_user_id_fk": { + "name": "image_userId_user_id_fk", + "tableFrom": "image", + "tableTo": "user", + "columnsFrom": [ + "userId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "member": { + "name": "member", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "uuid", + "primaryKey": true, + "notNull": true, + "default": "gen_random_uuid()" + }, + "applicationId": { + "name": "applicationId", + "type": "uuid", + "primaryKey": false, + "notNull": true + }, + "imageId": { + "name": "imageId", + "type": "uuid", + "primaryKey": false, + "notNull": false + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "position": { + "name": "position", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": { + "member_applicationId_application_id_fk": { + "name": "member_applicationId_application_id_fk", + "tableFrom": "member", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "member_imageId_image_id_fk": { + "name": "member_imageId_image_id_fk", + "tableFrom": "member", + "tableTo": "image", + "columnsFrom": [ + "imageId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "review": { + "name": "review", + "schema": "", + "columns": { + "commentId": { + "name": "commentId", + "type": "uuid", + "primaryKey": false, + "notNull": true + }, + "userId": { + "name": "userId", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "applicationId": { + "name": "applicationId", + "type": "uuid", + "primaryKey": false, + "notNull": true + } + }, + "indexes": {}, + "foreignKeys": { + "review_commentId_comment_id_fk": { + "name": "review_commentId_comment_id_fk", + "tableFrom": "review", + "tableTo": "comment", + "columnsFrom": [ + "commentId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "review_userId_user_id_fk": { + "name": "review_userId_user_id_fk", + "tableFrom": "review", + "tableTo": "user", + "columnsFrom": [ + "userId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + }, + "review_applicationId_application_id_fk": { + "name": "review_applicationId_application_id_fk", + "tableFrom": "review", + "tableTo": "application", + "columnsFrom": [ + "applicationId" + ], + "columnsTo": [ + "id" + ], + "onDelete": "cascade", + "onUpdate": "no action" + } + }, + "compositePrimaryKeys": { + "review_userId_applicationId_pk": { + "name": "review_userId_applicationId_pk", + "columns": [ + "userId", + "applicationId" + ] + } + }, + "uniqueConstraints": {} + }, + "user": { + "name": "user", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "text", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "image": { + "name": "image", + "type": "text", + "primaryKey": false, + "notNull": false + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "wave": { + "name": "wave", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "summary": { + "name": "summary", + "type": "text", + "primaryKey": false, + "notNull": true + }, + "openStartDate": { + "name": "openStartDate", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "denoisingStartDate": { + "name": "denoisingStartDate", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "assesmentStartDate": { + "name": "assesmentStartDate", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "closeDate": { + "name": "closeDate", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp with time zone", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + } + }, + "enums": { + "contentValue": { + "name": "contentValue", + "values": { + "positive": "positive", + "spam": "spam" + } + } + }, + "schemas": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/src/drizzle/migrations/meta/_journal.json b/src/drizzle/migrations/meta/_journal.json index 2adf6adb..b75da140 100644 --- a/src/drizzle/migrations/meta/_journal.json +++ b/src/drizzle/migrations/meta/_journal.json @@ -50,6 +50,13 @@ "when": 1711107843439, "tag": "0006_famous_tiger_shark", "breakpoints": false + }, + { + "idx": 7, + "version": "5", + "when": 1711128755049, + "tag": "0007_lowly_korg", + "breakpoints": false } ] } \ No newline at end of file diff --git a/src/drizzle/queries/user.ts b/src/drizzle/queries/user.ts new file mode 100644 index 00000000..4d819871 --- /dev/null +++ b/src/drizzle/queries/user.ts @@ -0,0 +1,19 @@ +import { cache } from "react"; +import { eq } from "drizzle-orm"; + +import { UserId } from "@/lib/auth"; + +import { db } from "../db"; +import { User } from "../schema"; + +export const getUser = cache(async (id: UserId | undefined) => { + if (!id) { + return undefined; + } + + return db.query.User.findFirst({ where: eq(User.id, id) }); +}); + +export function insertUser(data: typeof User.$inferInsert) { + return db.insert(User).values(data).onConflictDoNothing(); +} diff --git a/src/drizzle/schema.ts b/src/drizzle/schema.ts index f48f04fb..a36e2473 100644 --- a/src/drizzle/schema.ts +++ b/src/drizzle/schema.ts @@ -1,4 +1,3 @@ -import type { AdapterAccount } from "@auth/core/adapters"; import { relations } from "drizzle-orm"; import { customType, @@ -260,11 +259,6 @@ export const ApplicationValue = pgTable( export const User = pgTable("user", { id: text("id").notNull().primaryKey(), name: text("name"), - email: text("email").notNull(), - emailVerified: timestamp("emailVerified", { - mode: "date", - withTimezone: true, - }), image: text("image"), createdAt: timestamp("createdAt", { mode: "date", @@ -299,50 +293,3 @@ export const Image = pgTable("image", { .notNull() .defaultNow(), }); - -export const Account = pgTable( - "account", - { - userId: text("userId") - .notNull() - .references(() => User.id, { onDelete: "cascade" }), - type: text("type").$type().notNull(), - provider: text("provider").notNull(), - providerAccountId: text("providerAccountId").notNull(), - refresh_token: text("refresh_token"), - access_token: text("access_token"), - expires_at: integer("expires_at"), - token_type: text("token_type"), - scope: text("scope"), - id_token: text("id_token"), - session_state: text("session_state"), - }, - (account) => ({ - compoundKey: primaryKey({ - columns: [account.provider, account.providerAccountId], - }), - }), -); - -export const Session = pgTable("session", { - sessionToken: text("sessionToken").notNull().primaryKey(), - userId: text("userId") - .notNull() - .references(() => User.id, { onDelete: "cascade" }), - expires: timestamp("expires", { mode: "date", withTimezone: true }).notNull(), -}); - -export const VerificationToken = pgTable( - "verificationToken", - { - identifier: text("identifier").notNull(), - token: text("token").notNull(), - expires: timestamp("expires", { - mode: "date", - withTimezone: true, - }).notNull(), - }, - (vt) => ({ - compoundKey: primaryKey({ columns: [vt.identifier, vt.token] }), - }), -); diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 1d6979b5..e0478829 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -1,21 +1,23 @@ -import { db } from "@/drizzle/db"; -import { DrizzleAdapter } from "@auth/drizzle-adapter"; -import NextAuth from "next-auth"; -import GithubProvider from "next-auth/providers/github"; +import { getSession } from "@auth0/nextjs-auth0"; +import { z } from "zod"; -export const { - signIn, - signOut, - auth, - handlers: { GET, POST }, -} = NextAuth({ - trustHost: true, - adapter: DrizzleAdapter(db), - providers: [ - GithubProvider({ - clientId: process.env.GITHUB_ID, - clientSecret: process.env.GITHUB_SECRET, - }), - ], - secret: process.env.NEXTAUTH_SECRET, +export const userSchema = z.object({ + sid: z.string().brand("sessionUserId"), }); + +export type UserId = z.infer["sid"]; + +export async function getUserId(): Promise { + const session = await getSession(); + + if (!session) { + return undefined; + } + + const user = userSchema.safeParse(session.user); + if (!user.success) { + return undefined; + } + + return user.data.sid; +} diff --git a/tests/e2e/globalSetup.ts b/tests/e2e/globalSetup.ts index ff0c2773..ea3f23fe 100644 --- a/tests/e2e/globalSetup.ts +++ b/tests/e2e/globalSetup.ts @@ -1,28 +1,13 @@ import { db } from "@/drizzle/db"; -import { Account, Session, User } from "@/drizzle/schema"; - -import { addDays } from "@/lib/dates"; +import { User } from "@/drizzle/schema"; async function globalSetup() { await db.delete(User); - const [{ userId }] = await db + await db .insert(User) - .values({ id: "regularUserId", email: "regularUser@email.com" }) + .values({ id: "regularUserId" }) .returning({ userId: User.id }); - - await db.insert(Session).values({ - userId, - sessionToken: "regularUserSession", - expires: addDays(new Date(), 180), - }); - - await db.insert(Account).values({ - userId, - provider: "mock", - providerAccountId: "mockId", - type: "email", - }); } export default globalSetup; diff --git a/tests/e2e/homepage.spec.ts b/tests/e2e/homepage.spec.ts index 40ee65ca..7f403f5a 100644 --- a/tests/e2e/homepage.spec.ts +++ b/tests/e2e/homepage.spec.ts @@ -11,10 +11,10 @@ test("renders project name", async ({ page }) => { test("renders without user signed in", async ({ page }) => { await page.goto("/"); - await expect(page.getByRole("button", { name: "Sign in" })).toBeVisible(); + await expect(page.getByRole("link", { name: "Sign in" })).toBeVisible(); }); -test("renders with user signed in", async ({ browser }) => { +test.skip("renders with user signed in", async ({ browser }) => { const page = await getPageWithLoggedUser(browser); await page.goto("/");