From 4f5fc2b577fbe8eaecaf9b1641fe0c9f9a2633bb Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Sat, 7 Sep 2024 16:12:00 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Use=20profile=20image=20from=20oaut?=
 =?UTF-8?q?h=20provider?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/declarations/next-auth.d.ts          |  4 +-
 apps/web/src/app/[locale]/(admin)/sidebar.tsx |  2 +-
 .../src/components/current-user-avatar.tsx    | 14 ++++++
 .../components/settings/profile-settings.tsx  |  8 ++-
 apps/web/src/components/user-dropdown.tsx     |  4 +-
 apps/web/src/components/user-provider.tsx     |  4 +-
 apps/web/src/components/user.tsx              | 16 ------
 apps/web/src/utils/auth.ts                    |  4 ++
 packages/ui/package.json                      |  1 +
 packages/ui/src/avatar.tsx                    | 50 +++++++++++++++++++
 packages/ui/src/command.tsx                   |  2 +-
 packages/ui/tsconfig.json                     |  5 ++
 yarn.lock                                     | 10 ++++
 13 files changed, 95 insertions(+), 29 deletions(-)
 create mode 100644 apps/web/src/components/current-user-avatar.tsx
 create mode 100644 packages/ui/src/avatar.tsx

diff --git a/apps/web/declarations/next-auth.d.ts b/apps/web/declarations/next-auth.d.ts
index 42e5183c45b..eb7f8cb8989 100644
--- a/apps/web/declarations/next-auth.d.ts
+++ b/apps/web/declarations/next-auth.d.ts
@@ -11,13 +11,11 @@ declare module "next-auth" {
   interface Session {
     user: {
       id: string;
-      name?: string | null;
-      email?: string | null;
       timeZone?: string | null;
       timeFormat?: TimeFormat | null;
       locale?: string | null;
       weekStart?: number | null;
-    };
+    } & DefaultSession["user"];
   }
 
   interface User extends DefaultUser {
diff --git a/apps/web/src/app/[locale]/(admin)/sidebar.tsx b/apps/web/src/app/[locale]/(admin)/sidebar.tsx
index 056362422dc..35647c8302e 100644
--- a/apps/web/src/app/[locale]/(admin)/sidebar.tsx
+++ b/apps/web/src/app/[locale]/(admin)/sidebar.tsx
@@ -18,9 +18,9 @@ import {
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 
+import { CurrentUserAvatar } from "@/components/current-user-avatar";
 import { ProBadge } from "@/components/pro-badge";
 import { Trans } from "@/components/trans";
-import { CurrentUserAvatar } from "@/components/user";
 import { IfGuest, useUser } from "@/components/user-provider";
 import { IfFreeUser } from "@/contexts/plan";
 import { IconComponent } from "@/types";
diff --git a/apps/web/src/components/current-user-avatar.tsx b/apps/web/src/components/current-user-avatar.tsx
new file mode 100644
index 00000000000..ed8c9902a96
--- /dev/null
+++ b/apps/web/src/components/current-user-avatar.tsx
@@ -0,0 +1,14 @@
+"use client";
+import { Avatar, AvatarFallback, AvatarImage } from "@rallly/ui/avatar";
+
+import { useUser } from "@/components/user-provider";
+
+export const CurrentUserAvatar = ({ className }: { className?: string }) => {
+  const { user } = useUser();
+  return (
+    <Avatar className={className}>
+      <AvatarImage src={user.image ?? undefined} />
+      <AvatarFallback>{user.name[0]}</AvatarFallback>
+    </Avatar>
+  );
+};
diff --git a/apps/web/src/components/settings/profile-settings.tsx b/apps/web/src/components/settings/profile-settings.tsx
index 428603b0db8..3148082a21d 100644
--- a/apps/web/src/components/settings/profile-settings.tsx
+++ b/apps/web/src/components/settings/profile-settings.tsx
@@ -9,8 +9,8 @@ import {
 import { Input } from "@rallly/ui/input";
 import { useForm } from "react-hook-form";
 
+import { CurrentUserAvatar } from "@/components/current-user-avatar";
 import { Trans } from "@/components/trans";
-import { UserAvatar } from "@/components/user";
 import { useUser } from "@/components/user-provider";
 
 export const ProfileSettings = () => {
@@ -26,9 +26,7 @@ export const ProfileSettings = () => {
     },
   });
 
-  const { control, watch, handleSubmit, formState, reset } = form;
-
-  const watchName = watch("name");
+  const { control, handleSubmit, formState, reset } = form;
 
   return (
     <div className="grid gap-y-4">
@@ -41,7 +39,7 @@ export const ProfileSettings = () => {
         >
           <div className="flex flex-col gap-y-4">
             <div>
-              <UserAvatar name={watchName} size="lg" />
+              <CurrentUserAvatar className="size-14" />
             </div>
             <FormField
               control={control}
diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsx
index cfb7a7f189d..c36ed45ace7 100644
--- a/apps/web/src/components/user-dropdown.tsx
+++ b/apps/web/src/components/user-dropdown.tsx
@@ -26,10 +26,10 @@ import {
 } from "lucide-react";
 import Link from "next/link";
 
+import { CurrentUserAvatar } from "@/components/current-user-avatar";
 import { LoginLink } from "@/components/login-link";
 import { RegisterLink } from "@/components/register-link";
 import { Trans } from "@/components/trans";
-import { CurrentUserAvatar } from "@/components/user";
 import { IfCloudHosted, IfSelfHosted } from "@/contexts/environment";
 import { Plan, usePlan } from "@/contexts/plan";
 import { isFeedbackEnabled } from "@/utils/constants";
@@ -57,7 +57,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
         className={cn("group min-w-0", className)}
       >
         <Button variant="ghost">
-          <CurrentUserAvatar size="xs" className="shrink-0 " />
+          <CurrentUserAvatar className="size-6" />
           <span className="truncate">{user.name}</span>
           <Icon>
             <ChevronDownIcon />
diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsx
index 0c8c2936c70..14fc49e6745 100644
--- a/apps/web/src/components/user-provider.tsx
+++ b/apps/web/src/components/user-provider.tsx
@@ -21,6 +21,7 @@ const userSchema = z.object({
   timeZone: z.string().nullish(),
   timeFormat: z.enum(["hours12", "hours24"]).nullish(),
   weekStart: z.number().min(0).max(6).nullish(),
+  image: z.string().nullish(),
 });
 
 export const UserContext = React.createContext<{
@@ -76,9 +77,10 @@ export const UserProvider = (props: { children?: React.ReactNode }) => {
           id: user.id as string,
           name: user.name ?? t("guest"),
           email: user.email || null,
-          isGuest: !user.email,
+          isGuest,
           tier,
           timeZone: user.timeZone ?? null,
+          image: user.image ?? null,
         },
         refresh: session.update,
         ownsObject: ({ userId }) => {
diff --git a/apps/web/src/components/user.tsx b/apps/web/src/components/user.tsx
index 237b77569d1..65b8b3cf595 100644
--- a/apps/web/src/components/user.tsx
+++ b/apps/web/src/components/user.tsx
@@ -3,24 +3,8 @@ import { cn } from "@rallly/ui";
 import { Icon } from "@rallly/ui/icon";
 import { User2Icon } from "lucide-react";
 
-import { useUser } from "@/components/user-provider";
 import { getRandomAvatarColor } from "@/utils/color-hash";
 
-export const CurrentUserAvatar = ({
-  size = "md",
-  className,
-}: Omit<UserAvatarProps, "name">) => {
-  const { user } = useUser();
-
-  return (
-    <UserAvatar
-      className={className}
-      name={user.isGuest ? undefined : user.name}
-      size={size}
-    />
-  );
-};
-
 interface UserAvatarProps {
   name?: string;
   size?: "xs" | "sm" | "md" | "lg";
diff --git a/apps/web/src/utils/auth.ts b/apps/web/src/utils/auth.ts
index 940b6d19eca..57cb1048b73 100644
--- a/apps/web/src/utils/auth.ts
+++ b/apps/web/src/utils/auth.ts
@@ -54,6 +54,7 @@ const providers: Provider[] = [
               locale: true,
               timeFormat: true,
               timeZone: true,
+              image: true,
             },
           });
 
@@ -265,6 +266,7 @@ const getAuthOptions = (...args: GetServerSessionParams) =>
                   timeZone: session.timeZone,
                   weekStart: session.weekStart,
                   name: session.name,
+                  image: session.image,
                 },
               });
             } catch (e) {
@@ -278,6 +280,7 @@ const getAuthOptions = (...args: GetServerSessionParams) =>
           token.timeFormat = user.timeFormat;
           token.timeZone = user.timeZone;
           token.weekStart = user.weekStart;
+          token.picture = user.image;
         }
         return token;
       },
@@ -288,6 +291,7 @@ const getAuthOptions = (...args: GetServerSessionParams) =>
         session.user.timeZone = token.timeZone;
         session.user.locale = token.locale;
         session.user.weekStart = token.weekStart;
+        session.user.image = token.picture;
         return session;
       },
     },
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 9343d1bef32..2ae9428eadc 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@radix-ui/react-accordion": "^1.1.2",
+    "@radix-ui/react-avatar": "^1.1.0",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-dropdown-menu": "^2.0.4",
diff --git a/packages/ui/src/avatar.tsx b/packages/ui/src/avatar.tsx
new file mode 100644
index 00000000000..ef3d2e78117
--- /dev/null
+++ b/packages/ui/src/avatar.tsx
@@ -0,0 +1,50 @@
+"use client";
+
+import * as React from "react";
+import * as AvatarPrimitive from "@radix-ui/react-avatar";
+
+import { cn } from "@rallly/ui";
+
+const Avatar = React.forwardRef<
+  React.ElementRef<typeof AvatarPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
+>(({ className, ...props }, ref) => (
+  <AvatarPrimitive.Root
+    ref={ref}
+    className={cn(
+      "relative flex size-10 shrink-0 overflow-hidden rounded-full",
+      className,
+    )}
+    {...props}
+  />
+));
+Avatar.displayName = AvatarPrimitive.Root.displayName;
+
+const AvatarImage = React.forwardRef<
+  React.ElementRef<typeof AvatarPrimitive.Image>,
+  React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
+>(({ className, ...props }, ref) => (
+  <AvatarPrimitive.Image
+    ref={ref}
+    className={cn("aspect-square h-full w-full", className)}
+    {...props}
+  />
+));
+AvatarImage.displayName = AvatarPrimitive.Image.displayName;
+
+const AvatarFallback = React.forwardRef<
+  React.ElementRef<typeof AvatarPrimitive.Fallback>,
+  React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
+>(({ className, ...props }, ref) => (
+  <AvatarPrimitive.Fallback
+    ref={ref}
+    className={cn(
+      "bg-muted flex h-full w-full items-center justify-center rounded-full",
+      className,
+    )}
+    {...props}
+  />
+));
+AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;
+
+export { Avatar, AvatarImage, AvatarFallback };
diff --git a/packages/ui/src/command.tsx b/packages/ui/src/command.tsx
index 918387ffe42..6994f84f1f4 100644
--- a/packages/ui/src/command.tsx
+++ b/packages/ui/src/command.tsx
@@ -7,7 +7,7 @@ import * as React from "react";
 
 import { Dialog, DialogContent } from "./dialog";
 import { cn } from "./lib/utils";
-import { Icon } from "@rallly/ui/icon";
+import { Icon } from "./icon";
 
 const Command = React.forwardRef<
   React.ElementRef<typeof CommandPrimitive>,
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index f8dded86257..4cbdf5fb734 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -2,6 +2,11 @@
   "extends": "@rallly/tsconfig/next.json",
   "compilerOptions": {
     "baseUrl": ".",
+    "paths": {
+      "@/utils": ["src/lib/utils.ts"],
+      "@/components/*": ["src/*"],
+      "@/ui/*": ["src/*"],
+    },
   },
   "include": ["**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"],
diff --git a/yarn.lock b/yarn.lock
index effe0fb8517..ddb1e120ed4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2872,6 +2872,16 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
+"@radix-ui/react-avatar@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-avatar/-/react-avatar-1.1.0.tgz#457c81334c93f4608df15f081e7baa286558d6a2"
+  integrity sha512-Q/PbuSMk/vyAd/UoIShVGZ7StHHeRFYU7wXmi5GV+8cLXflZAEpHL/F697H1klrzxKXNtZ97vWiC0q3RKUH8UA==
+  dependencies:
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
 "@radix-ui/react-checkbox@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-checkbox/-/react-checkbox-1.0.4.tgz#98f22c38d5010dd6df4c5744cac74087e3275f4b"