diff --git a/src/lib/models/UserModel.ts b/src/lib/models/UserModel.ts
index 42e9e0a..ad8002a 100644
--- a/src/lib/models/UserModel.ts
+++ b/src/lib/models/UserModel.ts
@@ -1,9 +1,10 @@
type UserModel = {
username: string;
name: string;
- bio: string | undefined;
- image: string | undefined;
- headerImage: string | undefined;
- sites: string[] | undefined;
+ email: string;
+ bio: string | null;
+ profileImage: string | null;
+ headerImage: string | null;
+ urls: string[];
};
export default UserModel;
diff --git a/src/lib/utils/mappers/userMapper.ts b/src/lib/utils/mappers/userMapper.ts
index 79020cc..9f9de98 100644
--- a/src/lib/utils/mappers/userMapper.ts
+++ b/src/lib/utils/mappers/userMapper.ts
@@ -9,8 +9,11 @@ const mapAuthUserToUserModel = (
? {
username: user.username,
name: user.name,
+ email: user.email,
bio: user.bio,
- image: user.image,
+ profileImage: user.profileImage,
+ headerImage: user.headerImage,
+ urls: [],
}
: undefined;
@@ -21,8 +24,11 @@ const mapDbAuthUserToUserModel = (
? {
username: user.username ?? "unknownuser",
name: user.name ?? "Unknown User",
+ email: user.email,
bio: user.bio,
- image: user.image,
+ profileImage: user.profileImage,
+ headerImage: user.headerImage,
+ urls: [],
}
: undefined;
diff --git a/src/lib/utils/upload.ts b/src/lib/utils/upload.ts
new file mode 100644
index 0000000..8aa56f0
--- /dev/null
+++ b/src/lib/utils/upload.ts
@@ -0,0 +1,5 @@
+import { type ProfileImageRouter } from "@/app/api/uploadthing/core";
+import { generateReactHelpers } from "@uploadthing/react/hooks";
+
+export const { useUploadThing, uploadFiles } =
+ generateReactHelpers
();
diff --git a/src/server/api/routers/user.ts b/src/server/api/routers/user.ts
index f4e775c..79fc4a2 100644
--- a/src/server/api/routers/user.ts
+++ b/src/server/api/routers/user.ts
@@ -1,7 +1,4 @@
-import {
- mapAuthUserToUserModel,
- mapDbAuthUserToUserModel,
-} from "@/lib/utils/mappers/userMapper";
+import { mapDbAuthUserToUserModel } from "@/lib/utils/mappers/userMapper";
import {
createTRPCRouter,
protectedProcedure,
@@ -47,4 +44,43 @@ export const userRouter = createTRPCRouter({
return user;
}),
+ updateUser: protectedProcedure
+ .input(
+ z.object({
+ username: z.string(),
+ email: z.string().email(),
+ bio: z.string().nullable(),
+ urls: z.array(z.string()),
+ profileImage: z.string().nullable(),
+ headerImage: z.string().nullable(),
+ })
+ )
+ .mutation(
+ async ({
+ input: { username, email, bio, urls, profileImage, headerImage },
+ ctx,
+ }) => {
+ const user = await ctx.prisma.user.findUnique({
+ where: { id: ctx.session.id },
+ });
+ if (!user) {
+ throw new trpc.TRPCError({
+ code: "FORBIDDEN",
+ message: "User is not authenticated.",
+ });
+ }
+ await ctx.prisma.user.update({
+ where: { id: ctx.session.id },
+ data: {
+ ...user,
+ username,
+ email,
+ bio,
+ urls,
+ profileImage,
+ headerImage,
+ },
+ });
+ }
+ ),
});
diff --git a/src/server/auth.ts b/src/server/auth.ts
index 0716f8d..dd763aa 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -1,11 +1,17 @@
-import { type GetServerSidePropsContext } from "next";
-import { getServerSession, type NextAuthOptions } from "next-auth";
-import GoogleProvider from "next-auth/providers/google";
-import CredentialsProvider from "next-auth/providers/credentials";
-import { PrismaAdapter } from "@next-auth/prisma-adapter";
import { env } from "@/env.mjs";
+import { mapDbAuthUserToUserModel } from "@/lib/utils/mappers/userMapper";
import { prisma } from "@/server/db";
+import { PrismaAdapter } from "@next-auth/prisma-adapter";
import { verify } from "argon2";
+import { type GetServerSidePropsContext } from "next";
+import {
+ getServerSession,
+ type NextAuthOptions,
+ type Session,
+ type User,
+} from "next-auth";
+import CredentialsProvider from "next-auth/providers/credentials";
+import GoogleProvider from "next-auth/providers/google";
export const authOptions: NextAuthOptions = {
session: {
@@ -13,21 +19,26 @@ export const authOptions: NextAuthOptions = {
},
callbacks: {
session: ({ session, token }) => {
- if (token) {
- session.id = token.id as string;
- session.id = token.id as string;
- }
-
- return session;
+ return {
+ id: token.id,
+ user: token.user,
+ } as Session;
},
- jwt: ({ token, user }) => {
- if (user) {
- token.id = user.id;
- token.email = user.email;
- token.name = user.name;
- token.bio = user.bio;
+ jwt: async ({ token }) => {
+ if (!token.email) {
+ return token;
+ }
+ const user = await prisma.user.findFirst({
+ where: {
+ email: token.email,
+ },
+ });
+ if (user) {
+ return {
+ id: token.sub,
+ user: mapDbAuthUserToUserModel(user),
+ };
}
-
return token;
},
},
@@ -48,35 +59,40 @@ export const authOptions: NextAuthOptions = {
password: { label: "Password", type: "password" },
},
authorize: async (credentials) => {
- if (!credentials?.email || !credentials?.password) {
+ try {
+ if (!credentials?.email || !credentials?.password) {
+ return null;
+ }
+
+ const user = await prisma.user.findFirst({
+ where: { email: credentials.email },
+ });
+
+ if (!user || !user.password) {
+ return null;
+ }
+
+ const isValidPassword = await verify(
+ user.password,
+ credentials.password
+ );
+
+ if (!isValidPassword) {
+ return null;
+ }
+
+ return {
+ id: user.id,
+ name: user.name,
+ bio: user.bio,
+ email: user.email,
+ username: user.username,
+ profileImage: user.profileImage,
+ headerImage: user.headerImage,
+ } as User;
+ } catch (e) {
return null;
}
-
- const user = await prisma.user.findFirst({
- where: { email: credentials.email },
- });
-
- if (!user || !user.password) {
- return null;
- }
-
- const isValidPassword = await verify(
- user.password,
- credentials.password
- );
-
- if (!isValidPassword) {
- return null;
- }
-
- return {
- id: user.id,
- name: user.name,
- bio: user.bio,
- email: user.email,
- username: user.username,
- image: user.image,
- };
},
}),
],
diff --git a/src/styles/globals.css b/src/styles/globals.css
index d5a0fdc..5942b62 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -37,23 +37,22 @@
}
.dark {
- --background: #0E2954;
+ --background: #0e2954;
--foreground: 222.2 47.4% 11.2%;
- --card: #1F6E8C;
+ --card: #1f6e8c;
--card-foreground: 222.2 47.4% 11.2%;
- --muted: #2E8A99;
- --muted-foreground: 222.2 47.4% 11.2%;
-
- --accent: #84A7A1;
+ --muted: #2e8a99;
+ --muted-foreground: #374151;
+ --accent: #84a7a1;
--accent-foreground: 210 40% 98%;
--popover: 224 71% 4%;
--popover-foreground: 215 20.2% 65.1%;
- --border: 216 34% 17%;
- --input: 216 34% 17%;
+ --border: #374151;
+ --input: #374151;
--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 1.2%;
@@ -64,7 +63,7 @@
--destructive: 0 63% 31%;
--destructive-foreground: 210 40% 98%;
- --ring: 216 34% 17%;
+ --ring: #374151;
--radius: 0.5rem;
}
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 9fd63ad..04f6c43 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -14,9 +14,9 @@ const config: Config = {
},
extend: {
colors: {
- border: "hsl(var(--border))",
- input: "hsl(var(--input))",
- ring: "hsl(var(--ring))",
+ border: "var(--border)",
+ input: "var(--input)",
+ ring: "var(--ring)",
background: "var(--background)",
foreground: "var(--foreground)",
primary: {
@@ -33,7 +33,7 @@ const config: Config = {
},
muted: {
DEFAULT: "var(--muted)",
- foreground: "hsl(var(--muted-foreground))",
+ foreground: "var(--muted-foreground)",
},
accent: {
DEFAULT: "var(--accent)",
diff --git a/types/next-auth.d.ts b/types/next-auth.d.ts
index 4b20507..bf9e8f9 100644
--- a/types/next-auth.d.ts
+++ b/types/next-auth.d.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
import NextAuth from "next-auth";
declare module "next-auth" {
@@ -8,10 +9,11 @@ declare module "next-auth" {
interface User {
id: string;
- name: string;
- email: string;
- image: string;
- bio: string;
username: string;
+ name: string;
+ bio: string;
+ email: string;
+ profileImage: string;
+ headerImage: string;
}
}
})
+ )}
+