shiyue/kan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove supabase auth

Browse Source
This commit is contained in:
Henry
2025-05-05 15:16:30 +01:00
parent 091fea6f38
commit b6daaa41de
42 changed files with 319 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/pages/api/auth/[...all].ts
View File

@@ -4,3 +4,7 @@ import { auth } from "@kan/auth";
export const config = { api: { bodyParser: false } };
export default toNodeHandler(auth.handler);
// export const runtime = "edge";
// export const preferredRegion = "lhr1";
// export const dynamic = "force-dynamic";

168
apps/web/src/pages/api/auth/confirm.ts
View File

@@ -1,112 +1,102 @@
import type { EmailOtpType } from "@supabase/supabase-js";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { Stripe } from "stripe";
// import type { EmailOtpType } from "@supabase/supabase-js";
// import type { NextRequest } from "next/server";
// import { NextResponse } from "next/server";
import { createDrizzleClient } from "@kan/db/client";
import * as memberRepo from "@kan/db/repository/member.repo";
import * as userRepo from "@kan/db/repository/user.repo";
import { createNextClient } from "@kan/supabase/clients";
// import { createDrizzleClient } from "@kan/db/client";
// import * as memberRepo from "@kan/db/repository/member.repo";
// import * as userRepo from "@kan/db/repository/user.repo";
// import { stripe } from "@kan/stripe";
// import { createNextApiClient } from "@kan/";
const stripeSecretKey = process.env.STRIPE_SECRET_KEY;
// export default async function handler(req: NextRequest) {
// if (req.method !== "GET") {
// return new NextResponse(null, {
// status: 405,
// headers: { Allow: "GET" },
// });
// }
if (!stripeSecretKey) {
throw new Error("STRIPE_SECRET_KEY is not defined");
}
// if (!req.url) {
// return new NextResponse(null, {
// status: 400,
// });
// }
const stripe = new Stripe(stripeSecretKey, {
apiVersion: "2024-12-18.acacia",
});
// const url = new URL(req.url);
// const queryParams = Object.fromEntries(url.searchParams.entries());
export default async function handler(req: NextRequest) {
if (req.method !== "GET") {
return new NextResponse(null, {
status: 405,
headers: { Allow: "GET" },
});
}
// const tokenHash = queryParams.token_hash;
// const type = queryParams.type;
// const code = queryParams.code;
// const memberPublicId = queryParams.memberPublicId;
if (!req.url) {
return new NextResponse(null, {
status: 400,
});
}
// let next = "/error";
const url = new URL(req.url);
const queryParams = Object.fromEntries(url.searchParams.entries());
// let authRes;
const tokenHash = queryParams.token_hash;
const type = queryParams.type;
const code = queryParams.code;
const memberPublicId = queryParams.memberPublicId;
// const response = NextResponse.next();
let next = "/error";
// if ((tokenHash && type) ?? code) {
// const supabaseClient = createNextClient(req, response);
let authRes;
// if (tokenHash && type) {
// authRes = await supabaseClient.auth.verifyOtp({
// type: type as EmailOtpType,
// token_hash: tokenHash,
// });
// }
const response = NextResponse.next();
// if (code) {
// authRes = await supabaseClient.auth.exchangeCodeForSession(code);
// }
if ((tokenHash && type) ?? code) {
const supabaseClient = createNextClient(req, response);
// const user = authRes?.data.user;
if (tokenHash && type) {
authRes = await supabaseClient.auth.verifyOtp({
type: type as EmailOtpType,
token_hash: tokenHash,
});
}
// const db = createDrizzleClient();
if (code) {
authRes = await supabaseClient.auth.exchangeCodeForSession(code);
}
// if (user?.id && user.email) {
// const existingUser = await userRepo.getById(db, user.id);
const user = authRes?.data.user;
// if (!existingUser) {
// const stripeCustomer = await stripe.customers.create({
// email: user.email,
// metadata: {
// userId: user.id,
// },
// });
const db = createDrizzleClient();
// await userRepo.create(db, {
// id: user.id,
// email: user.email,
// stripeCustomerId: stripeCustomer.id,
// });
// }
// }
if (user?.id && user.email) {
const existingUser = await userRepo.getById(db, user.id);
// if (memberPublicId) {
// const member = await memberRepo.getByPublicId(db, memberPublicId);
if (!existingUser) {
const stripeCustomer = await stripe.customers.create({
email: user.email,
metadata: {
userId: user.id,
},
});
// if (member?.id) {
// await memberRepo.acceptInvite(db, member.id);
// }
// }
await userRepo.create(db, {
id: user.id,
email: user.email,
stripeCustomerId: stripeCustomer.id,
});
}
}
// if (authRes?.error) {
// console.error(authRes.error);
// } else {
// next = queryParams.next ?? "/boards";
// }
// }
if (memberPublicId) {
const member = await memberRepo.getByPublicId(db, memberPublicId);
// const redirectResponse = NextResponse.redirect(new URL(next, req.url));
if (member?.id) {
await memberRepo.acceptInvite(db, member.id);
}
}
// response.headers.getSetCookie().forEach((cookie) => {
// redirectResponse.headers.append("Set-Cookie", cookie);
// });
if (authRes?.error) {
console.error(authRes.error);
} else {
next = queryParams.next ?? "/boards";
}
}
// return redirectResponse;
// }
const redirectResponse = NextResponse.redirect(new URL(next, req.url));
response.headers.getSetCookie().forEach((cookie) => {
redirectResponse.headers.append("Set-Cookie", cookie);
});
return redirectResponse;
}
export const runtime = "edge";
export const preferredRegion = "lhr1";
export const dynamic = "force-dynamic";
// export const runtime = "edge";
// export const preferredRegion = "lhr1";
// export const dynamic = "force-dynamic";

34
apps/web/src/pages/api/stripe/create_billing_session.ts
View File

@@ -1,22 +1,11 @@
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { Stripe } from "stripe";
import { createDrizzleClient } from "@kan/db/client";
import * as userRepo from "@kan/db/repository/user.repo";
import { createNextClient } from "@kan/supabase/clients";
const stripeSecretKey = process.env.STRIPE_SECRET_KEY;
if (!stripeSecretKey) {
throw new Error("STRIPE_SECRET_KEY is not defined");
}
const stripe = new Stripe(stripeSecretKey, {
apiVersion: "2024-12-18.acacia",
});
import { createNextApiContext } from "@kan/api/trpc";
import { createStripeClient } from "@kan/stripe";
export default async function handler(req: NextRequest) {
const stripe = createStripeClient();
if (req.method !== "POST") {
return new Response(JSON.stringify({ error: "Method not allowed" }), {
status: 405,
@@ -25,20 +14,7 @@ export default async function handler(req: NextRequest) {
}
try {
const response = NextResponse.next();
const supabaseClient = createNextClient(req, response);
const { data } = await supabaseClient.auth.getUser();
if (!data.user) {
return new Response(JSON.stringify({ error: "Unauthorized" }), {
status: 403,
headers: { "Content-Type": "application/json" },
});
}
const db = createDrizzleClient();
const user = await userRepo.getById(db, data.user.id);
const { user } = await createNextApiContext(req);
if (!user?.stripeCustomerId) {
return new Response(

36
apps/web/src/pages/api/stripe/create_checkout_session.ts
View File

@@ -1,22 +1,9 @@
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { Stripe } from "stripe";
import { z } from "zod";
import { createDrizzleClient } from "@kan/db/client";
import * as userRepo from "@kan/db/repository/user.repo";
import { createNextApiContext } from "@kan/api/trpc";
import * as workspaceRepo from "@kan/db/repository/workspace.repo";
import { createNextClient } from "@kan/supabase/clients";
const stripeSecretKey = process.env.STRIPE_SECRET_KEY;
if (!stripeSecretKey) {
throw new Error("STRIPE_SECRET_KEY is not defined");
}
const stripe = new Stripe(stripeSecretKey, {
apiVersion: "2024-12-18.acacia",
});
import { createStripeClient } from "@kan/stripe";
const workspaceSlugSchema = z
.string()
@@ -33,6 +20,8 @@ interface CheckoutSessionRequest {
}
export default async function handler(req: NextRequest) {
const stripe = createStripeClient();
if (req.method !== "POST") {
return new Response(JSON.stringify({ error: "Method not allowed" }), {
status: 405,
@@ -41,22 +30,7 @@ export default async function handler(req: NextRequest) {
}
try {
const response = NextResponse.next();
const supabaseClient = createNextClient(req, response);
const { data } = await supabaseClient.auth.getUser();
if (!data.user) {
return new Response(JSON.stringify({ error: "Unauthorized" }), {
status: 403,
headers: { "Content-Type": "application/json" },
});
}
const db = createDrizzleClient();
const user = await userRepo.getById(db, data.user.id);
const { user, db } = await createNextApiContext(req);
if (!user) {
return new Response(JSON.stringify({ error: "User not found" }), {

21
apps/web/src/pages/api/stripe/webhook.ts
View File

@@ -1,24 +1,15 @@
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { Stripe } from "stripe";
import { createNextApiContext } from "@kan/api/trpc";
import * as workspaceRepo from "@kan/db/repository/workspace.repo";
import { createNextClient } from "@kan/supabase/clients";
const stripeSecretKey = process.env.STRIPE_SECRET_KEY;
if (!stripeSecretKey) {
throw new Error("STRIPE_SECRET_KEY is not defined");
}
import { createStripeClient } from "@kan/stripe";
export const webCrypto = Stripe.createSubtleCryptoProvider();
const stripe: Stripe = new Stripe(stripeSecretKey, {
apiVersion: "2024-12-18.acacia",
httpClient: Stripe.createFetchHttpClient(),
});
export default async function handler(req: NextRequest) {
const stripe = createStripeClient();
if (req.method !== "POST") {
return new Response(JSON.stringify({ message: "Method not allowed" }), {
status: 405,
@@ -44,9 +35,7 @@ export default async function handler(req: NextRequest) {
webCrypto,
);
const response = NextResponse.next();
const db = createNextClient(req, response);
const { db } = await createNextApiContext(req);
switch (event.type) {
case "checkout.session.completed": {