Use AWS Cognito for user management (#432)

dotkom · Sep 10, 2023 · c8f7ace · c8f7ace · vercel · Sep 11, 2023
1 parent c56814b
commit c8f7ace
Show file tree

Hide file tree

Showing 82 changed files with 597 additions and 1,131 deletions.
diff --git a/.env.local b/.env.local
@@ -1,10 +1,6 @@
 # Database
 DATABASE_URL=postgres://ow:owpassword123@localhost:6543/ow
 
-# Hydra
-HYDRA_ADMIN_URL=http://127.0.0.1:4445
-HYDRA_PUBLIC_URL=http://127.0.0.1:4444
-
 # NextAuth
 NEXTAUTH_URL=http://localhost:3000
 NEXTAUTH_CLIENT_ID=

diff --git a/README.md b/README.md
@@ -10,22 +10,9 @@ https://owdocs.vercel.app
 
 1. `pnpm i` to install packages
 2. `pnpm build` to build packages
-3. `docker-compose up` to start Hydra and databases
-4. If you want authentication (optional), run:
-
-```
-docker exec hydra hydra create --endpoint http://127.0.0.1:4445 oauth2-client \
-        --name onlineweb \
-        --client-uri onlineweb \
-        --token-endpoint-auth-method none \
-        --grant-type authorization_code,refresh_token \
-        --response-type code \
-        --scope profile,email,openid \
-        --redirect-uri http://localhost:3000/api/auth/callback/onlineweb
-```
-
-5. The command will output a client id, set this in apps/web/.env. Copy the example from .env.example
-6. `pnpm dev` to run the project
+3. `docker-compose up` to start databases
+4. The command will output a client id, set this in apps/web/.env. Copy the example from .env.example
+5. `pnpm dev` to run the project
    - You can run `pnpm dev --filter=<project>` to run a certain project from root, such as `pnpm dev --filter=web`
 
 ### [Payment] How to configure stripe (locally)

diff --git a/apps/dashboard/.env.local b/apps/dashboard/.env.local
@@ -0,0 +1 @@
+NEXTAUTH_URL=http://localhost:3002
diff --git a/apps/dashboard/next.config.mjs b/apps/dashboard/next.config.mjs
@@ -10,10 +10,13 @@ const config = {
   experimental: {
     appDir: true,
   },
-  transpilePackages: ["@dotkomonline/ui", "@dotkomonline/types","@dotkomonline/auth", "@dotkomonline/api"],
-  eslint: {
-    ignoreDuringBuilds: !!process.env.CI,
-  },
+  transpilePackages: [
+      "@dotkomonline/auth",
+    "@dotkomonline/env",
+    "@dotkomonline/gateway-trpc",
+    "@dotkomonline/types",
+    "@dotkomonline/ui"
+  ],
 }
 
 export default config
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@dotkomonline/auth": "workspace:*",
+    "@dotkomonline/env": "workspace:*",
     "@dotkomonline/gateway-trpc": "workspace:*",
     "@dotkomonline/types": "workspace:*",
     "@dotkomonline/ui": "workspace:*",

diff --git a/apps/dashboard/src/app/ApplicationShell.tsx b/apps/dashboard/src/app/ApplicationShell.tsx
@@ -62,12 +62,6 @@ const SIDEBAR_LINKS = [
     label: "Komiteer",
     targetSegment: "committee",
   },
-  {
-    icon: "tabler:user-circle",
-    href: "/user",
-    label: "Brukere",
-    targetSegment: "user",
-  },
 ]
 
 const ApplicationSidebar: FC = () => {

diff --git a/apps/dashboard/src/app/user/UserDetailsModal.tsx b/apps/dashboard/src/app/user/UserDetailsModal.tsx
diff --git a/apps/dashboard/src/app/user/page.tsx b/apps/dashboard/src/app/user/page.tsx
diff --git a/apps/dashboard/src/pages/api/auth/[...nextauth].ts b/apps/dashboard/src/pages/api/auth/[...nextauth].ts
@@ -1,4 +1,4 @@
-import { authOptions } from "@dotkomonline/auth"
 import NextAuth from "next-auth"
+import { dashboard as authOptions } from "@dotkomonline/auth"
 
 export default NextAuth(authOptions)
diff --git a/apps/dashboard/src/trpc.ts b/apps/dashboard/src/trpc.ts
@@ -3,19 +3,19 @@ import { CreateTRPCClientOptions, httpBatchLink, loggerLink } from "@trpc/client
 import { inferRouterInputs, inferRouterOutputs } from "@trpc/server"
 import type { AppRouter } from "@dotkomonline/gateway-trpc"
 import superjson from "superjson"
+import { env } from "@dotkomonline/env"
 
 const getBaseUrl = () => {
-  if (process.env.NODE_ENV === "production") return "https://new.online.ntnu.no/"
-  if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}` // SSR should use vercel url
-  return `http://localhost:${process.env.PORT ?? 3000}` // dev SSR should use localhost
+  if (env.NODE_ENV === "production") return "https://new.online.ntnu.no/"
+  if (env.VERCEL_URL) return `https://${env.VERCEL_URL}`
+  return `http://localhost:3002`
 }
 
 export const trpcConfig: CreateTRPCClientOptions<AppRouter> = {
   transformer: superjson,
   links: [
     loggerLink({
-      enabled: (opts) =>
-        process.env.NODE_ENV === "development" || (opts.direction === "down" && opts.result instanceof Error),
+      enabled: (opts) => env.NODE_ENV === "development" || (opts.direction === "down" && opts.result instanceof Error),
     }),
     httpBatchLink({
       url: `${getBaseUrl()}/api/trpc`,

diff --git a/apps/db-migrator/package.json b/apps/db-migrator/package.json
@@ -2,6 +2,7 @@
   "name": "db-migrator",
   "type": "module",
   "dependencies": {
+    "@dotkomonline/env": "workspace:*",
     "@dotkomonline/db": "workspace:*",
     "@dotkomonline/types": "workspace:*",
     "chalk": "^5.3.0",
@@ -11,7 +12,7 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@dotkomonline/logger": "*",
+    "@dotkomonline/logger": "workspace:*",
     "@faker-js/faker": "^7.6.0",
     "@types/eslint": "^8.44.1",
     "@types/pg": "^8.10.2",

diff --git a/apps/db-migrator/src/db.ts b/apps/db-migrator/src/db.ts
@@ -2,7 +2,7 @@ import { CockroachDialect, Database } from "@dotkomonline/db"
 import { Kysely, CamelCasePlugin } from "kysely"
 import pg from "pg"
 
-import { env } from "./env"
+import { env } from "@dotkomonline/env"
 
 export const db = new Kysely<Database>({
   dialect: new CockroachDialect({

diff --git a/apps/db-migrator/src/env.ts b/apps/db-migrator/src/env.ts
diff --git a/apps/web/.env.local b/apps/web/.env.local
@@ -0,0 +1 @@
+NEXTAUTH_URL=http://localhost:3000
diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
@@ -1,6 +1,3 @@
-/* eslint-disable */
-!process.env.SKIP_ENV_VALIDATION && (await import("./src/env/server.mjs"))
-
 /**
  * @type {import('next').NextConfig}
  */
@@ -14,10 +11,16 @@ const config = {
     appDir: true,
     swcPlugins: [["next-superjson-plugin", {}]]
   },
-  transpilePackages: ["@dotkomonline/ui", "@dotkomonline/types", "@dotkomonline/api"],
-  eslint: {
-    ignoreDuringBuilds: !!process.env.CI,
-  },
+  transpilePackages: [
+    "@dotkomonline/auth",
+    "@dotkomonline/db",
+    "@dotkomonline/env",
+    "@dotkomonline/emails",
+    "@dotkomonline/gateway-edge-nextjs",
+    "@dotkomonline/gateway-trpc",
+    "@dotkomonline/types",
+    "@dotkomonline/ui",
+  ],
 }
 
 export default config
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -15,16 +15,16 @@
   },
   "dependencies": {
     "@aws-sdk/client-ses": "^3.379.1",
-    "@clerk/nextjs": "^4.23.1",
-    "@clerk/themes": "^1.7.5",
+    "@dotkomonline/auth": "workspace:*",
+    "@dotkomonline/db": "workspace:*",
+    "@dotkomonline/env": "workspace:*",
     "@dotkomonline/emails": "workspace:*",
     "@dotkomonline/gateway-edge-nextjs": "workspace:*",
     "@dotkomonline/gateway-trpc": "workspace:*",
     "@dotkomonline/types": "workspace:*",
     "@dotkomonline/ui": "workspace:*",
     "@next/env": "^13.4.12",
     "@next/font": "^13.4.12",
-    "@ory/client": "^1.1.41",
     "@portabletext/react": "^2.0.3",
     "@radix-ui/colors": "^0.1.9",
     "@radix-ui/react-avatar": "^1.0.3",
@@ -58,9 +58,8 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@dotkomonline/config": "^1.0.0",
-    "@dotkomonline/db": "^1.0.0",
-    "@dotkomonline/logger": "*",
+    "@dotkomonline/config": "workspace:*",
+    "@dotkomonline/logger": "workspace:*",
     "@types/cors": "^2.8.13",
     "@types/eslint": "^8.44.1",
     "@types/jsdom": "^21.1.1",

diff --git a/apps/web/src/assets/.gitignore b/apps/web/src/assets/.gitignore
diff --git a/apps/web/src/components/layout/AuthLayout.tsx b/apps/web/src/components/layout/AuthLayout.tsx
diff --git a/apps/web/src/components/organisms/Navbar/ProfileMenu.tsx b/apps/web/src/components/organisms/Navbar/ProfileMenu.tsx
@@ -20,34 +20,32 @@ import {
   DropdownMenuTrigger,
   Icon,
 } from "@dotkomonline/ui"
-import { useRouter } from "next/router"
 import { FC, PropsWithChildren } from "react"
 import { useTheme } from "next-themes"
 import { navigationMenuTriggerStyle } from "./NavigationMenu"
-import { useAuth } from "@clerk/nextjs"
+import { signIn, signOut, useSession } from "next-auth/react"
 
 export const ProfileMenu = () => {
-  const router = useRouter()
-  const { isSignedIn, isLoaded } = useAuth()
+  const { status } = useSession()
 
-  if (!isLoaded) {
+  if (status === "loading") {
     return <Icon icon="tabler:loader-2" className="animate-spin" />
   }
 
-  if (!isSignedIn) {
+  if (status === "unauthenticated") {
     return (
       <>
         <Button
           variant="subtle"
           className={cn(navigationMenuTriggerStyle(), "hover:translate-y-0 active:translate-y-0")}
-          onClick={() => router.push("/sign-in")}
+          onClick={() => signIn("cognito")}
         >
           Log in
         </Button>
         <Button
           variant="gradient"
           className={cn(navigationMenuTriggerStyle(), "ml-3 hover:translate-y-0 active:translate-y-0")}
-          onClick={() => router.push("/sign-up")}
+          onClick={() => signIn("cognito")}
         >
           Sign up
         </Button>
@@ -120,9 +118,7 @@ const linkGroups: Link[][] = [
   ],
 ]
 
-// TODO: link
 const AvatarDropdown: FC<PropsWithChildren> = ({ children }) => {
-  const { signOut } = useAuth()
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>{children}</DropdownMenuTrigger>