cleanup

Author: izadoesdev

packages/auth/src/auth.ts

@@ -272,6 +272,10 @@ export const auth = betterAuth({
   ],
 });
 
+export const websitesApi = {
+  hasPermission: auth.api.hasPermission,
+};
+
 export type User = (typeof auth)['$Infer']['Session']['user'] & {
   role?: string;
 };

packages/rpc/src/routers/websites.ts

@@ -1,3 +1,4 @@
+import { websitesApi } from '@databuddy/auth';
 import { and, chQuery, eq, isNull, websites } from '@databuddy/db';
 import { createDrizzleCache, redis } from '@databuddy/redis';
 import { TRPCError } from '@trpc/server';
@@ -88,7 +89,7 @@ export const websitesRouter = createTRPCRouter({
               );
           return ctx.db.query.websites.findMany({
             where,
-            orderBy: (websites, { desc }) => [desc(websites.createdAt)],
+            orderBy: (table, { desc }) => [desc(table.createdAt)],
           });
         },
       });
@@ -102,15 +103,15 @@ export const websitesRouter = createTRPCRouter({
         key: cacheKey,
         ttl: 60,
         tables: ['websites'],
-        queryFn: async () => authorizeWebsiteAccess(ctx, input.id, 'read'),
+        queryFn: () => authorizeWebsiteAccess(ctx, input.id, 'read'),
       });
     }),
 
   create: protectedProcedure
     .input(createWebsiteSchema)
     .mutation(async ({ ctx, input }) => {
       if (input.organizationId) {
-        const { success } = await ctx.auth.api.hasPermission({
+        const { success } = await websitesApi.hasPermission({
           headers: ctx.headers,
           body: { permissions: { website: ['create'] } },
         });
@@ -254,14 +255,10 @@ export const websitesRouter = createTRPCRouter({
   transfer: protectedProcedure
     .input(transferWebsiteSchema)
     .mutation(async ({ ctx, input }) => {
-      const website = await authorizeWebsiteAccess(
-        ctx,
-        input.websiteId,
-        'update'
-      );
+      await authorizeWebsiteAccess(ctx, input.websiteId, 'update');
 
       if (input.organizationId) {
-        const { success } = await ctx.auth.api.hasPermission({
+        const { success } = await websitesApi.hasPermission({
           headers: ctx.headers,
           body: { permissions: { website: ['create'] } },
         });

packages/rpc/src/utils/auth.ts

@@ -1,3 +1,4 @@
+import { websitesApi } from '@databuddy/auth';
 import { db, eq, websites } from '@databuddy/db';
 import { cacheable } from '@databuddy/redis';
 import { TRPCError } from '@trpc/server';
@@ -8,7 +9,9 @@ type Permission = 'read' | 'update' | 'delete' | 'transfer';
 const getWebsiteById = cacheable(
   async (id: string) => {
     try {
-      if (!id) return null;
+      if (!id) {
+        return null;
+      }
       return await db.query.websites.findFirst({
         where: eq(websites.id, id),
       });
@@ -59,7 +62,7 @@ export async function authorizeWebsiteAccess(
   }
 
   if (website.organizationId) {
-    const { success } = await ctx.auth.api.hasPermission({
+    const { success } = await websitesApi.hasPermission({
       headers: ctx.headers,
       body: { permissions: { website: [permission] } },
     });