From 8e64b5e0e91df400646aef6ed0b775e2114bcc05 Mon Sep 17 00:00:00 2001
From: Milo Schwartz <mschwartz10612@gmail.com>
Date: Thu, 14 Nov 2024 00:13:37 -0500
Subject: [PATCH] small fixes to invite user workflow

---
 server/routers/user/acceptInvite.ts                         | 2 +-
 src/app/[orgId]/settings/layout.tsx                         | 2 +-
 .../settings/resources/[resourceId]/connectivity/page.tsx   | 6 +++---
 src/app/invite/page.tsx                                     | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/routers/user/acceptInvite.ts b/server/routers/user/acceptInvite.ts
index 119ab3bd..34af968b 100644
--- a/server/routers/user/acceptInvite.ts
+++ b/server/routers/user/acceptInvite.ts
@@ -89,7 +89,7 @@ export async function acceptInvite(
             );
         }
 
-        if (existingUser[0].email !== existingInvite[0].email) {
+        if (req.user && req.user.email !== existingInvite[0].email) {
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
diff --git a/src/app/[orgId]/settings/layout.tsx b/src/app/[orgId]/settings/layout.tsx
index 63286981..f1f5af4f 100644
--- a/src/app/[orgId]/settings/layout.tsx
+++ b/src/app/[orgId]/settings/layout.tsx
@@ -69,7 +69,7 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
         );
         const orgUser = await getOrgUser();
 
-        if (!orgUser.data.data.isAdmin || !orgUser.data.data.isOwner) {
+        if (!orgUser.data.data.isAdmin && !orgUser.data.data.isOwner) {
             throw new Error("User is not an admin or owner");
         }
     } catch {
diff --git a/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx b/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
index 7dc262b5..d5b97510 100644
--- a/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
+++ b/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
@@ -308,13 +308,13 @@ export default function ReverseProxyTargets(props: {
             cell: ({ row }) => (
                 <>
                     <div className="flex items-center justify-end space-x-2">
-                        <Dot
+                        {/* <Dot
                             className={
                                 row.original.new || row.original.updated
                                     ? "opacity-100"
                                     : "opacity-0"
                             }
-                        />
+                        /> */}
 
                         <Button
                             variant="outline"
@@ -494,7 +494,7 @@ export default function ReverseProxyTargets(props: {
                     </Form>
                 </div>
 
-                <div className="rounded-md border mt-4">
+                <div className="rounded-md mt-4">
                     <Table>
                         <TableHeader>
                             {table.getHeaderGroups().map((headerGroup) => (
diff --git a/src/app/invite/page.tsx b/src/app/invite/page.tsx
index 689dccd5..4f5923cd 100644
--- a/src/app/invite/page.tsx
+++ b/src/app/invite/page.tsx
@@ -49,6 +49,7 @@ export default async function InvitePage(props: {
         )
         .catch((e) => {
             console.error(e);
+            error = formatAxiosError(e);
         });
 
     if (res && res.status === 200) {