refactor: update repo funcs to drizzle
This commit is contained in:
@@ -17,7 +17,7 @@ export const authRouter = createTRPCRouter({
|
||||
.input(z.object({ email: z.string() }))
|
||||
.output(z.object({ success: z.boolean() }))
|
||||
.mutation(async ({ ctx, input }) => {
|
||||
const { data } = await ctx.db.auth.signInWithOtp({
|
||||
const { data } = await ctx.supabaseClient.auth.signInWithOtp({
|
||||
email: input.email,
|
||||
options: {
|
||||
emailRedirectTo: `${process.env.WEBSITE_URL}`,
|
||||
@@ -52,7 +52,7 @@ export const authRouter = createTRPCRouter({
|
||||
code: "BAD_REQUEST",
|
||||
});
|
||||
|
||||
const { data } = await ctx.db.auth.signInWithOAuth({
|
||||
const { data } = await ctx.supabaseClient.auth.signInWithOAuth({
|
||||
provider: "google",
|
||||
options: {
|
||||
queryParams: {
|
||||
|
||||
@@ -333,7 +333,7 @@ export const cardRouter = createTRPCRouter({
|
||||
|
||||
const deletedComment = await cardCommentRepo.softDelete(ctx.db, {
|
||||
commentId: existingComment.id,
|
||||
deletedAt: new Date().toISOString(),
|
||||
deletedAt: new Date(),
|
||||
deletedBy: userId,
|
||||
});
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ export const userRouter = createTRPCRouter({
|
||||
code: "UNAUTHORIZED",
|
||||
});
|
||||
|
||||
const result = await userRepo.getById(ctx.drizzleDb, userId);
|
||||
const result = await userRepo.getById(ctx.db, userId);
|
||||
|
||||
if (!result?.name) {
|
||||
throw new TRPCError({
|
||||
|
||||
@@ -17,15 +17,15 @@ export interface User {
|
||||
|
||||
interface CreateContextOptions {
|
||||
user: User | null;
|
||||
db: SupabaseClient<Database>;
|
||||
drizzleDb: dbClient;
|
||||
supabaseClient: SupabaseClient<Database>;
|
||||
db: dbClient;
|
||||
}
|
||||
|
||||
export const createInnerTRPCContext = (opts: CreateContextOptions) => {
|
||||
return {
|
||||
user: opts.user,
|
||||
db: opts.db,
|
||||
drizzleDb: opts.drizzleDb,
|
||||
supabaseClient: opts.supabaseClient,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -33,36 +33,36 @@ export const createTRPCContext = async ({
|
||||
req,
|
||||
resHeaders,
|
||||
}: FetchCreateContextFnOptions) => {
|
||||
const db = createTRPCClient(req, resHeaders);
|
||||
const supabaseClient = createTRPCClient(req, resHeaders);
|
||||
|
||||
const {
|
||||
data: { user },
|
||||
} = await db.auth.getUser();
|
||||
} = await supabaseClient.auth.getUser();
|
||||
|
||||
const drizzleDb = createDrizzleClient();
|
||||
const db = createDrizzleClient();
|
||||
|
||||
return createInnerTRPCContext({ db, user, drizzleDb });
|
||||
return createInnerTRPCContext({ db, user, supabaseClient: supabaseClient });
|
||||
};
|
||||
|
||||
export const createRESTContext = async ({ req }: CreateNextContextOptions) => {
|
||||
const db = createNextApiClient(req);
|
||||
const supabaseClient = createNextApiClient(req);
|
||||
|
||||
const authHeader = req.headers.authorization;
|
||||
const accessToken = authHeader?.startsWith("Bearer ")
|
||||
? authHeader.substring(7)
|
||||
: null;
|
||||
|
||||
const drizzleDb = createDrizzleClient();
|
||||
const db = createDrizzleClient();
|
||||
|
||||
if (!accessToken) {
|
||||
return createInnerTRPCContext({ db, user: null, drizzleDb });
|
||||
return createInnerTRPCContext({ db, user: null, supabaseClient });
|
||||
}
|
||||
|
||||
const {
|
||||
data: { user },
|
||||
} = await db.auth.getUser(accessToken);
|
||||
} = await supabaseClient.auth.getUser(accessToken);
|
||||
|
||||
return createInnerTRPCContext({ db, user, drizzleDb });
|
||||
return createInnerTRPCContext({ db, user, supabaseClient });
|
||||
};
|
||||
|
||||
const t = initTRPC
|
||||
|
||||
Reference in New Issue
Block a user