From c28fab4fe25c16ab1d2eabcf2e7540844a7f3cf0 Mon Sep 17 00:00:00 2001
From: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:40:31 +0530
Subject: [PATCH] fix: install flow: wrong org team avatars (#15334)

---
 .../apps/installation/AccountsStepCard.tsx    |  4 +--
 .../pages/apps/installation/[[...step]].tsx   | 35 ++++++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/apps/web/components/apps/installation/AccountsStepCard.tsx b/apps/web/components/apps/installation/AccountsStepCard.tsx
index 4361e6b928..2cb735c544 100644
--- a/apps/web/components/apps/installation/AccountsStepCard.tsx
+++ b/apps/web/components/apps/installation/AccountsStepCard.tsx
@@ -55,7 +55,7 @@ const AccountSelector: FC<AccountSelectorProps> = ({
 
 export type PersonalAccountProps = Pick<User, "id" | "avatar" | "name"> & { alreadyInstalled: boolean };
 
-export type TeamsProp = (Pick<Team, "id" | "name" | "logo"> & {
+export type TeamsProp = (Pick<Team, "id" | "name" | "logoUrl"> & {
   alreadyInstalled: boolean;
 })[];
 
@@ -85,7 +85,7 @@ export const AccountsStepCard: FC<AccountStepCardProps> = ({ teams, personalAcco
             key={team.id}
             testId={`install-app-button-team${team.id}`}
             alreadyInstalled={team.alreadyInstalled}
-            avatar={team.logo ?? ""}
+            avatar={team.logoUrl ?? ""}
             name={team.name}
             onClick={() => onSelect(team.id)}
             loading={loading}
diff --git a/apps/web/pages/apps/installation/[[...step]].tsx b/apps/web/pages/apps/installation/[[...step]].tsx
index 1b5ba5ced0..f739a0be91 100644
--- a/apps/web/pages/apps/installation/[[...step]].tsx
+++ b/apps/web/pages/apps/installation/[[...step]].tsx
@@ -16,6 +16,7 @@ import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps";
 import { getAppOnboardingRedirectUrl } from "@calcom/lib/apps/getAppOnboardingRedirectUrl";
 import { getAppOnboardingUrl } from "@calcom/lib/apps/getAppOnboardingUrl";
 import { CAL_URL } from "@calcom/lib/constants";
+import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import prisma from "@calcom/prisma";
 import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
@@ -304,7 +305,7 @@ const getUser = async (userId: number) => {
     },
     select: {
       id: true,
-      avatar: true,
+      avatarUrl: true,
       name: true,
       username: true,
       teams: {
@@ -326,7 +327,13 @@ const getUser = async (userId: number) => {
             select: {
               id: true,
               name: true,
-              logo: true,
+              logoUrl: true,
+              parent: {
+                select: {
+                  logoUrl: true,
+                  name: true,
+                },
+              },
             },
           },
         },
@@ -337,7 +344,17 @@ const getUser = async (userId: number) => {
   if (!user) {
     throw new Error(ERROR_MESSAGES.userNotFound);
   }
-  return user;
+
+  const teams = user.teams.map(({ team }) => ({
+    ...team,
+    logoUrl: team.parent
+      ? getPlaceholderAvatar(team.parent.logoUrl, team.parent.name)
+      : getPlaceholderAvatar(team.logoUrl, team.name),
+  }));
+  return {
+    ...user,
+    teams,
+  };
 };
 
 const getAppBySlug = async (appSlug: string) => {
@@ -426,17 +443,17 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
 
     const user = await getUser(session.user.id);
 
-    const userAcceptedTeams = user.teams.map((team) => ({ ...team.team }));
-    const hasTeams = Boolean(userAcceptedTeams.length);
+    const userTeams = user.teams;
+    const hasTeams = Boolean(userTeams.length);
 
     const appInstalls = await getAppInstallsBySlug(
       parsedAppSlug,
       user.id,
-      userAcceptedTeams.map(({ id }) => id)
+      userTeams.map(({ id }) => id)
     );
 
     if (parsedTeamIdParam) {
-      const isUserMemberOfTeam = userAcceptedTeams.some((team) => team.id === parsedTeamIdParam);
+      const isUserMemberOfTeam = userTeams.some((team) => team.id === parsedTeamIdParam);
       if (!isUserMemberOfTeam) {
         throw new Error(ERROR_MESSAGES.userNotInTeam);
       }
@@ -457,12 +474,12 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
     const personalAccount = {
       id: user.id,
       name: user.name,
-      avatar: user.avatar,
+      avatar: user.avatarUrl,
       alreadyInstalled: appInstalls.some((install) => !Boolean(install.teamId) && install.userId === user.id),
     };
 
     const teamsWithIsAppInstalled = hasTeams
-      ? userAcceptedTeams.map((team) => ({
+      ? userTeams.map((team) => ({
           ...team,
           alreadyInstalled: appInstalls.some(
             (install) => Boolean(install.teamId) && install.teamId === team.id