Hey ${userFirstName} :)
- -Just wanted to say thank you for signing up to Autumn!
- -I'm curious--how did you hear about us? Also are you just looking around or do you have a specific use case I can help you with?
- -Whatever the reason, anything you need I'm here to help.
- -Ayush
-Co-founder, Autumn
Oh, and join our Discord community to connect with us and other users
- `; -}; - -export const sendOnboardingEmail = async ({ - orgId, - clerkCli, -}: { - orgId: string; - clerkCli: ClerkClient; -}) => { - const memberships = - await clerkCli.organizations.getOrganizationMembershipList({ - organizationId: orgId, - }); - - for (let membership of memberships.data) { - if (!membership.publicUserData) break; - - const user = await clerkCli.users.getUser(membership.publicUserData.userId); - const email = user.primaryEmailAddress?.emailAddress; - - if (!email) break; - - console.log("Sending onboarding email to", email); - await sendHtmlEmail({ - to: email, - subject: "Anything I can help with?", - body: getWelcomeEmailBody(user.firstName ?? "there"), - }); - - break; - } -}; diff --git a/server/src/external/webhooks/webhooksRouter.ts b/server/src/external/webhooks/webhooksRouter.ts index a6ec2db4e..b9e7ad3e5 100644 --- a/server/src/external/webhooks/webhooksRouter.ts +++ b/server/src/external/webhooks/webhooksRouter.ts @@ -1,19 +1,12 @@ -import express from "express"; -import bodyParser from "body-parser"; -import { handleClerkWebhook } from "./clerkWebhooks.js"; +import express, { Router } from "express"; + import { stripeWebhookRouter } from "../stripe/stripeWebhooks.js"; import { autumnWebhookRouter } from "../autumn/autumnWebhookRouter.js"; -const webhooksRouter = express.Router(); +const webhooksRouter: Router = express.Router(); webhooksRouter.use("/stripe", stripeWebhookRouter); webhooksRouter.use("/autumn", autumnWebhookRouter); -webhooksRouter.post( - "/clerk", - bodyParser.raw({ type: "application/json" }), - handleClerkWebhook -); - export default webhooksRouter; diff --git a/server/src/index.ts b/server/src/index.ts index ca59a907f..e7711b266 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -8,56 +8,75 @@ import mainRouter from "./internal/mainRouter.js"; import express from "express"; import cors from "cors"; import chalk from "chalk"; -import { apiRouter } from "./internal/api/apiRouter.js"; + +import http from "http"; import webhooksRouter from "./external/webhooks/webhooksRouter.js"; -import { initLogger } from "./errors/logger.js"; +import { apiRouter } from "./internal/api/apiRouter.js"; import { QueueManager } from "./queue/QueueManager.js"; import { AppEnv } from "@autumn/shared"; -import { createSupabaseClient } from "./external/supabaseUtils.js"; -import { - createLogtail, - createLogtailAll, -} from "./external/logtail/logtailUtils.js"; +import { createLogtail } from "./external/logtail/logtailUtils.js"; import { CacheManager } from "./external/caching/CacheManager.js"; -import { initDrizzle } from "./db/initDrizzle.js"; -import { createPosthogCli } from "./external/posthog/createPosthogCli.js"; +import { logtailAll, logger } from "./external/logtail/logtailUtils.js"; +import { createPosthogCli } from "./external/posthog/createPosthogCli.js"; import { generateId } from "./utils/genUtils.js"; import { subscribeToOrgUpdates } from "./external/supabase/subscribeToOrgUpdates.js"; +import { client, db } from "./db/initDrizzle.js"; +import { toNodeHandler } from "better-auth/node"; +import { auth } from "./utils/auth.js"; +import { checkEnvVars } from "./utils/initUtils.js"; -if (!process.env.DATABASE_URL) { - console.error(`DATABASE_URL is not set`); - process.exit(1); -} - -const { db, client } = initDrizzle({ maxConnections: 10 }); - +checkEnvVars(); const init = async () => { const app = express(); - const logger = initLogger(); + + // Check if this blocks API calls... + app.use( + cors({ + origin: [ + "http://localhost:3000", + "https://app.useautumn.com", + "https://*.useautumn.com", + process.env.CLIENT_URL || "", + ], + credentials: true, + allowedHeaders: [ + "app_env", + "x-api-version", + "Authorization", + "Content-Type", + "Accept", + "Origin", + "X-API-Version", + "X-Requested-With", + "Access-Control-Request-Method", + "Access-Control-Request-Headers", + "Cache-Control", + "If-Match", + "If-None-Match", + "If-Modified-Since", + "If-Unmodified-Since", + ], + }), + ); + + app.all("/api/auth/*", toNodeHandler(auth)); + const server = http.createServer(app); + const posthog = createPosthogCli(); + server.keepAliveTimeout = 120000; // 120 seconds server.headersTimeout = 120000; // 120 seconds should be >= keepAliveTimeout await QueueManager.getInstance(); // initialize the queue manager await CacheManager.getInstance(); - const supabaseClient = createSupabaseClient(); - - // Optional services - const logtailAll = createLogtailAll(); - const posthog = createPosthogCli(); subscribeToOrgUpdates({ db }); app.use((req: any, res: any, next: any) => { - req.sb = supabaseClient; - req.db = db; - - req.logger = logger; - req.logtailAll = logtailAll; req.env = req.env = req.headers["app_env"] || AppEnv.Sandbox; - + req.db = db; req.logtailAll = logtailAll; req.posthog = posthog; @@ -69,7 +88,7 @@ const init = async () => { headersClone.authorization = undefined; headersClone.Authorization = undefined; - logtailAll.info(`${req.method} ${req.originalUrl}`, { + logtailAll?.info(`${req.method} ${req.originalUrl}`, { url: req.originalUrl, method: req.method, headers: headersClone, @@ -77,9 +96,8 @@ const init = async () => { }); req.logtail = createLogtail(); - req.logger = req.logtail; } catch (error) { - req.logtail = logtailAll; // fallback + req.logtail = logger; // fallback console.error(`Error creating req.logtail`); console.error(error); } @@ -91,8 +109,6 @@ const init = async () => { next(); }); - app.use(cors()); - app.use("/webhooks", webhooksRouter); app.use((req: any, res, next) => { @@ -142,14 +158,7 @@ if (process.env.NODE_ENV === "development") { } cluster.on("exit", (worker, code, signal) => { - try { - let logtail = createLogtail(); - logtail.error(`WORKER DIED: ${worker.process.pid}`); - logtail.flush(); - } catch (error) { - console.log("Error sending log to logtail", error); - } - // LOG in Render + logger.error(`WORKER DIED: ${worker.process.pid}`); cluster.fork(); }); } else { @@ -175,3 +184,21 @@ async function gracefulShutdown() { process.exit(1); } } + +// Close connections gracefully? +const closeConnections = async () => { + console.log("Closing connections"); + await client.end(); +}; + +process.on("SIGTERM", async () => { + console.log("SIGTERM received, shutting down gracefully"); + await closeConnections(); + process.exit(0); +}); + +process.on("SIGINT", async () => { + console.log("SIGINT received, shutting down gracefully"); + await closeConnections(); + process.exit(0); +}); diff --git a/server/src/internal/admin/adminRouter.ts b/server/src/internal/admin/adminRouter.ts new file mode 100644 index 000000000..d35a673ff --- /dev/null +++ b/server/src/internal/admin/adminRouter.ts @@ -0,0 +1,158 @@ +import { handleFrontendReqError } from "@/utils/errorUtils.js"; +import { ExtendedRequest } from "@/utils/models/Request.js"; +import { member, organizations, user } from "@autumn/shared"; +import { and, desc, eq, gt, gte, ilike, inArray, lt, or } from "drizzle-orm"; +import { Router } from "express"; + +export const adminRouter: Router = Router(); + +adminRouter.get("/users", async (req: any, res: any) => { + try { + const { db } = req as ExtendedRequest; + + let { sortKey, search, after, before } = req.query; + + if (after) { + after = { + id: after.split(",")[0], + createdAt: new Date(after.split(",")[1]), + }; + } else if (before) { + before = { + id: before.split(",")[0], + createdAt: new Date(before.split(",")[1]), + }; + } + + const users = await db + .select() + .from(user) + .where( + and( + search + ? or( + ilike(user.email, `%${search as string}%`), + ilike(user.name, `%${search as string}%`), + ilike(user.id, `%${search as string}%`), + ) + : undefined, + after + ? or( + lt(user.createdAt, after.createdAt), + or( + and( + eq(user.createdAt, after.createdAt), + lt(user.id, after.id), + ), + ), + ) + : undefined, + before + ? or( + gte(user.createdAt, before.createdAt), + or( + and( + eq(user.createdAt, before.createdAt), + gt(user.id, before.id), + ), + ), + ) + : undefined, + ), + ) + .orderBy(desc(user.createdAt), desc(user.id)) + .limit(21); + + res.json({ + rows: users.slice(0, 20), + hasNextPage: users.length > 20, + }); + } catch (error) { + handleFrontendReqError({ + res, + req, + error, + action: "admin: search users", + }); + } +}); + +adminRouter.get("/orgs", async (req: any, res: any) => { + try { + const { db } = req as ExtendedRequest; + + let { search, after, before } = req.query; + + if (after) { + after = { + id: after.split(",")[0], + createdAt: new Date(after.split(",")[1]), + }; + } else if (before) { + before = { + id: before.split(",")[0], + createdAt: new Date(before.split(",")[1]), + }; + } + + const orgs = await db + .select() + .from(organizations) + .where( + and( + search + ? or(ilike(organizations.name, `%${search as string}%`)) + : undefined, + after + ? or( + lt(organizations.createdAt, after.createdAt), + or( + and( + eq(organizations.createdAt, after.createdAt), + lt(organizations.id, after.id), + ), + ), + ) + : undefined, + before + ? or( + gte(organizations.createdAt, before.createdAt), + or( + and( + eq(organizations.createdAt, before.createdAt), + gt(organizations.id, before.id), + ), + ), + ) + : undefined, + ), + ) + .orderBy(desc(organizations.createdAt), desc(organizations.id)) + .limit(21); + + let orgIds = orgs.map((org) => org.id); + + let memberships = await db + .select() + .from(member) + .leftJoin(user, eq(member.userId, user.id)) + .where(inArray(member.organizationId, orgIds)); + + res.json({ + rows: orgs.slice(0, 20).map((org) => ({ + ...org, + users: memberships + .filter((membership) => membership.member.organizationId === org.id) + .map((membership) => membership.user?.email), + })), + hasNextPage: orgs.length > 20, + }); + } catch (error) { + handleFrontendReqError({ + res, + req, + error, + action: "admin: search orgs", + }); + } +}); diff --git a/server/src/internal/admin/adminUtils/userAnalytics.ts b/server/src/internal/admin/adminUtils/userAnalytics.ts new file mode 100644 index 000000000..f6a39bff3 --- /dev/null +++ b/server/src/internal/admin/adminUtils/userAnalytics.ts @@ -0,0 +1,14 @@ +import { DrizzleCli } from "@/db/initDrizzle.js"; +import { ExtendedRequest } from "@/utils/models/Request.js"; +import { user } from "@autumn/shared"; +import { count } from "drizzle-orm"; + +// Required stats (by interval): +// 1. User count +// 2. Retained count +// 3. Churned count + +export const getUserCount = async ({ db }: { db: DrizzleCli }) => { + const userCount = await db.select({ count: count() }).from(user); + return userCount[0].count; +}; diff --git a/server/src/internal/admin/withAdminAuth.ts b/server/src/internal/admin/withAdminAuth.ts new file mode 100644 index 000000000..7430180fa --- /dev/null +++ b/server/src/internal/admin/withAdminAuth.ts @@ -0,0 +1,34 @@ +import { ErrCode } from "@/errors/errCodes.js"; +import { auth } from "@/utils/auth.js"; +import { ADMIN_USER_IDs } from "@/utils/constants.js"; +import { ExtendedRequest } from "@/utils/models/Request.js"; +import { NextFunction } from "express"; + +export const withAdminAuth = async (req: any, res: any, next: NextFunction) => { + const { logtail: logger, userId } = req as ExtendedRequest; + + try { + const data = await auth.api.getSession({ + headers: req.headers, + }); + + if ( + !ADMIN_USER_IDs.includes(data?.session?.userId || "") && + !ADMIN_USER_IDs.includes(data?.session?.impersonatedBy || "") + ) { + return res.status(403).json({ + error: { + code: ErrCode.InvalidRequest, + message: "Method not allowed", + }, + }); + } + + console.log("Admin auth passed"); + + next(); + } catch (error: any) { + logger.error(`Admin req failed: ${error.message}`); + return res.status(400).json(); + } +}; diff --git a/server/src/internal/analytics/handlers/handleProductsUpdated.ts b/server/src/internal/analytics/handlers/handleProductsUpdated.ts index 6234c6aac..b9a6b0c73 100644 --- a/server/src/internal/analytics/handlers/handleProductsUpdated.ts +++ b/server/src/internal/analytics/handlers/handleProductsUpdated.ts @@ -8,7 +8,7 @@ import { Organization, } from "@autumn/shared"; -import { sendSvixEvent } from "../../../external/svix/svixUtils.js"; +import { sendSvixEvent } from "@/external/svix/svixHelpers.js"; import { CusService } from "@/internal/customers/CusService.js"; import { getCustomerDetails } from "@/internal/customers/cusUtils/getCustomerDetails.js"; @@ -205,7 +205,7 @@ export const handleProductsUpdated = async ({ } // 2. Send Svix event - const res = await sendSvixEvent({ + await sendSvixEvent({ org, env, eventType: "customer.products.updated", diff --git a/server/src/internal/api/apiRouter.ts b/server/src/internal/api/apiRouter.ts index 790a0ba7e..16ec50e7f 100644 --- a/server/src/internal/api/apiRouter.ts +++ b/server/src/internal/api/apiRouter.ts @@ -21,18 +21,12 @@ import { analyticsMiddleware } from "@/middleware/analyticsMiddleware.js"; import rewardRouter from "./rewards/rewardRouter.js"; import expireRouter from "../customers/expire/expireRouter.js"; -const apiRouter = Router(); +const apiRouter: Router = Router(); apiRouter.use(apiAuthMiddleware); apiRouter.use(pricingMiddleware); apiRouter.use(analyticsMiddleware); -apiRouter.get("/auth", (req: any, res) => { - res.json({ - message: `Authenticated -- Hello ${req.minOrg?.slug}!`, - }); -}); - apiRouter.use("/customers", cusRouter); apiRouter.use("/invoices", invoiceRouter); apiRouter.use("/products", productApiRouter); diff --git a/server/src/internal/api/components/componentRouter.ts b/server/src/internal/api/components/componentRouter.ts index 8d2b03482..9fa0c3570 100644 --- a/server/src/internal/api/components/componentRouter.ts +++ b/server/src/internal/api/components/componentRouter.ts @@ -11,7 +11,7 @@ import { routeHandler } from "@/utils/routerUtils.js"; import { FullCusProduct, CusProductStatus, ProductV2 } from "@autumn/shared"; import { Router } from "express"; -export const componentRouter = Router(); +export const componentRouter: Router = Router(); componentRouter.get("/pricing_table", async (req: any, res) => routeHandler({ diff --git a/server/src/internal/api/cusRouter.ts b/server/src/internal/api/cusRouter.ts index 491b1fac3..75485e07a 100644 --- a/server/src/internal/api/cusRouter.ts +++ b/server/src/internal/api/cusRouter.ts @@ -20,9 +20,8 @@ import { handleUpdateCustomer } from "../customers/handlers/handleUpdateCustomer import { handleCreateBillingPortal } from "../customers/handlers/handleCreateBillingPortal.js"; import { handleGetCustomer } from "../customers/handlers/handleGetCustomer.js"; import { CusSearchService } from "@/internal/customers/CusSearchService.js"; -import assert from "assert"; -export const cusRouter = Router(); +export const cusRouter: Router = Router(); cusRouter.post("/all/search", async (req: any, res: any) => { try { diff --git a/server/src/internal/api/entities/entityRouter.ts b/server/src/internal/api/entities/entityRouter.ts index af6f40d99..e839c47f8 100644 --- a/server/src/internal/api/entities/entityRouter.ts +++ b/server/src/internal/api/entities/entityRouter.ts @@ -1,18 +1,15 @@ import { Router } from "express"; import { routeHandler } from "@/utils/routerUtils.js"; -import { EntityService } from "./EntityService.js"; import { CusService } from "@/internal/customers/CusService.js"; -import RecaseError from "@/utils/errorUtils.js"; -import { ErrCode } from "@autumn/shared"; import { handleGetEntity } from "./handlers/handleGetEntity.js"; import { handlePostEntityRequest } from "../../entities/handlers/handleCreateEntity/handleCreateEntity.js"; import { handleDeleteEntity } from "./handlers/handleDeleteEntity.js"; -export const entityRouter = Router({ mergeParams: true }); +export const entityRouter: Router = Router({ mergeParams: true }); // List entityes -entityRouter.get("", (req, res) => +entityRouter.get("", (req: any, res: any) => routeHandler({ req, res, diff --git a/server/src/internal/api/entitled/entitledRouter.ts b/server/src/internal/api/entitled/entitledRouter.ts index 4f44f4844..3b8c7cccd 100644 --- a/server/src/internal/api/entitled/entitledRouter.ts +++ b/server/src/internal/api/entitled/entitledRouter.ts @@ -30,7 +30,7 @@ import { getOrCreateCustomer } from "@/internal/customers/cusUtils/getOrCreateCu import { getCheckPreview } from "./getCheckPreview.js"; import { orgToVersion } from "@/utils/versionUtils.js"; -export const entitledRouter = Router(); +export const entitledRouter: Router = Router(); const getRequiredAndActualBalance = ({ cusEnts, diff --git a/server/src/internal/api/events/eventRouter.ts b/server/src/internal/api/events/eventRouter.ts index db713779e..987cf5d2c 100644 --- a/server/src/internal/api/events/eventRouter.ts +++ b/server/src/internal/api/events/eventRouter.ts @@ -30,7 +30,7 @@ import { DrizzleCli } from "@/db/initDrizzle.js"; import { ExtendedRequest } from "@/utils/models/Request.js"; import { getEventTimestamp } from "./eventUtils.js"; -export const eventsRouter = Router(); +export const eventsRouter: Router = Router(); const getEventAndCustomer = async ({ req, diff --git a/server/src/internal/api/events/usageRouter.ts b/server/src/internal/api/events/usageRouter.ts index ee17ffb92..9864643f2 100644 --- a/server/src/internal/api/events/usageRouter.ts +++ b/server/src/internal/api/events/usageRouter.ts @@ -3,7 +3,6 @@ import { CusProductStatus, Customer, ErrCode, - Event, EventInsert, FeatureType, FeatureUsageType, @@ -12,22 +11,17 @@ import RecaseError, { handleRequestError } from "@/utils/errorUtils.js"; import { generateId, nullish } from "@/utils/genUtils.js"; import { EventService } from "./EventService.js"; -import { OrgService } from "@/internal/orgs/OrgService.js"; -import { FeatureService } from "@/internal/features/FeatureService.js"; import { StatusCodes } from "http-status-codes"; -import { QueueManager } from "@/queue/QueueManager.js"; - import { JobName } from "@/queue/JobName.js"; import { getOrCreateCustomer } from "@/internal/customers/cusUtils/getOrCreateCustomer.js"; import { creditSystemContainsFeature } from "@/internal/features/creditSystemUtils.js"; import { addTaskToQueue } from "@/queue/queueUtils.js"; -import { getOrgAndFeatures } from "@/internal/orgs/orgUtils.js"; import { getEventTimestamp } from "./eventUtils.js"; import { ExtendedRequest } from "@/utils/models/Request.js"; -import { runUpdateBalanceTask } from "@/trigger/updateBalanceTask.js"; import { runUpdateUsageTask } from "@/trigger/updateUsageTask.js"; -export const eventsRouter = Router(); -export const usageRouter = Router(); + +export const eventsRouter: Router = Router(); +export const usageRouter: Router = Router(); const getCusFeatureAndOrg = async ({ req, diff --git a/server/src/internal/api/features/featureApiRouter.ts b/server/src/internal/api/features/featureApiRouter.ts index 70cd253da..5b7a67013 100644 --- a/server/src/internal/api/features/featureApiRouter.ts +++ b/server/src/internal/api/features/featureApiRouter.ts @@ -6,7 +6,7 @@ import RecaseError, { import { handleUpdateFeature } from "./handlers/handleUpdateFeature.js"; import { Feature, FeatureResponseSchema, FeatureType } from "@autumn/shared"; import { CreateFeatureSchema } from "@autumn/shared"; -import express from "express"; +import express, { Router } from "express"; import { generateId } from "@/utils/genUtils.js"; import { ErrCode } from "@/errors/errCodes.js"; @@ -20,7 +20,7 @@ import { JobName } from "@/queue/JobName.js"; import { OrgService } from "@/internal/orgs/OrgService.js"; import { handleDeleteFeature } from "./handlers/handleDeleteFeature.js"; -export const featureApiRouter = express.Router(); +export const featureApiRouter: Router = express.Router(); export const validateFeature = (data: any) => { let featureType = data.type; diff --git a/server/src/internal/api/invoiceRouter.ts b/server/src/internal/api/invoiceRouter.ts index 8f3f19bf5..73738f70f 100644 --- a/server/src/internal/api/invoiceRouter.ts +++ b/server/src/internal/api/invoiceRouter.ts @@ -4,7 +4,7 @@ import { OrgService } from "@/internal/orgs/OrgService.js"; import { handleRequestError } from "@/utils/errorUtils.js"; import { Router } from "express"; -export const invoiceRouter = Router(); +export const invoiceRouter: Router = Router(); invoiceRouter.get("/:stripe_invoice_id/stripe", async (req: any, res: any) => { try { diff --git a/server/src/internal/api/products/productRouter.ts b/server/src/internal/api/products/productRouter.ts index cf240d3df..f9b98208a 100644 --- a/server/src/internal/api/products/productRouter.ts +++ b/server/src/internal/api/products/productRouter.ts @@ -17,7 +17,7 @@ import { handleCopyProduct } from "./handlers/handleCopyProduct.js"; import { handleCreateProduct } from "./handlers/handleCreateProduct.js"; import { handleListProducts } from "./handlers/handleListProducts.js"; -export const productApiRouter = Router(); +export const productApiRouter: Router = Router(); productApiRouter.get("", handleListProducts); diff --git a/server/src/internal/api/rewards/referralRouter.ts b/server/src/internal/api/rewards/referralRouter.ts index 01832ca90..e94f92cbb 100644 --- a/server/src/internal/api/rewards/referralRouter.ts +++ b/server/src/internal/api/rewards/referralRouter.ts @@ -8,13 +8,13 @@ import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionServ import RecaseError from "@/utils/errorUtils.js"; import { generateId, notNullish } from "@/utils/genUtils.js"; import { routeHandler } from "@/utils/routerUtils.js"; -import { Customer, ErrCode, RewardTriggerEvent } from "@autumn/shared"; -import express from "express"; -import { ReferralCode, RewardRedemption } from "@autumn/shared"; +import { ErrCode, RewardTriggerEvent } from "@autumn/shared"; +import express, { Router } from "express"; +import { RewardRedemption } from "@autumn/shared"; import { OrgService } from "@/internal/orgs/OrgService.js"; import { RewardProgramService } from "@/internal/rewards/RewardProgramService.js"; -export const referralRouter = express.Router(); +export const referralRouter: Router = express.Router(); // 1. Get referral code referralRouter.post("/code", (req, res) => @@ -238,7 +238,7 @@ referralRouter.post("/redeem", (req, res) => }), ); -export const redemptionRouter = express.Router(); +export const redemptionRouter: Router = express.Router(); redemptionRouter.get("/:redemptionId", (req, res) => routeHandler({ diff --git a/server/src/internal/api/rewards/rewardProgramRouter.ts b/server/src/internal/api/rewards/rewardProgramRouter.ts index aef8b7851..036d2bf5e 100644 --- a/server/src/internal/api/rewards/rewardProgramRouter.ts +++ b/server/src/internal/api/rewards/rewardProgramRouter.ts @@ -8,9 +8,9 @@ import { ErrCode, RewardTriggerEvent, } from "@autumn/shared"; -import express from "express"; +import express, { Router } from "express"; -export const rewardProgramRouter = express.Router(); +export const rewardProgramRouter: Router = express.Router(); rewardProgramRouter.post("", (req, res) => routeHandler({ diff --git a/server/src/internal/api/rewards/rewardRouter.ts b/server/src/internal/api/rewards/rewardRouter.ts index 989c8b0f0..15adf7711 100644 --- a/server/src/internal/api/rewards/rewardRouter.ts +++ b/server/src/internal/api/rewards/rewardRouter.ts @@ -1,4 +1,4 @@ -import express from "express"; +import express, { Router } from "express"; import { CreateRewardSchema, ErrCode, @@ -19,7 +19,7 @@ import { getRewardCat, } from "@/internal/rewards/rewardUtils.js"; -const rewardRouter = express.Router(); +const rewardRouter: Router = express.Router(); rewardRouter.post("", async (req: any, res: any) => { try { diff --git a/server/src/internal/customers/CusService.ts b/server/src/internal/customers/CusService.ts index 11a5d3294..66bd9c41d 100644 --- a/server/src/internal/customers/CusService.ts +++ b/server/src/internal/customers/CusService.ts @@ -189,194 +189,6 @@ export class CusService { return customer as Customer; } - //search customers - - static addPaginationAndSearch = ({ - query, - search, - pageNumber, - pageSize, - lastItem, - customerPrefix = "", - }: { - query: any; - search: string; - pageNumber: number | null; - pageSize: number; - lastItem: any; - customerPrefix: string; - }) => { - if (search && search !== "") { - query.or( - `"name".ilike.%${search}%, ` + - `"email".ilike.%${search}%, ` + - `"id".ilike.%${search}%`, - customerPrefix && { - foreignTable: "customers", - referencedTable: "customers", - }, - ); - } - - if (lastItem) { - query.or( - `"internal_id".lt.${lastItem.internal_id}`, - // `"created_at".lt.${lastItem.created_at},` + - // `and("created_at".eq.${lastItem.created_at},"internal_id".gt.${lastItem.internal_id})`, - customerPrefix && { - foreignTable: "customers", - referencedTable: "customers", - }, - ); - } - - if (customerPrefix) { - query.order(`customer(internal_id)`, { ascending: false }); - } else { - query.order("internal_id", { ascending: false }); - // query - // .order("created_at", { ascending: false }) - // .order("internal_id", { ascending: true }); - } - - query.limit(pageSize); - }; - - static async searchCustomersByProduct({ - sb, - orgId, - env, - search, - filters, - pageSize, - lastItem, - pageNumber, - }: { - sb: SupabaseClient; - orgId: string; - env: AppEnv; - search: string; - filters: any; - pageSize: number; - lastItem: any; - pageNumber: number; - }) { - const query = sb - .from("customer_products") - .select( - `*, - customer:customers!inner(*), product:products!inner(id, name, version)`, - { - count: "exact", - }, - ) - .eq("customer.org_id", orgId) - .eq("customer.env", env) - .in("status", [CusProductStatus.Active, CusProductStatus.PastDue]); - - if (filters.product_id) { - query.eq("product.id", filters.product_id); - } - - if (filters?.status === "canceled") { - console.log("Adding canceled filter"); - query - .eq("status", CusProductStatus.Active) - .not("canceled_at", "is", null); - } else if (filters?.status === "free_trial") { - console.log("Adding free trial filter"); - query - .eq("status", CusProductStatus.Active) - .gt("trial_ends_at", Date.now()); - } - - this.addPaginationAndSearch({ - query, - search, - pageNumber, - pageSize, - lastItem, - customerPrefix: "customers.", - }); - - const { data, count, error } = await query; - - if (error) { - throw error; - } - - // Flip - - const customers = flipProductResults(data); - - return { data: customers, count }; - } - - static async searchCustomers({ - sb, - orgId, - env, - search, - pageSize = 50, - filters, - lastItem, - pageNumber, - }: { - sb: SupabaseClient; - orgId: string; - env: AppEnv; - search: string; - lastItem?: { created_at: string; name: string; internal_id: string } | null; - filters: any; - pageSize?: number; - pageNumber: number; - }) { - if (filters.product_id || filters.status) { - return await this.searchCustomersByProduct({ - sb, - orgId, - env, - search, - filters, - pageSize, - lastItem, - pageNumber, - }); - } - - let select = - "*, customer_products:customer_products(*, product:products(*))"; - - let query = sb - .from("customers") - .select(select, { - count: "exact", - // count: "planned", // use for 1M rows...? - }) - .eq("org_id", orgId) - .eq("env", env); - - this.addPaginationAndSearch({ - query, - search, - pageNumber: null, - pageSize, - lastItem, - customerPrefix: "", - }); - - const { data, count, error } = await query; - - if (error) { - throw error; - } - - const totalCount = count && count + pageSize * (pageNumber - 1); - return { data, count: totalCount }; - } - - // End of search customers - static async insert({ db, data }: { db: DrizzleCli; data: Customer }) { try { const results = await db @@ -469,192 +281,3 @@ export class CusService { return results; } } - -// static async getWithProductsDrizzle({ -// db, -// idOrInternalId, -// orgId, -// env, -// inStatuses = [ -// CusProductStatus.Active, -// CusProductStatus.PastDue, -// CusProductStatus.Scheduled, -// ], -// withEntities = false, -// entityId, -// expand, -// withSubs = false, -// }: { -// db: DrizzleCli; -// idOrInternalId: string; -// orgId: string; -// env: AppEnv; -// inStatuses?: CusProductStatus[]; -// withEntities?: boolean; -// entityId?: string; -// expand?: (CusExpand | EntityExpand)[]; -// withSubs?: boolean; -// }) { -// // 1. Call RPC function -// let data: { -// customer: Customer | null; -// products: FullCusProduct[] | null; -// entities: Entity[] | null; -// entity: Entity | null; -// trials_used: any[] | null; -// subscriptions: any[] | null; -// invoices: any[] | null; -// }; - -// try { -// const result = await db.execute(sql` -// SELECT * FROM get_cus_with_products( -// p_cus_id => ${idOrInternalId}::text, -// p_org_id => ${orgId}::text, -// p_env => ${env}::text, -// p_statuses => ARRAY[${sql.join( -// inStatuses.map((status) => sql`${status}`), -// sql`, `, -// )}]::text[], -// p_with_entities => ${withEntities}::boolean, -// p_entity_id => ${entityId || null}::text, -// p_with_trials_used => ${expand?.includes(CusExpand.TrialsUsed) || false}::boolean, -// p_with_subs => ${withSubs}::boolean, -// p_with_invoices => ${expand?.includes(CusExpand.Invoices) || false}::boolean -// ) -// `); - -// if (!result || result.length == 0 || !result[0].get_cus_with_products) { -// throw new RecaseError({ -// message: "Calling get_cus_with_products RPC returned wrong shape", -// code: ErrCode.GetCusWithProductsFailed, -// statusCode: StatusCodes.INTERNAL_SERVER_ERROR, -// data: result, -// }); -// } - -// data = result[0].get_cus_with_products as any; -// } catch (error) { -// throw error; -// } - -// if (!data || !data.customer) { -// return null; -// } - -// let { customer, products, entities, entity } = data; - -// if (!products) { -// products = []; -// } - -// for (let product of products) { -// if (!product.customer_prices) { -// product.customer_prices = []; -// } - -// if (!product.customer_entitlements) { -// product.customer_entitlements = []; -// } -// } - -// let trialsUsed = data.trials_used; -// if (trialsUsed) { -// trialsUsed = trialsUsed.filter( -// (trial: any, index: number, self: any) => -// index === -// self.findIndex((t: any) => t.product_id === trial.product_id), -// ); -// } - -// return { -// ...customer, -// customer_products: products, -// entities: entities, -// entity: entity, -// trials_used: trialsUsed, -// subscriptions: data.subscriptions, -// invoices: data.invoices, -// } as FullCustomer; -// } - -// static async getWithProducts({ -// sb, -// idOrInternalId, -// orgId, -// env, -// inStatuses = [ -// CusProductStatus.Active, -// CusProductStatus.PastDue, -// CusProductStatus.Scheduled, -// ], -// withEntities = false, -// entityId, -// expand, -// withSubs = false, -// }: { -// sb: SupabaseClient; -// idOrInternalId: string; -// orgId: string; -// env: AppEnv; -// inStatuses?: CusProductStatus[]; -// withEntities?: boolean; -// entityId?: string; -// expand?: (CusExpand | EntityExpand)[]; -// withSubs?: boolean; -// }) { -// const { data, error } = await sb.rpc("get_cus_with_products", { -// p_cus_id: idOrInternalId, -// p_org_id: orgId, -// p_env: env, -// p_statuses: inStatuses, -// p_with_entities: withEntities, -// p_entity_id: entityId, -// p_with_trials_used: expand?.includes(CusExpand.TrialsUsed), -// p_with_subs: withSubs, -// p_with_invoices: expand?.includes(CusExpand.Invoices), -// }); - -// if (error) { -// throw error; -// } - -// if (!data || !data.customer) { -// return null; -// } - -// let { customer, products, entities, entity } = data; - -// if (!products) { -// products = []; -// } - -// for (let product of products) { -// if (!product.customer_prices) { -// product.customer_prices = []; -// } - -// if (!product.customer_entitlements) { -// product.customer_entitlements = []; -// } -// } - -// let trialsUsed = data.trials_used; -// if (trialsUsed) { -// trialsUsed = trialsUsed.filter( -// (trial: any, index: number, self: any) => -// index === -// self.findIndex((t: any) => t.product_id === trial.product_id), -// ); -// } - -// return { -// ...customer, -// customer_products: products, -// entities: entities, -// entity: entity, -// trials_used: trialsUsed, -// subscriptions: data.subscriptions, -// invoices: data.invoices, -// }; -// } diff --git a/server/src/internal/customers/attach/attachFunctions/addProductFlow/handleOneOffFunction.ts b/server/src/internal/customers/attach/attachFunctions/addProductFlow/handleOneOffFunction.ts index c752b6ac0..e4b10669b 100644 --- a/server/src/internal/customers/attach/attachFunctions/addProductFlow/handleOneOffFunction.ts +++ b/server/src/internal/customers/attach/attachFunctions/addProductFlow/handleOneOffFunction.ts @@ -86,18 +86,18 @@ export const handleOneOffFunction = async ({ // Create invoice logger.info("1. Creating invoice"); const stripeInvoice = await stripeCli.invoices.create({ - customer: customer.processor.id, + customer: customer.processor.id!, auto_advance: false, - currency: org.default_currency, + currency: org.default_currency!, }); logger.info("2. Creating invoice items"); for (const invoiceItem of invoiceItems) { await stripeCli.invoiceItems.create({ ...invoiceItem, - customer: customer.processor.id, + customer: customer.processor.id!, invoice: stripeInvoice.id, - }); + } as any); } // Create invoice items diff --git a/server/src/internal/customers/attach/attachRouter.ts b/server/src/internal/customers/attach/attachRouter.ts index 5481f7a57..72f98e562 100644 --- a/server/src/internal/customers/attach/attachRouter.ts +++ b/server/src/internal/customers/attach/attachRouter.ts @@ -42,7 +42,7 @@ import { processAttachBody } from "./attachUtils/attachParams/processAttachBody. import { handleAttachPreview } from "./handleAttachPreview/handleAttachPreview.js"; import { handleAttach } from "./handleAttach.js"; -export const attachRouter = Router(); +export const attachRouter: Router = Router(); export const handlePrepaidErrors = async ({ attachParams, @@ -257,10 +257,6 @@ const handleAttachOld = async (req: any, res: any) => } logger.info("--------------------------------"); - let publicStr = req.isPublic ? "(Public) " : ""; - logger.info( - `${publicStr}ATTACH PRODUCT REQUEST (from ${req.minOrg.slug})`, - ); const { customer, diff --git a/server/src/internal/customers/expire/expireRouter.ts b/server/src/internal/customers/expire/expireRouter.ts index f5568361c..7cf490117 100644 --- a/server/src/internal/customers/expire/expireRouter.ts +++ b/server/src/internal/customers/expire/expireRouter.ts @@ -6,7 +6,7 @@ import { CusProductStatus, ErrCode, FullCusProduct } from "@autumn/shared"; import { Router } from "express"; import { expireCusProduct } from "../handlers/handleCusProductExpired.js"; -const expireRouter = Router(); +const expireRouter: Router = Router(); expireRouter.post("", async (req, res) => routeHandler({ diff --git a/server/src/internal/customers/handlers/handleGetCustomer.ts b/server/src/internal/customers/handlers/handleGetCustomer.ts index b5e434551..adca2a67e 100644 --- a/server/src/internal/customers/handlers/handleGetCustomer.ts +++ b/server/src/internal/customers/handlers/handleGetCustomer.ts @@ -40,7 +40,7 @@ export const handleGetCustomer = async (req: any, res: any) => if (!customer) { req.logtail.warn( - `GET /customers/${customerId}: not found | Org: ${req.minOrg.slug}`, + `GET /customers/${customerId}: not found | Org: ${org.slug}`, ); res.status(StatusCodes.NOT_FOUND).json({ message: `Customer ${customerId} not found`, diff --git a/server/src/internal/customers/handlers/handlePostCustomer.ts b/server/src/internal/customers/handlers/handlePostCustomer.ts index af502ecba..6b12fd1c2 100644 --- a/server/src/internal/customers/handlers/handlePostCustomer.ts +++ b/server/src/internal/customers/handlers/handlePostCustomer.ts @@ -56,9 +56,7 @@ export const handlePostCustomerRequest = async (req: any, res: any) => { error instanceof RecaseError && error.code === ErrCode.DuplicateCustomerId ) { - logger.warn( - `POST /customers: ${error.message} (org: ${req.minOrg.slug})`, - ); + logger.warn(`POST /customers: ${error.message} (org: ${req.org?.slug})`); res.status(error.statusCode).json({ message: error.message, code: error.code, diff --git a/server/src/internal/customers/handlers/handleUpdateBalances.ts b/server/src/internal/customers/handlers/handleUpdateBalances.ts index 5fb45d538..3e8f7122e 100644 --- a/server/src/internal/customers/handlers/handleUpdateBalances.ts +++ b/server/src/internal/customers/handlers/handleUpdateBalances.ts @@ -82,7 +82,7 @@ export const handleUpdateBalances = async (req: any, res: any) => { logger.info("--------------------------------"); logger.info( - `REQUEST: UPDATE BALANCES FOR CUSTOMER ${customer.id}, ORG: ${req.minOrg.slug}`, + `REQUEST: UPDATE BALANCES FOR CUSTOMER ${customer.id}, ORG: ${org.slug}`, ); logger.info( `Features to update: ${balances.map( diff --git a/server/src/internal/customers/internalCusRouter.ts b/server/src/internal/customers/internalCusRouter.ts index 92707fa8b..5a337b645 100644 --- a/server/src/internal/customers/internalCusRouter.ts +++ b/server/src/internal/customers/internalCusRouter.ts @@ -26,7 +26,7 @@ import { StatusCodes } from "http-status-codes"; import { cusProductToProduct } from "./cusProducts/cusProductUtils/convertCusProduct.js"; import { createOrgResponse } from "../orgs/orgUtils.js"; -export const cusRouter = Router(); +export const cusRouter: Router = Router(); cusRouter.get("/:customer_id/data", async (req: any, res: any) => { try { diff --git a/server/src/internal/customers/previews/checkProductUtils.ts b/server/src/internal/customers/previews/checkProductUtils.ts index 7986704e5..027e4d2c3 100644 --- a/server/src/internal/customers/previews/checkProductUtils.ts +++ b/server/src/internal/customers/previews/checkProductUtils.ts @@ -30,7 +30,7 @@ export const getProductChargeText = ({ itemStrs.push( formatCurrency({ amount: total, - defaultCurrency: org.default_currency, + defaultCurrency: org.default_currency!, }), ); } diff --git a/server/src/internal/customers/previews/previewUtils.ts b/server/src/internal/customers/previews/previewUtils.ts index 90a99219a..24dc0c171 100644 --- a/server/src/internal/customers/previews/previewUtils.ts +++ b/server/src/internal/customers/previews/previewUtils.ts @@ -26,17 +26,17 @@ export const formatTiers = ({ if (tiers.length == 1) { return formatCurrency({ amount: tiers[0].amount, - defaultCurrency: org.default_currency, + defaultCurrency: org.default_currency!, }); } let tiersStart = formatCurrency({ amount: tiers[0].amount, - defaultCurrency: org.default_currency, + defaultCurrency: org.default_currency!, }); let tiersEnd = formatCurrency({ amount: tiers[tiers.length - 1].amount, - defaultCurrency: org.default_currency, + defaultCurrency: org.default_currency!, }); return `${tiersStart} - ${tiersEnd}`; @@ -58,13 +58,13 @@ export const getItemsHtml = ({ if (pricedItems.length == 1) { html += `${formatCurrency({ amount: totalAmount, - defaultCurrency: org.default_currency, + defaultCurrency: org.default_currency!, })}
`; } else { html += `- ${itemsToHtml({ items: pricedItems })}
Total: ${formatCurrency({ amount: totalAmount, - defaultCurrency: org.default_currency, + defaultCurrency: org.default_currency!, })}
`; } diff --git a/server/src/internal/dev/ApiKeyService.ts b/server/src/internal/dev/ApiKeyService.ts index 437fd4e9d..4c3042106 100644 --- a/server/src/internal/dev/ApiKeyService.ts +++ b/server/src/internal/dev/ApiKeyService.ts @@ -115,32 +115,3 @@ export class CachedKeyService { } } } - -// const { data, error } = await sb.rpc("verify_api_key", { -// p_hashed_key: hashedKey, -// p_env: env, -// }); - -// if (error) { -// throw error; -// } - -// if (!data.success || !data.organization) { -// console.warn(`(warning) failed to verify secret key: ${data.error}`); -// return null; -// } - -// let org = structuredClone(data.organization); -// delete org.features; - -// // Add org config and api version -// org.config = OrgConfigSchema.parse(org.config || {}); -// org.api_version = getApiVersion({ -// createdAt: org.created_at, -// }); - -// return { -// org, -// features: data.organization?.features || [], -// env, -// }; diff --git a/server/src/internal/dev/devRouter.ts b/server/src/internal/dev/devRouter.ts index e7fb9844a..7b5f64622 100644 --- a/server/src/internal/dev/devRouter.ts +++ b/server/src/internal/dev/devRouter.ts @@ -4,13 +4,13 @@ import { Router } from "express"; import { ApiKeyService } from "./ApiKeyService.js"; import { OrgService } from "../orgs/OrgService.js"; import { createKey } from "./api-keys/apiKeyUtils.js"; -import { getSvixDashboardUrl } from "@/external/svix/svixUtils.js"; +import { getSvixDashboardUrl } from "@/external/svix/svixHelpers.js"; import { handleRequestError } from "@/utils/errorUtils.js"; import { CacheManager } from "@/external/caching/CacheManager.js"; import { CacheType } from "@/external/caching/cacheActions.js"; import { routeHandler } from "@/utils/routerUtils.js"; -export const devRouter = Router(); +export const devRouter: Router = Router(); devRouter.get("/data", withOrgAuth, async (req: any, res) => { try { @@ -57,9 +57,7 @@ devRouter.post("/api_key", withOrgAuth, async (req: any, res) => name, orgId, prefix, - meta: { - org_slug: req.minOrg.slug, - }, + meta: {}, }); res.status(200).json({ diff --git a/server/src/internal/emails/sendInvitationEmail.ts b/server/src/internal/emails/sendInvitationEmail.ts new file mode 100644 index 000000000..c4a4dfa17 --- /dev/null +++ b/server/src/internal/emails/sendInvitationEmail.ts @@ -0,0 +1,40 @@ +import { sendTextEmail } from "@/external/resend/resendUtils.js"; +import { safeResend } from "@/external/resend/safeResend.js"; + +const getInvitationEmailBody = ({ + orgName, + inviteLink, +}: { + orgName: string; + inviteLink: string; +}) => { + return `Hey there! You've been invited to join ${orgName} on Autumn. + +Click the link below to create an account / sign in and you'll be automatically added to the organization. + +${process.env.CLIENT_URL}/sign-in + `; +}; + +export const sendInvitationEmail = safeResend({ + fn: async ({ + email, + + orgName, + inviteLink, + }: { + email: string; + + orgName: string; + inviteLink: string; + }) => { + console.log("Sending invitation email to", email); + await sendTextEmail({ + from: `AutumnHey ${userFirstName} :)
+ +Just wanted to say thank you for signing up to Autumn!
+ +I'm curious--how did you hear about us? Also are you just looking around or do you have a specific use case I can help you with?
+ +Whatever the reason, anything you need I'm here to help.
+ +Ayush
+Co-founder, Autumn
Oh, and join our Discord community to connect with us and other users
+ `; +}; + +export const sendOnboardingEmail = safeResend({ + fn: async ({ name, email }: { name: string; email: string }) => { + const firstName = name.split(" ")[0]; + + await sendHtmlEmail({ + to: email, + subject: "Anything I can help with?", + body: getWelcomeEmailBody(firstName), + }); + }, + action: "send onboarding email", +}); diff --git a/server/src/internal/features/featureRouter.ts b/server/src/internal/features/featureRouter.ts index 4823fe450..600b2ab5e 100644 --- a/server/src/internal/features/featureRouter.ts +++ b/server/src/internal/features/featureRouter.ts @@ -1,10 +1,10 @@ -import express from "express"; +import express, { Router } from "express"; import { FeatureService } from "./FeatureService.js"; -export const featureRouter = express.Router(); +export const featureRouter: Router = express.Router(); -featureRouter.get("", async (req: any, res) => { +featureRouter.get("", async (req: any, res: any) => { try { let features = await FeatureService.getFromReq(req); res.status(200).json({ features }); diff --git a/server/src/internal/features/featureUtils.ts b/server/src/internal/features/featureUtils.ts index b7dc53fcb..5c30b42b0 100644 --- a/server/src/internal/features/featureUtils.ts +++ b/server/src/internal/features/featureUtils.ts @@ -159,6 +159,13 @@ export const runSaveFeatureDisplayTask = async ({ }) => { let display; try { + if (!process.env.ANTHROPIC_API_KEY) { + logger.warn( + "ANTHROPIC_API_KEY is not set, skipping feature display generation", + ); + return; + } + logger.info( `Generating feature display for ${feature.id} (org: ${org.slug})`, ); diff --git a/server/src/internal/mainRouter.ts b/server/src/internal/mainRouter.ts index c5ddc4889..b94c68f11 100644 --- a/server/src/internal/mainRouter.ts +++ b/server/src/internal/mainRouter.ts @@ -1,5 +1,4 @@ -import dotenv from "dotenv"; -dotenv.config(); +import "dotenv/config"; import { orgRouter } from "./orgs/orgRouter.js"; import { Router } from "express"; @@ -13,17 +12,18 @@ import { onboardingRouter } from "./orgs/onboarding/onboardingRouter.js"; import { handlePostOrg } from "./orgs/handlers/handlePostOrg.js"; import { Autumn } from "autumn-js"; import { autumnHandler } from "autumn-js/express"; -import { parseAuthHeader } from "@/utils/authUtils.js"; +import { withAdminAuth } from "./admin/withAdminAuth.js"; +import { adminRouter } from "./admin/adminRouter.js"; -const mainRouter = Router(); +const mainRouter: Router = Router(); mainRouter.get("", async (req: any, res) => { res.status(200).json({ message: "Hello World" }); }); mainRouter.post("/organization", withAuth, handlePostOrg); +mainRouter.use("/admin", withAdminAuth, adminRouter); mainRouter.use("/users", withAuth, userRouter); - mainRouter.use("/onboarding", withOrgAuth, onboardingRouter); mainRouter.use("/organization", withOrgAuth, orgRouter); mainRouter.use("/features", withOrgAuth, featureRouter); @@ -31,34 +31,35 @@ mainRouter.use("/products", withOrgAuth, productRouter); mainRouter.use("/dev", devRouter); mainRouter.use("/customers", withOrgAuth, cusRouter); -mainRouter.use( - "/api/autumn", - withOrgAuth, - autumnHandler({ - identify: async (req: any) => { - return { - customerId: req.org?.id, - customerData: { - name: req.org?.slug, - email: req.user?.email, - }, - }; - }, - }), -); +// Optional... +if (process.env.AUTUMN_SECRET_KEY) { + mainRouter.use( + "/api/autumn", + withOrgAuth, + autumnHandler({ + identify: async (req: any) => { + return { + customerId: req.org?.id, + customerData: { + name: req.org?.slug, + email: req.user?.email, + }, + }; + }, + }), + ); +} mainRouter.use( "/demo/api/autumn", withOrgAuth, - autumnHandler({ autumn: (req: any) => { - let bearerToken = parseAuthHeader(req); - - return new Autumn({ - secretKey: bearerToken, + let client = new Autumn({ url: "http://localhost:8080/v1", - }) as any; + headers: req.headers, + }); + return client as any; }, identify: async (req: any) => { return { diff --git a/server/src/internal/migrations/migrationRouter.ts b/server/src/internal/migrations/migrationRouter.ts index 16d4b2ce0..c1d01b25b 100644 --- a/server/src/internal/migrations/migrationRouter.ts +++ b/server/src/internal/migrations/migrationRouter.ts @@ -7,7 +7,7 @@ import { UsagePriceConfig, } from "@autumn/shared"; import { routeHandler } from "@/utils/routerUtils.js"; -import express from "express"; +import express, { Router } from "express"; import { constructMigrationJob } from "@/internal/migrations/migrationUtils.js"; import { MigrationService } from "@/internal/migrations/MigrationService.js"; import { JobName } from "@/queue/JobName.js"; @@ -20,7 +20,7 @@ import { isFreeProduct } from "@/internal/products/productUtils.js"; import { ExtendedRequest, ExtendedResponse } from "@/utils/models/Request.js"; import { findPrepaidPrice } from "../products/prices/priceUtils/findPriceUtils.js"; -export const migrationRouter = express.Router(); +export const migrationRouter: Router = express.Router(); migrationRouter.post("", async (req: any, res: any) => { return routeHandler({ diff --git a/server/src/internal/migrations/migrationSteps/migrateCustomers.ts b/server/src/internal/migrations/migrationSteps/migrateCustomers.ts index cb25297ba..36e0460ba 100644 --- a/server/src/internal/migrations/migrationSteps/migrateCustomers.ts +++ b/server/src/internal/migrations/migrationSteps/migrateCustomers.ts @@ -11,7 +11,7 @@ import { MigrationService } from "../MigrationService.js"; import { OrgService } from "@/internal/orgs/OrgService.js"; import { createStripeCli } from "@/external/stripe/utils.js"; import { migrateCustomer } from "./migrateCustomer.js"; -import { sendMigrationEmail } from "./sendMigrationEmail.js"; +import { sendMigrationEmail } from "../../emails/sendMigrationEmail.js"; import { createStripePriceIFNotExist } from "@/external/stripe/createStripePrice/createStripePrice.js"; import { DrizzleCli } from "@/db/initDrizzle.js"; diff --git a/server/src/internal/migrations/migrationSteps/sendMigrationEmail.ts b/server/src/internal/migrations/migrationSteps/sendMigrationEmail.ts deleted file mode 100644 index 9495c9c59..000000000 --- a/server/src/internal/migrations/migrationSteps/sendMigrationEmail.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { MigrationService } from "../MigrationService.js"; -import { sendTextEmail } from "@/external/resend/resendUtils.js"; -import { MigrationJobStep, Organization } from "@autumn/shared"; -import { DrizzleCli } from "@/db/initDrizzle.js"; - -export const sendMigrationEmail = async ({ - db, - migrationJobId, - org, -}: { - db: DrizzleCli; - migrationJobId: string; - org: Organization; -}) => { - let migrationJob = await MigrationService.getJob({ - db, - id: migrationJobId, - }); - - // Send email - let getCustomersStep = - migrationJob.step_details[MigrationJobStep.GetCustomers]; - let migrateStep = - migrationJob.step_details[MigrationJobStep.MigrateCustomers]; - - console.log("Sending migration email"); - await sendTextEmail({ - to: "johnyeocx@gmail.com", - subject: `Migration Job Finished -- ${migrationJob.id}`, - body: ` - -ORG: ${org.id}, ${org.slug} -Step: Get migration customers - -1. Total customers: ${getCustomersStep?.total_customers} -2. Canceled customers: ${getCustomersStep?.canceled_customers} - -Step: Migrate customers - -1. Number of errors: ${migrateStep?.num_errors} -2. Failed customers: -${migrateStep?.failed_customers} -`, - }); -}; diff --git a/server/src/internal/orgs/AuthService.ts b/server/src/internal/orgs/AuthService.ts new file mode 100644 index 000000000..0fddb7853 --- /dev/null +++ b/server/src/internal/orgs/AuthService.ts @@ -0,0 +1,34 @@ +// import { db } from "@/db/initDrizzle.js"; +// import { OrgService } from "./OrgService.js"; +// import { DrizzleCli } from "@/db/initDrizzle.js"; +// import { member, organizations } from "@autumn/shared"; +// import { generateId } from "@/utils/genUtils.js"; + +// export class AuthService { +// static async createOrg({ +// db, +// name, +// slug, +// userId, +// }: { +// db: DrizzleCli; +// name: string; +// slug: string; +// userId: string; +// }) { +// // 1. Create org +// await db.insert(organizations).values({ +// id: generateId("org"), +// name, +// slug, +// createdAt: new Date(), +// }); + +// await db.insert(member).values({ +// id: generateId("mem"), +// organizationId: org.id, +// userId, +// createdAt: new Date(), +// }); +// } +// } diff --git a/server/src/internal/orgs/OrgService.ts b/server/src/internal/orgs/OrgService.ts index d54c87f18..a949dcdb6 100644 --- a/server/src/internal/orgs/OrgService.ts +++ b/server/src/internal/orgs/OrgService.ts @@ -1,18 +1,21 @@ import RecaseError from "@/utils/errorUtils.js"; +import { and, eq } from "drizzle-orm"; import { AppEnv, ErrCode, Feature, features, + invitation, + member, Organization, OrgConfigSchema, + user, } from "@autumn/shared"; -import { SupabaseClient } from "@supabase/supabase-js"; + import { getApiVersion } from "@/utils/versionUtils.js"; import { clearOrgCache } from "./orgUtils/clearOrgCache.js"; -import { DrizzleCli } from "@/db/initDrizzle.js"; -import { eq } from "drizzle-orm"; import { organizations, apiKeys } from "@autumn/shared"; +import { DrizzleCli } from "@/db/initDrizzle.js"; export class OrgService { static async getFromReq(req: any) { @@ -32,6 +35,30 @@ export class OrgService { return await this.get({ db: req.db, orgId: req.orgId }); } + static async getMembers({ db, orgId }: { db: DrizzleCli; orgId: string }) { + const results = await db + .select() + .from(member) + .where(eq(member.organizationId, orgId)) + .innerJoin(user, eq(member.userId, user.id)); + + return results; + } + + static async getInvites({ db, orgId }: { db: DrizzleCli; orgId: string }) { + const results = await db + .select() + .from(invitation) + .where( + and( + eq(invitation.organizationId, orgId), + eq(invitation.status, "pending"), + ), + ); + + return results; + } + // Drizzle get static async get({ db, orgId }: { db: DrizzleCli; orgId: string }) { const result = await db.query.organizations.findFirst({ diff --git a/server/src/internal/orgs/handlers/handleDeleteOrg.ts b/server/src/internal/orgs/handlers/handleDeleteOrg.ts new file mode 100644 index 000000000..f7ef86112 --- /dev/null +++ b/server/src/internal/orgs/handlers/handleDeleteOrg.ts @@ -0,0 +1,109 @@ +import { deleteSvixApp } from "@/external/svix/svixHelpers.js"; +import RecaseError, { handleFrontendReqError } from "@/utils/errorUtils.js"; +import { ExtendedRequest } from "@/utils/models/Request.js"; +import { AppEnv, customers, ErrCode, Organization } from "@autumn/shared"; +import { and, eq } from "drizzle-orm"; +import { Response } from "express"; +import { deleteStripeWebhook } from "../orgUtils.js"; + +const deleteSvixWebhooks = async ({ + org, + logger, +}: { + org: Organization; + logger: any; +}) => { + const batch = []; + if (org.svix_config?.sandbox_app_id) { + batch.push( + deleteSvixApp({ + appId: org.svix_config.sandbox_app_id, + }), + ); + } + + if (org.svix_config?.live_app_id) { + batch.push( + deleteSvixApp({ + appId: org.svix_config.live_app_id, + }), + ); + } + + try { + await Promise.all(batch); + } catch (error) { + logger.error(`Failed to delete svix webhooks for ${org.id}, ${org.slug}`); + } +}; + +const deleteStripeWebhooks = async ({ + org, + logger, +}: { + org: Organization; + logger: any; +}) => { + if (org.stripe_config) { + try { + await deleteStripeWebhook({ + org: org, + env: AppEnv.Sandbox, + }); + + await deleteStripeWebhook({ + org: org, + env: AppEnv.Live, + }); + } catch (error: any) { + logger.error( + `Failed to delete stripe webhooks for ${org.id}, ${org.slug}. ${error.message})`, + ); + } + } +}; + +export const handleDeleteOrg = async (req: ExtendedRequest, res: Response) => { + try { + const { org, db, logtail: logger } = req; + + // 1. Check if any customers + let hasCustomers = await db.query.customers.findFirst({ + where: eq(customers.org_id, org.id), + }); + + if (hasCustomers) + throw new RecaseError({ + message: "Cannot delete org with production mode customers", + code: ErrCode.OrgHasCustomers, + statusCode: 400, + }); + + // 2. Delete svix webhooks + logger.info("1. Deleting svix webhooks"); + await deleteSvixWebhooks({ org, logger }); + + // 3. Delete stripe webhooks + logger.info("2. Deleting stripe webhooks"); + await deleteStripeWebhooks({ org, logger }); + + // 4. Delete all sandbox customers + logger.info("3. Deleting sandbox customers"); + await db + .delete(customers) + .where( + and(eq(customers.org_id, org.id), eq(customers.env, AppEnv.Sandbox)), + ); + + res.status(200).json({ + message: "Org deleted", + }); + } catch (error) { + handleFrontendReqError({ + res, + error, + req, + action: "delete-org", + }); + } +}; diff --git a/server/src/internal/orgs/handlers/handleGetOrgMembers.ts b/server/src/internal/orgs/handlers/handleGetOrgMembers.ts new file mode 100644 index 000000000..746b6b30b --- /dev/null +++ b/server/src/internal/orgs/handlers/handleGetOrgMembers.ts @@ -0,0 +1,29 @@ +import { handleFrontendReqError } from "@/utils/errorUtils.js"; +import { OrgService } from "../OrgService.js"; +import { auth } from "@/utils/auth.js"; + +export const handleGetOrgMembers = async (req: any, res: any) => { + try { + const { org, db } = req; + const orgId = org.id; + + const memberships = await OrgService.getMembers({ db, orgId }); + const invites = await OrgService.getInvites({ db, orgId }); + + res.status(200).json({ + memberships, + invites, + }); + // res.status(200).json({ + // memberships: Array(10).fill(memberships[0]), + // invites: Array(10).fill(invites[0]), + // }); + } catch (error) { + handleFrontendReqError({ + req, + error, + res, + action: "get org members", + }); + } +}; diff --git a/server/src/internal/orgs/handlers/handleGetUploadUrl.ts b/server/src/internal/orgs/handlers/handleGetUploadUrl.ts new file mode 100644 index 000000000..ad24855ef --- /dev/null +++ b/server/src/internal/orgs/handlers/handleGetUploadUrl.ts @@ -0,0 +1,32 @@ +import { logger } from "@/external/logtail/logtailUtils.js"; +import { getUploadUrl } from "@/external/supabase/storageUtils.js"; +import RecaseError, { handleFrontendReqError } from "@/utils/errorUtils.js"; +import { ErrCode } from "@autumn/shared"; + +export const handleGetUploadUrl = async (req: any, res: any) => { + try { + const { org } = req; + + let path = `logo/${org.id}`; + + if (!process.env.SUPABASE_URL || !process.env.SUPABASE_SERVICE_KEY) { + logger.warn("Supabase storage not set up"); + res.status(400).json({ + message: "Supabase storage not set up", + code: ErrCode.SupabaseNotFound, + }); + return; + } + + const data = await getUploadUrl({ path }); + + res.status(200).json(data); + } catch (error) { + handleFrontendReqError({ + req, + error, + res, + action: "get upload url", + }); + } +}; diff --git a/server/src/internal/orgs/handlers/handleInvite.ts b/server/src/internal/orgs/handlers/handleInvite.ts new file mode 100644 index 000000000..17e4d9fea --- /dev/null +++ b/server/src/internal/orgs/handlers/handleInvite.ts @@ -0,0 +1,48 @@ +import { auth } from "@/utils/auth.js"; +import { + handleFrontendReqError, + handleRequestError, +} from "@/utils/errorUtils.js"; +import { ExtendedRequest, ExtendedResponse } from "@/utils/models/Request.js"; +import { user } from "@autumn/shared"; +import { eq } from "drizzle-orm"; +import { Request, Response } from "express"; + +export const handleInvite = async ( + req: ExtendedRequest, + res: ExtendedResponse, +) => { + try { + const { email, role } = req.body; + const { org, db } = req; + + const emailUser = await db.query.user.findFirst({ + where: eq(user.email, email), + }); + + if (emailUser) { + await auth.api.addMember({ + body: { + organizationId: org.id, + userId: emailUser.id, + role: role, + }, + }); + res.status(200).send({ + message: "User added to organization", + }); + return; + } + + res.status(202).send({ + message: "Send invitation to user", + }); + } catch (error) { + handleFrontendReqError({ + req, + res, + error, + action: "handleInvite", + }); + } +}; diff --git a/server/src/internal/orgs/handlers/handlePostOrg.ts b/server/src/internal/orgs/handlers/handlePostOrg.ts index 2b25401b8..f54e43fc8 100644 --- a/server/src/internal/orgs/handlers/handlePostOrg.ts +++ b/server/src/internal/orgs/handlers/handlePostOrg.ts @@ -1,6 +1,3 @@ -import { createClerkCli } from "@/external/clerkUtils.js"; -import { saveOrgToDB } from "@/external/webhooks/clerkWebhooks.js"; - import { ExtendedRequest, ExtendedResponse } from "@/utils/models/Request.js"; import { routeHandler } from "@/utils/routerUtils.js"; @@ -12,41 +9,51 @@ export const handlePostOrg = async (req: any, res: any) => handler: async (req: ExtendedRequest, res: ExtendedResponse) => { const { userId, db } = req; - const clerk = createClerkCli(); - const user = await clerk.users.getUser(userId!); + console.log("userId", userId); - let userMemberships = await clerk.users.getOrganizationMembershipList({ - userId: userId!, - }); + // const userMemberships = await auth.api.({ + // userId: userId!, + // }); - let org; + // const clerk = createClerkCli(); + // const user = await clerk.users.getUser(userId!); - if (userMemberships.data.length === 0) { - org = await clerk.organizations.createOrganization({ - name: `${user.firstName}'s Org`, - }); + // let userMemberships = await clerk.users.getOrganizationMembershipList({ + // userId: userId!, + // }); - // 2. Create org membership for user - await clerk.organizations.createOrganizationMembership({ - organizationId: org.id, - userId: userId!, - role: "org:admin", - }); + // let org; - await saveOrgToDB({ - db, - id: org.id, - slug: org.slug, - }); + // if (userMemberships.data.length === 0) { + // org = await clerk.organizations.createOrganization({ + // name: `${user.firstName}'s Org`, + // }); - console.log(`Created new org: ${org.id} (${org.slug})`); - } else { - org = userMemberships.data[0].organization; - } + // // 2. Create org membership for user + // await clerk.organizations.createOrganizationMembership({ + // organizationId: org.id, + // userId: userId!, + // role: "org:admin", + // }); + + // await saveOrgToDB({ + // db, + // id: org.id, + // slug: org.slug, + // }); + + // console.log(`Created new org: ${org.id} (${org.slug})`); + // } else { + // org = userMemberships.data[0].organization; + // } res.status(200).json({ - id: org.id, - slug: org.slug, + id: "123", + slug: "123", }); + // res.status(200).json({ + // id: org.id, + // slug: org.slug, + // }); }, }); diff --git a/server/src/internal/orgs/handlers/handleUpdateOrg.ts b/server/src/internal/orgs/handlers/handleUpdateOrg.ts new file mode 100644 index 000000000..a78b77503 --- /dev/null +++ b/server/src/internal/orgs/handlers/handleUpdateOrg.ts @@ -0,0 +1,23 @@ +// import { auth } from "@/utils/auth.js"; +// import { handleFrontendReqError } from "@/utils/errorUtils.js"; + +// export const handleUpdateOrg = async (req: any, res: any) => { +// try { +// await auth.api.updateOrganization({ +// data: { +// name: req.body.name, +// slug: req.body.slug, +// }, +// organizationId: req.org.id, +// }); + +// res.status(200).json({ success: true }); +// } catch (error) { +// handleFrontendReqError({ +// req, +// error, +// res, +// action: "update org", +// }); +// } +// }; diff --git a/server/src/internal/orgs/onboarding/onboardingRouter.ts b/server/src/internal/orgs/onboarding/onboardingRouter.ts index 56602fcdc..10323a758 100644 --- a/server/src/internal/orgs/onboarding/onboardingRouter.ts +++ b/server/src/internal/orgs/onboarding/onboardingRouter.ts @@ -3,7 +3,6 @@ import { Router } from "express"; import { eq } from "drizzle-orm"; import { routeHandler } from "@/utils/routerUtils.js"; import RecaseError from "@/utils/errorUtils.js"; -import { createClerkCli } from "@/external/clerkUtils.js"; import { AppEnv } from "@autumn/shared"; import { parseChatResultFeatures } from "./parseChatFeatures.js"; import { parseChatProducts } from "./parseChatProducts.js"; @@ -14,7 +13,7 @@ import { EntitlementService } from "@/internal/products/entitlements/Entitlement import { PriceService } from "@/internal/products/prices/PriceService.js"; import { ExtendedRequest, ExtendedResponse } from "@/utils/models/Request.js"; -export const onboardingRouter = Router(); +export const onboardingRouter: Router = Router(); onboardingRouter.post("", async (req: Request, res: any) => routeHandler({ diff --git a/server/src/internal/orgs/orgRouter.ts b/server/src/internal/orgs/orgRouter.ts index 1da8c9f79..c50713ec6 100644 --- a/server/src/internal/orgs/orgRouter.ts +++ b/server/src/internal/orgs/orgRouter.ts @@ -1,23 +1,38 @@ +import express, { Router } from "express"; +import Stripe from "stripe"; + +import RecaseError, { handleRequestError } from "@/utils/errorUtils.js"; +import { encryptData } from "@/utils/encryptUtils.js"; + import { ErrCode } from "@/errors/errCodes.js"; import { createClerkCli } from "@/external/clerkUtils.js"; import { checkKeyValid, createWebhookEndpoint, } from "@/external/stripe/stripeOnboardingUtils.js"; -import { encryptData } from "@/utils/encryptUtils.js"; -import RecaseError, { - handleFrontendReqError, - handleRequestError, -} from "@/utils/errorUtils.js"; -import express from "express"; -import Stripe from "stripe"; + import { OrgService } from "./OrgService.js"; import { createStripeCli } from "@/external/stripe/utils.js"; import { AppEnv } from "@autumn/shared"; import { nullish } from "@/utils/genUtils.js"; import { clearOrgCache } from "./orgUtils/clearOrgCache.js"; +import { createOrgResponse } from "./orgUtils.js"; +import { handleGetOrgMembers } from "./handlers/handleGetOrgMembers.js"; +import { handleInvite } from "./handlers/handleInvite.js"; +import { handleGetUploadUrl } from "./handlers/handleGetUploadUrl.js"; +import { handleDeleteOrg } from "./handlers/handleDeleteOrg.js"; -export const orgRouter = express.Router(); +export const orgRouter: Router = express.Router(); +orgRouter.get("/members", handleGetOrgMembers); +orgRouter.get("/upload_url", handleGetUploadUrl); +orgRouter.post("/invite", handleInvite as any); +orgRouter.delete("", handleDeleteOrg as any); + +orgRouter.delete("/delete-user", async (req: any, res) => { + res.status(200).json({ + message: "User deleted", + }); +}); orgRouter.get("", async (req: any, res) => { try { @@ -30,9 +45,7 @@ orgRouter.get("", async (req: any, res) => { const org = await OrgService.getFromReq(req); - res.status(200).json({ - org, - }); + res.status(200).json(createOrgResponse(org)); } catch (error) { handleRequestError({ req, @@ -90,8 +103,6 @@ orgRouter.post("/stripe", async (req: any, res) => { let testWebhook: Stripe.WebhookEndpoint; let liveWebhook: Stripe.WebhookEndpoint; try { - console.log(`Creating stripe webhook for URL: ${process.env.SERVER_URL}`); - testWebhook = await createWebhookEndpoint( testApiKey, AppEnv.Sandbox, @@ -128,15 +139,6 @@ orgRouter.post("/stripe", async (req: any, res) => { }, }); - // 2. Update org in Clerk - const clerkCli = createClerkCli(); - await clerkCli.organizations.updateOrganization(req.orgId, { - publicMetadata: { - stripe_connected: true, - default_currency: defaultCurrency, - }, - }); - res.status(200).json({ message: "Stripe connected", }); diff --git a/server/src/internal/orgs/orgUtils.ts b/server/src/internal/orgs/orgUtils.ts index 4516f1ace..6baba03c1 100644 --- a/server/src/internal/orgs/orgUtils.ts +++ b/server/src/internal/orgs/orgUtils.ts @@ -1,10 +1,10 @@ import { decryptData, generatePublishableKey } from "@/utils/encryptUtils.js"; import RecaseError from "@/utils/errorUtils.js"; -import { AppEnv, ErrCode, Organization } from "@autumn/shared"; -import { createSvixApp } from "@/external/svix/svixUtils.js"; +import { AppEnv, ErrCode, FrontendOrg, Organization } from "@autumn/shared"; import { createStripeCli } from "@/external/stripe/utils.js"; import { OrgService } from "./OrgService.js"; import { FeatureService } from "../features/FeatureService.js"; +import { createSvixApp } from "@/external/svix/svixHelpers.js"; export const constructOrg = ({ id, slug }: { id: string; slug: string }) => { return { @@ -23,33 +23,6 @@ export const constructOrg = ({ id, slug }: { id: string; slug: string }) => { config: {} as any, }; }; -export const initOrgSvixApps = async ({ - id, - slug, -}: { - id: string; - slug: string; -}) => { - const batchCreate = []; - batchCreate.push( - createSvixApp({ - name: `${slug}_${AppEnv.Sandbox}`, - orgId: id, - env: AppEnv.Sandbox, - }), - ); - batchCreate.push( - createSvixApp({ - name: `${slug}_${AppEnv.Live}`, - orgId: id, - env: AppEnv.Live, - }), - ); - - const [sandboxApp, liveApp] = await Promise.all(batchCreate); - - return { sandboxApp, liveApp }; -}; export const deleteStripeWebhook = async ({ org, @@ -104,13 +77,15 @@ export const initDefaultConfig = () => { }; }; -export const createOrgResponse = (org: Organization) => { +export const createOrgResponse = (org: Organization): FrontendOrg => { return { id: org.id, + name: org.name, + logo: org.logo, slug: org.slug, - default_currency: org.default_currency, - stripe_connected: org.stripe_connected, - created_at: org.created_at, + default_currency: org.default_currency || "USD", + stripe_connected: org.stripe_connected || false, + created_at: new Date(org.createdAt).getTime(), test_pkey: org.test_pkey, live_pkey: org.live_pkey, }; diff --git a/server/src/internal/products/internalProductRouter.ts b/server/src/internal/products/internalProductRouter.ts index f1c725028..29200458e 100644 --- a/server/src/internal/products/internalProductRouter.ts +++ b/server/src/internal/products/internalProductRouter.ts @@ -17,7 +17,7 @@ import { isFeaturePriceItem } from "./product-items/productItemUtils/getItemType import RecaseError, { handleFrontendReqError } from "@/utils/errorUtils.js"; import { createOrgResponse } from "../orgs/orgUtils.js"; -export const productRouter = Router({ mergeParams: true }); +export const productRouter: Router = Router({ mergeParams: true }); productRouter.get("/data", async (req: any, res) => { try { diff --git a/server/src/internal/products/pricecn/pricecnUtils.ts b/server/src/internal/products/pricecn/pricecnUtils.ts index cbb004292..b3d5544d9 100644 --- a/server/src/internal/products/pricecn/pricecnUtils.ts +++ b/server/src/internal/products/pricecn/pricecnUtils.ts @@ -1,7 +1,6 @@ import RecaseError from "@/utils/errorUtils.js"; import { nullish } from "@/utils/genUtils.js"; -import { numberWithCommas } from "tests/utils/general/numberUtils.js"; import { getFeatureName } from "@/internal/features/utils/displayUtils.js"; import { @@ -13,6 +12,7 @@ import { ErrCode, Infinite, FullCusProduct, + numberWithCommas, } from "@autumn/shared"; import { isPriceItem } from "../product-items/productItemUtils/getItemType.js"; import { isFeaturePriceItem } from "../product-items/productItemUtils/getItemType.js"; diff --git a/server/src/internal/rewards/RewardProgramService.ts b/server/src/internal/rewards/RewardProgramService.ts index 6d80efdae..67ed56410 100644 --- a/server/src/internal/rewards/RewardProgramService.ts +++ b/server/src/internal/rewards/RewardProgramService.ts @@ -252,17 +252,5 @@ export class RewardProgramService { ); return result[0].count; - - // const { data, error, count } = await sb - // .from("reward_redemptions") - // .select("*, reward_program:reward_programs!inner(*)", { count: "exact" }) - // .eq("referral_code_id", referralCodeId) - // .eq("triggered", true); - - // if (error) { - // throw error; - // } - - // return count; } } diff --git a/server/src/internal/rewards/RewardRedemptionService.ts b/server/src/internal/rewards/RewardRedemptionService.ts index fcb34aba0..184832c9c 100644 --- a/server/src/internal/rewards/RewardRedemptionService.ts +++ b/server/src/internal/rewards/RewardRedemptionService.ts @@ -72,41 +72,6 @@ export class RewardRedemptionService { }); return data as any; - - // let query = sb - // .from("reward_redemptions") - // .select( - // ` - // * - // ${ - // withRewardProgram - // ? ", reward_program:reward_programs!inner(*, reward:rewards!inner(*))" - // : "" - // } - // ${withReferralCode ? ", referral_code:referral_codes!inner(*)" : ""} - // `, - // ) - // .eq("internal_customer_id", internalCustomerId); - - // if (notNullish(internalRewardProgramId)) { - // query = query.eq("internal_reward_program_id", internalRewardProgramId); - // } - - // if (notNullish(triggered)) { - // query = query.eq("triggered", triggered); - // } - - // if (notNullish(limit)) { - // query = query.limit(limit); - // } - - // const { data, error } = await query; - - // if (error) { - // throw error; - // } - - // return data; } static async getByReferrer({ @@ -142,23 +107,6 @@ export class RewardRedemptionService { })); return processed; - - // const { data, error } = await sb - // .from("reward_redemptions") - // .select( - // ` - // *, referral_code:referral_codes!inner(*) - // ${withCustomer ? ", customer:customers!inner(*)" : ""} - // `, - // ) - // .eq("referral_code.internal_customer_id", internalCustomerId) - // .limit(limit); - - // if (error) { - // throw error; - // } - - // return data; } static async insert({ diff --git a/server/src/internal/users/userRouter.ts b/server/src/internal/users/userRouter.ts index 3b0d8c73a..9b06ba60d 100644 --- a/server/src/internal/users/userRouter.ts +++ b/server/src/internal/users/userRouter.ts @@ -1,23 +1,7 @@ -import { createSupabaseClient } from "@/external/supabaseUtils.js"; import { Router } from "express"; -export const userRouter = Router(); +export const userRouter: Router = Router(); userRouter.get("", async (req: any, res) => { - const supabase = createSupabaseClient(); - res.status(200).json({ userId: req.userId }); - // const { data, error } = await supabase - // .from("users") - // .select("id, email, initialized") - // .eq("id", req.userId) - // .single(); - - // if (error) { - // console.error("Error fetching user data:", error); - // res.status(500).json({ error: error.message }); - // return; - // } - - // res.status(200).json(data); }); diff --git a/server/src/middleware/analyticsMiddleware.ts b/server/src/middleware/analyticsMiddleware.ts index c02e9dd63..0c72b8910 100644 --- a/server/src/middleware/analyticsMiddleware.ts +++ b/server/src/middleware/analyticsMiddleware.ts @@ -8,40 +8,44 @@ const handleResFinish = (req: any, res: any, logtailContext: any) => { if (skipUrls.includes(req.originalUrl)) { return; } - req.logtailAll.info( - `[${res.statusCode}] ${req.method} ${req.originalUrl} (${req.org?.slug})`, - { - req: { - ...logtailContext, + + // Only log to logtailAll if it exists + if (req.logtailAll) { + req.logtailAll.info( + `[${res.statusCode}] ${req.method} ${req.originalUrl} (${req.org?.slug})`, + { + req: { + ...logtailContext, + }, + statusCode: res.statusCode, + res: res.locals.responseBody, }, - statusCode: res.statusCode, - res: res.locals.responseBody, - }, - ); - req.logtailAll.flush(); + ); + req.logtailAll.flush(); + } } catch (error) { console.error("Failed to log response to logtailAll"); console.error(error); } - // Post hog - let posthogUrls = ["/v1/attach"]; - if (req.posthog && posthogUrls.includes(req.originalUrl)) { - posthogCapture({ - posthog: req.posthog, - params: { - distinctId: req.org?.id, - event: `${req.method} ${req.originalUrl}`, - properties: { - authType: req.auth, - orgSlug: req.org?.slug, - statusCode: res.statusCode, - res: res.locals.responseBody, - req: req.body, - }, - }, - }); - } + // Save to PostHog + // let posthogUrls = ["/v1/attach"]; + // if (req.posthog && posthogUrls.includes(req.originalUrl)) { + // posthogCapture({ + // posthog: req.posthog, + // params: { + // distinctId: req.org?.id, + // event: `${req.method} ${req.originalUrl}`, + // properties: { + // authType: req.auth, + // orgSlug: req.org?.slug, + // statusCode: res.statusCode, + // res: res.locals.responseBody, + // req: req.body, + // }, + // }, + // }); + // } }; export const analyticsMiddleware = async (req: any, res: any, next: any) => { diff --git a/server/src/middleware/apiMiddleware.ts b/server/src/middleware/apiMiddleware.ts index ed8ac6acd..efc890580 100644 --- a/server/src/middleware/apiMiddleware.ts +++ b/server/src/middleware/apiMiddleware.ts @@ -8,6 +8,7 @@ export const verifySecretKey = async (req: any, res: any, next: any) => { const authHeader = req.headers["authorization"] || req.headers["Authorization"]; + const logger = req.logtail; const version = req.headers["x-api-version"]; if (version) { @@ -56,7 +57,6 @@ export const verifySecretKey = async (req: any, res: any, next: any) => { // Try verify via Autumn - let logger = req.logtail; try { const { valid, data } = await verifyKey({ db: req.db, diff --git a/server/src/middleware/authMiddleware.ts b/server/src/middleware/authMiddleware.ts index 29fa9998d..a0b903851 100644 --- a/server/src/middleware/authMiddleware.ts +++ b/server/src/middleware/authMiddleware.ts @@ -1,6 +1,8 @@ import { OrgService } from "@/internal/orgs/OrgService.js"; -import { AuthType } from "@autumn/shared"; +import { auth } from "@/utils/auth.js"; +import { AuthType, ErrCode } from "@autumn/shared"; import { verifyToken } from "@clerk/express"; +import { fromNodeHeaders } from "better-auth/node"; import { NextFunction } from "express"; const getTokenData = async (req: any, res: any) => { @@ -33,59 +35,73 @@ const getTokenData = async (req: any, res: any) => { }; export const withOrgAuth = async (req: any, res: any, next: NextFunction) => { - try { - let tokenData = await getTokenData(req, res); + const { logtail: logger } = req; - if (!tokenData?.org_id) { - throw new Error("token data has no org_id"); + try { + // let tokenData = await getTokenData(req, res); + const session = await auth.api.getSession({ + headers: fromNodeHeaders(req.headers), + }); + + if (!session) { + logger.info(`Unauthorized - no session found (${req.originalUrl})`); + return res + .status(401) + .json({ message: "Unauthorized - no session found" }); } - let tokenOrg = tokenData!.org as any; + const orgId = session?.session?.activeOrganizationId; + + if (!orgId) { + logger.info(`Unauthorized - no org id found`); + return res + .status(401) + .json({ message: "Unauthorized - no org id found" }); + } + + // let tokenOrg = tokenData!.org as any; let data = await OrgService.getWithFeatures({ db: req.db, - orgId: tokenOrg.id, + orgId: orgId, env: req.env, }); if (!data) { - return res.status(404).json({ message: "Org not found" }); + logger.warn(`Org ${orgId} not found in DB`); + return res + .status(500) + .json({ message: "Org not found", code: ErrCode.OrgNotFound }); } const { org, features } = data; - req.minOrg = { - id: tokenOrg?.id, - slug: tokenOrg?.slug, - }; - - req.orgId = tokenData!.org_id; - req.user = tokenData!.user; + req.user = session?.user; + req.orgId = orgId; req.org = org; req.features = features; req.authType = AuthType.Dashboard; next(); } catch (error: any) { - console.log( - // `withOrgAuth error (${req.headers["authorization"]}):`, - `(warning) clerk auth failed:`, - error?.message || error, - ); + // console.log(`(warning) clerk auth failed:`, error?.message || error); + logger.warn(`(warning) withOrgAuth failed:`, error?.message || error); res.status(401).json({ message: "Unauthorized" }); return; } }; export const withAuth = async (req: any, res: any, next: NextFunction) => { - const tokenData = await getTokenData(req, res); + const session = await auth.api.getSession({ + headers: fromNodeHeaders(req.headers), + }); - if (!tokenData) { + if (!session) { res.status(401).json({ message: "Unauthorized" }); return; } - req.userId = tokenData?.user_id; + req.userId = session?.user.id; next(); }; diff --git a/server/src/queue/QueueManager.ts b/server/src/queue/QueueManager.ts index 4c0825f44..592d866ff 100644 --- a/server/src/queue/QueueManager.ts +++ b/server/src/queue/QueueManager.ts @@ -1,6 +1,11 @@ +import "dotenv/config"; + import { Queue } from "bullmq"; import { Redis } from "ioredis"; +const BACKUP_REDIS_URL = process.env.REDIS_BACKUP_URL || process.env.REDIS_URL; +const MAIN_REDIS_URL = process.env.REDIS_URL; + export class QueueManager { private static instance: QueueManager; private queue: Queue | null = null; @@ -31,16 +36,7 @@ export class QueueManager { useBackup: boolean; keepConnection?: boolean; }) { - // 1. Connect to redis - - if (useBackup && !process.env.REDIS_BACKUP_URL) { - console.warn(`REDIS_BACKUP_URL not set, using main redis`); - useBackup = false; - } - - const redisUrl = useBackup - ? process.env.REDIS_BACKUP_URL - : process.env.REDIS_URL; + const redisUrl = useBackup ? BACKUP_REDIS_URL : MAIN_REDIS_URL; const connection = new Redis(redisUrl!, { retryStrategy: (times) => { @@ -52,7 +48,7 @@ export class QueueManager { console.log( `Redis connection error (${useBackup ? "backup" : "main"}): ${ error.message - }`, + }` ); if (!keepConnection) { @@ -95,7 +91,7 @@ export class QueueManager { console.log("2. Initializing main & backup queues"); const mainQueue = new Queue("autumn", { connection: { - url: process.env.REDIS_URL, + url: MAIN_REDIS_URL, enableOfflineQueue: false, retryStrategy: (times) => { return 5000; @@ -105,7 +101,7 @@ export class QueueManager { const backupQueue = new Queue("autumn", { connection: { - url: process.env.REDIS_BACKUP_URL, + url: BACKUP_REDIS_URL, enableOfflineQueue: false, }, }); diff --git a/server/src/utils/auth.ts b/server/src/utils/auth.ts new file mode 100644 index 000000000..12159187e --- /dev/null +++ b/server/src/utils/auth.ts @@ -0,0 +1,98 @@ +import { db } from "@/db/initDrizzle.js"; + +import { drizzleAdapter } from "better-auth/adapters/drizzle"; +import { sendInvitationEmail } from "@/internal/emails/sendInvitationEmail.js"; +import { beforeSessionCreated } from "./authUtils/beforeSessionCreated.js"; +import { betterAuth } from "better-auth"; +import { emailOTP, admin, organization } from "better-auth/plugins"; + +import sendOTPEmail from "@/internal/emails/sendOTPEmail.js"; +import { sendOnboardingEmail } from "@/internal/emails/sendOnboardingEmail.js"; +import { ADMIN_USER_IDs } from "./constants.js"; +import { afterOrgCreated } from "./authUtils/afterOrgCreated.js"; + +export const auth = betterAuth({ + database: drizzleAdapter(db, { + provider: "pg", // or "mysql", "sqlite" + }), + + databaseHooks: { + user: { + create: { + after: async (user) => { + await sendOnboardingEmail({ + name: user.name, + email: user.email, + }); + }, + }, + }, + session: { + create: { + before: beforeSessionCreated, + }, + }, + }, + user: { + deleteUser: { + enabled: true, + + sendDeleteAccountVerification: async ({ user, url, token }) => { + console.log("Delete account verification", { url, token }); + }, + }, + }, + trustedOrigins: [ + "http://localhost:3000", + "https://app.useautumn.com", + "https://*.useautumn.com", + ], + socialProviders: { + google: { + clientId: process.env.GOOGLE_CLIENT_ID!, + clientSecret: process.env.GOOGLE_CLIENT_SECRET!, + }, + }, + plugins: [ + emailOTP({ + async sendVerificationOTP({ email, otp, type }) { + // Implement the sendVerificationOTP method to send the OTP to the user's email address + + await sendOTPEmail({ + email, + otp, + }); + }, + }), + admin({ + adminUserIds: ADMIN_USER_IDs, + impersonationSessionDuration: 1000 * 60 * 60 * 24, // 1 days + }), + + organization({ + async sendInvitationEmail(data) { + const inviteLink = `${process.env.CLIENT_URL}/accept?id=${data.id}`; + await sendInvitationEmail({ + email: data.email, + orgName: data.organization.name, + inviteLink, + }); + }, + schema: { + organization: { + modelName: "organizations", + fields: { + createdAt: "createdAt", + }, + }, + }, + + organizationCreation: { + disabled: false, + afterCreate: async ({ organization }) => { + await afterOrgCreated({ org: organization as any }); + }, + }, + }), + ], +}); diff --git a/server/src/utils/authUtils/afterOrgCreated.ts b/server/src/utils/authUtils/afterOrgCreated.ts new file mode 100644 index 000000000..bcc251446 --- /dev/null +++ b/server/src/utils/authUtils/afterOrgCreated.ts @@ -0,0 +1,83 @@ +import { db } from "@/db/initDrizzle.js"; +import { OrgService } from "@/internal/orgs/OrgService.js"; +import { AppEnv } from "@autumn/shared"; +import { generatePublishableKey } from "../encryptUtils.js"; +import { createSvixApp } from "@/external/svix/svixHelpers.js"; +import { logger } from "@/external/logtail/logtailUtils.js"; +import { Organization } from "better-auth/plugins"; + +export const initOrgSvixApps = async ({ + id, + slug, +}: { + id: string; + slug: string; +}) => { + const batchCreate = []; + batchCreate.push( + createSvixApp({ + name: `${slug}_${AppEnv.Sandbox}`, + orgId: id, + env: AppEnv.Sandbox, + }), + ); + batchCreate.push( + createSvixApp({ + name: `${slug}_${AppEnv.Live}`, + orgId: id, + env: AppEnv.Live, + }), + ); + + const [sandboxApp, liveApp] = await Promise.all(batchCreate); + + return { sandboxApp, liveApp }; +}; + +export const afterOrgCreated = async ({ org }: { org: Organization }) => { + logger.info(`Org created: ${org.id} (${org.slug})`); + + const { id, slug, createdAt } = org; + + try { + await OrgService.update({ + db, + orgId: id, + updates: { + created_at: createdAt.getTime(), + }, + }); + + // 1. Create svix webhoooks + const { sandboxApp, liveApp } = await initOrgSvixApps({ + slug, + id, + }); + + await OrgService.update({ + db, + orgId: id, + updates: { + svix_config: { + sandbox_app_id: sandboxApp?.id, + live_app_id: liveApp?.id, + }, + test_pkey: generatePublishableKey(AppEnv.Sandbox), + live_pkey: generatePublishableKey(AppEnv.Live), + }, + }); + + logger.info(`Initialized resources for org ${id} (${slug})`); + } catch (error: any) { + if (error?.data && error.data.code == "23505") { + logger.error( + `Org ${id} already exists in Supabase -- skipping creationg`, + ); + return; + } + logger.error( + `Failed to insert org. Code: ${error.code}, message: ${error.message}`, + ); + return; + } +}; diff --git a/server/src/utils/authUtils/beforeSessionCreated.ts b/server/src/utils/authUtils/beforeSessionCreated.ts new file mode 100644 index 000000000..ef6ed19e9 --- /dev/null +++ b/server/src/utils/authUtils/beforeSessionCreated.ts @@ -0,0 +1,37 @@ +import { db } from "@/db/initDrizzle.js"; +import { Session } from "better-auth"; +import { member, session as sessionTable } from "@autumn/shared"; +import { eq, desc } from "drizzle-orm"; +import { createDefaultOrg } from "@/utils/authUtils/createDefaultOrg.js"; + +export const beforeSessionCreated = async (session: Session) => { + try { + console.log(`Running beforeSessionCreated for user ${session.userId}`); + + let membership = await db.query.member.findFirst({ + where: eq(member.userId, session.userId), + }); + + if (membership) { + console.log( + "Returning session with active org ID:", + membership.organizationId, + ); + return { + data: { + ...session, + activeOrganizationId: membership.organizationId, + }, + }; + } + + const orgId = await createDefaultOrg({ session }); + + return { + data: { + ...session, + activeOrganizationId: orgId, + }, + }; + } catch (error) {} +}; diff --git a/server/src/utils/authUtils/createDefaultOrg.ts b/server/src/utils/authUtils/createDefaultOrg.ts new file mode 100644 index 000000000..fbce9697d --- /dev/null +++ b/server/src/utils/authUtils/createDefaultOrg.ts @@ -0,0 +1,64 @@ +import { db } from "@/db/initDrizzle.js"; +import { auth } from "@/utils/auth.js"; +import { Session } from "better-auth"; +import { eq } from "drizzle-orm"; +import { invitation, user as userTable } from "@autumn/shared"; +import { slugify } from "@/utils/genUtils.js"; +import { Organization } from "better-auth/plugins/organization"; +import { and } from "drizzle-orm"; + +export const createDefaultOrg = async ({ + session, +}: { + session: Session; +}): Promise
{copied ? (
(
@@ -89,6 +92,7 @@ const Button = React.forwardRef(
tooltipContent,
children,
disableStartIcon = false,
+ shimmer = false,
...props
},
ref,
@@ -100,6 +104,7 @@ const Button = React.forwardRef(
className={cn(
buttonVariants({ variant, size, className }),
isIcon && `w-${dim} h-${dim} p-0`,
+ shimmer && "shimmer",
)}
ref={ref}
onClick={(e) => {
@@ -110,10 +115,13 @@ const Button = React.forwardRef(
}
props.onClick?.(e);
}}
+ disabled={isLoading || props.disabled || shimmer}
>
{isLoading && ,
React.ComponentPropsWithoutRef & {
inset?: boolean;
+ withIcon?: boolean;
}
->(({ className, inset, children, ...props }, ref) => (
+>(({ className, inset, children, withIcon = true, ...props }, ref) => (
{children}
-
));
DropdownMenuSubTrigger.displayName =
@@ -49,7 +50,7 @@ const DropdownMenuSubContent = React.forwardRef<
ref={ref}
className={cn(
"z-50 min-w-[8rem] overflow-hidden rounded-md border border-zinc-200 bg-white p-1 text-zinc-950 shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-zinc-800 dark:bg-zinc-950 dark:text-zinc-50",
- className
+ className,
)}
{...props}
/>
@@ -69,7 +70,7 @@ const DropdownMenuContent = React.forwardRef<
className={cn(
"z-50 min-w-[8rem] overflow-hidden rounded-md border border-zinc-200 bg-white p-1 text-zinc-950 shadow-md dark:border-zinc-800 dark:bg-zinc-950 dark:text-zinc-50",
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
- className
+ className,
)}
{...props}
/>
@@ -82,18 +83,19 @@ const DropdownMenuItem = React.forwardRef<
React.ComponentPropsWithoutRef & {
inset?: boolean;
isLoading?: boolean;
+ shimmer?: boolean;
}
->(({ className, inset, isLoading, ...props }, ref) => (
+>(({ className, inset, shimmer = false, isLoading, ...props }, ref) => (
svg]:size-4 [&>svg]:shrink-0 dark:focus:bg-zinc-800 dark:focus:text-zinc-50
-
- hover:bg-zinc-100
+ hover:bg-zinc-100 ${shimmer ? "shimmer" : ""}
`,
inset && "pl-8",
- className
+ className,
)}
+ disabled={shimmer || isLoading}
{...props}
>
{isLoading ? (
@@ -116,7 +118,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-zinc-100 focus:text-zinc-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-zinc-800 dark:focus:text-zinc-50",
- className
+ className,
)}
checked={checked}
{...props}
@@ -140,7 +142,7 @@ const DropdownMenuRadioItem = React.forwardRef<
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-zinc-100 focus:text-zinc-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-zinc-800 dark:focus:text-zinc-50",
- className
+ className,
)}
{...props}
>
@@ -165,7 +167,7 @@ const DropdownMenuLabel = React.forwardRef<
className={cn(
"px-2 py-1.5 text-sm font-semibold",
inset && "pl-8",
- className
+ className,
)}
{...props}
/>
diff --git a/vite/src/components/ui/input-otp.tsx b/vite/src/components/ui/input-otp.tsx
new file mode 100644
index 000000000..310175285
--- /dev/null
+++ b/vite/src/components/ui/input-otp.tsx
@@ -0,0 +1,75 @@
+import * as React from "react"
+import { OTPInput, OTPInputContext } from "input-otp"
+import { MinusIcon } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+function InputOTP({
+ className,
+ containerClassName,
+ ...props
+}: React.ComponentProps & {
+ containerClassName?: string
+}) {
+ return (
+ (
const handleFocus = () => setIsFocused(true);
const handleBlur = () => setIsFocused(false);
+ const gradientBg =
+ "bg-[linear-gradient(180deg,white,theme(colors.stone.100))]";
return (
<>
{hasAdornment ? (
-
{addButton && {title}
+ {title && ( ++ {title} +
+ )} + {titleComponent}{addButton}
}
+ {char}
+ {hasFakeCaret && (
+
+ )
+}
+
+function InputOTPSeparator({ ...props }: React.ComponentProps<"div">) {
+ return (
+
+
+
+ )}
+
+
+ )
+}
+
+export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator }
diff --git a/vite/src/components/ui/input.tsx b/vite/src/components/ui/input.tsx
index 5d14861d3..e5db88144 100644
--- a/vite/src/components/ui/input.tsx
+++ b/vite/src/components/ui/input.tsx
@@ -16,31 +16,34 @@ const Input = React.forwardRef
(
(
)}
);
- // return (
- //
- // );
- }
+ },
);
Input.displayName = "Input";
diff --git a/vite/src/components/ui/select.tsx b/vite/src/components/ui/select.tsx
index e312b3fb8..e425e6328 100644
--- a/vite/src/components/ui/select.tsx
+++ b/vite/src/components/ui/select.tsx
@@ -42,15 +42,13 @@ function SelectTrigger({
`flex w-full items-center justify-between whitespace-nowrap rounded-md border border-zinc-200 bg-white px-3 py-2 text-sm shadow-sm ring-offset-white placeholder:text-t3 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 dark:border-zinc-800 dark:ring-offset-zinc-950 dark:placeholder:text-zinc-400 dark:focus:ring-zinc-300
h-8
- data-[state=open]:border-primary data-[state=open]:shadow-[0_0_2px_1px_rgba(139,92,246,0.25)]
+ data-[state=open]:border-focus data-[state=open]:shadow-focus
focus:ring-0
-
data-[placeholder]:text-t3
-
transition-colors duration-100
p-2
`,
- className
+ className,
)}
{...props}
>
@@ -88,7 +86,7 @@ function SelectTrigger({
`flex w-full items-center justify-between whitespace-nowrap rounded-md border border-zinc-200 bg-white px-3 py-2 text-sm shadow-sm ring-offset-white placeholder:text-t3 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 dark:border-zinc-800 dark:ring-offset-zinc-950 dark:placeholder:text-zinc-400 dark:focus:ring-zinc-300
h-8
-data-[state=open]:border-primary data-[state=open]:shadow-[0_0_2px_1px_rgba(139,92,246,0.25)]
+data-[state=open]:border-focus data-[state=open]:shadow-focus
focus:ring-0
data-[placeholder]:text-t3
@@ -96,7 +94,7 @@ data-[placeholder]:text-t3
transition-colors duration-100
p-2
`,
- className
+ className,
)}
{...props}
>
@@ -122,7 +120,7 @@ function SelectContent({
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
position === "popper" &&
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
- className
+ className,
)}
position={position}
{...props}
@@ -132,7 +130,7 @@ function SelectContent({
className={cn(
"p-1",
position === "popper" &&
- "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1"
+ "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",
)}
>
{children}
@@ -166,7 +164,7 @@ function SelectItem({
data-slot="select-item"
className={cn(
"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
- className
+ className,
)}
{...props}
>
@@ -202,7 +200,7 @@ function SelectScrollUpButton({
data-slot="select-scroll-up-button"
className={cn(
"flex cursor-default items-center justify-center py-1",
- className
+ className,
)}
{...props}
>
@@ -220,7 +218,7 @@ function SelectScrollDownButton({
data-slot="select-scroll-down-button"
className={cn(
"flex cursor-default items-center justify-center py-1",
- className
+ className,
)}
{...props}
>
diff --git a/vite/src/components/ui/skeleton.tsx b/vite/src/components/ui/skeleton.tsx
new file mode 100644
index 000000000..32ea0ef7f
--- /dev/null
+++ b/vite/src/components/ui/skeleton.tsx
@@ -0,0 +1,13 @@
+import { cn } from "@/lib/utils"
+
+function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
+ return (
+
+ )
+}
+
+export { Skeleton }
diff --git a/vite/src/hooks/useOrg.tsx b/vite/src/hooks/useOrg.tsx
new file mode 100644
index 000000000..608dbd520
--- /dev/null
+++ b/vite/src/hooks/useOrg.tsx
@@ -0,0 +1,28 @@
+import {
+ authClient,
+ useListOrganizations,
+ useSession,
+} from "@/lib/auth-client";
+import { useAxiosSWR } from "@/services/useAxiosSwr";
+import { FrontendOrg } from "@autumn/shared";
+import { useEffect } from "react";
+
+export const useOrg = () => {
+ const { data, isLoading, error, mutate } = useAxiosSWR({
+ url: "/organization",
+ });
+
+ // const { data: orgList } = useListOrganizations();
+
+ // useEffect(() => {
+ // if (!data && orgList?.length === 1) {
+ // authClient.organization.setActive({
+ // organizationId: orgList[0].id,
+ // });
+
+ // mutate();
+ // }
+ // }, [data, orgList]);
+
+ return { org: data as FrontendOrg, isLoading, error, mutate };
+};
diff --git a/vite/src/hooks/useOrgId.tsx b/vite/src/hooks/useOrgId.tsx
new file mode 100644
index 000000000..5fd184c8c
--- /dev/null
+++ b/vite/src/hooks/useOrgId.tsx
@@ -0,0 +1,46 @@
+import {
+ authClient,
+ useListOrganizations,
+ useSession,
+} from "@/lib/auth-client";
+import { useAxiosSWR } from "@/services/useAxiosSwr";
+import { FrontendOrg } from "@autumn/shared";
+import { useEffect, useState } from "react";
+
+export const useOrgId = () => {
+ const { data: session, isPending: sessionPending } = useSession();
+ const { data: organizations, isPending: orgsPending } =
+ useListOrganizations();
+
+ const [orgId, setOrgId] = useState(null);
+
+ const setFirstOrg = async () => {
+ if (organizations?.length === 1) {
+ await authClient.organization.setActive({
+ organizationId: organizations[0].id,
+ });
+ }
+ };
+
+ useEffect(() => {
+ const activeId = session?.session.activeOrganizationId;
+ if (activeId) {
+ setOrgId(activeId);
+ }
+ }, [session]);
+
+ // useEffect(() => {
+ // if (!orgId && organizations?.length && organizations.length > 0) {
+ // setFirstOrg();
+ // }
+ // }, [session, organizations]);
+
+ useEffect(() => {
+ console.log("OrgId", orgId);
+ }, [orgId]);
+
+ return {
+ orgId,
+ isLoading: sessionPending,
+ };
+};
diff --git a/vite/src/hooks/useSessionClaims.tsx b/vite/src/hooks/useSessionClaims.tsx
deleted file mode 100644
index b37177106..000000000
--- a/vite/src/hooks/useSessionClaims.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { useOrganization, useSession } from "@clerk/clerk-react";
-import { useEffect } from "react";
-
-export const useSessionClaims = () => {
- const { isLoaded, session } = useSession();
- const { isLoaded: isOrgLoaded, organization } = useOrganization();
- useEffect(() => {}, [isOrgLoaded, isLoaded]);
-
- if (!isLoaded) {
- return { isLoaded: false, claims: null };
- }
-
- return { isLoaded: true, claims: session?.lastActiveToken?.jwt?.claims };
-};
diff --git a/vite/src/hooks/useTab.tsx b/vite/src/hooks/useTab.tsx
index b5f6b084f..232388e25 100644
--- a/vite/src/hooks/useTab.tsx
+++ b/vite/src/hooks/useTab.tsx
@@ -2,6 +2,9 @@ import { useLocation } from "react-router";
export const useTab = () => {
const { pathname } = useLocation();
+ if (pathname.startsWith("/admin") || pathname.startsWith("/sandbox/admin")) {
+ return "admin";
+ }
if (
pathname.startsWith("/features") ||
pathname.startsWith("/sandbox/features")
diff --git a/vite/src/index.css b/vite/src/index.css
index 40c64975e..f3edd64ca 100644
--- a/vite/src/index.css
+++ b/vite/src/index.css
@@ -238,6 +238,9 @@ button:focus-visible {
--color-code-tabs: #2d2d2d;
--color-code-bg: #1e1e1e;
--color-code-tabs-active: #3c3c3c;
+
+ --shadow-focus: 0 0 3px 1.5px rgba(139, 92, 246, 0.4);
+ --color-focus: rgba(139, 92, 246, 0.95);
}
/*
@@ -255,3 +258,65 @@ button:focus-visible {
button {
cursor: pointer;
}
+
+.shimmer {
+ position: relative;
+ overflow: hidden;
+ /* background-color: #e5e7eb; */
+}
+.shimmer::after {
+ content: "";
+ position: absolute;
+ top: 0;
+ left: -150%;
+ width: 100%;
+ height: 100%;
+ background: linear-gradient(
+ 90deg,
+ transparent,
+ rgba(255, 255, 255, 0.6),
+ transparent
+ );
+ animation: shimmer 1.5s infinite;
+}
+@keyframes shimmer {
+ 100% {
+ left: 150%;
+ }
+}
+
+.shimmer-hover {
+ position: relative;
+ overflow: hidden;
+}
+.shimmer-hover::after {
+ content: "";
+ position: absolute;
+ top: 0;
+ left: -150%;
+ width: 100%;
+ height: 100%;
+ background: linear-gradient(
+ 90deg,
+ transparent,
+ rgba(255, 255, 255, 0.4),
+ transparent
+ );
+ pointer-events: none;
+ opacity: 0;
+ transition: opacity 0.2s;
+}
+.shimmer-hover:hover::after {
+ animation: shimmer-once 0.8s;
+ opacity: 1;
+}
+@keyframes shimmer-once {
+ 0% {
+ left: -150%;
+ opacity: 1;
+ }
+ 100% {
+ left: 150%;
+ opacity: 1;
+ }
+}
diff --git a/vite/src/lib/auth-client.ts b/vite/src/lib/auth-client.ts
new file mode 100644
index 000000000..162c2a299
--- /dev/null
+++ b/vite/src/lib/auth-client.ts
@@ -0,0 +1,20 @@
+import { createAuthClient } from "better-auth/react";
+import { adminClient, emailOTPClient } from "better-auth/client/plugins";
+import { organizationClient } from "better-auth/client/plugins";
+
+export const authClient = createAuthClient({
+ baseURL: "http://localhost:8080",
+ plugins: [emailOTPClient(), organizationClient(), adminClient()],
+});
+
+export const {
+ useSession,
+ signIn,
+ signUp,
+ signOut,
+ deleteUser,
+ useListOrganizations,
+} = createAuthClient({
+ baseURL: "http://localhost:8080",
+ plugins: [emailOTPClient(), organizationClient(), adminClient()],
+});
diff --git a/vite/src/main.tsx b/vite/src/main.tsx
index a10db9b00..be7032f0f 100644
--- a/vite/src/main.tsx
+++ b/vite/src/main.tsx
@@ -1,36 +1,27 @@
+import "./index.css";
+import App from "./App";
+
import { StrictMode } from "react";
import { createRoot } from "react-dom/client";
-import "./index.css";
-import { ClerkProvider } from "@clerk/clerk-react";
-import App from "./App";
-import posthog from "posthog-js";
import { PostHogProvider } from "posthog-js/react";
-import { AutumnProvider } from "autumn-js/react";
-
-const PUBLISHABLE_KEY = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;
-if (!PUBLISHABLE_KEY) {
- throw new Error("Add your Clerk Publishable Key to the .env file");
-}
createRoot(document.getElementById("root")!).render(
-
- {process.env.NODE_ENV === "development" ? (
+ {process.env.NODE_ENV === "development" ? (
+
-
- )}
-
+
+ )}
,
);
diff --git a/vite/src/services/products/RewardService.tsx b/vite/src/services/products/RewardService.tsx
index 589dfabe7..4ffd34c5b 100644
--- a/vite/src/services/products/RewardService.tsx
+++ b/vite/src/services/products/RewardService.tsx
@@ -1,6 +1,5 @@
import { Reward, CreateReward } from "@autumn/shared";
-import { SupabaseClient } from "@supabase/supabase-js";
import { AxiosInstance } from "axios";
export class RewardService {
diff --git a/vite/src/services/useAxiosInstance.tsx b/vite/src/services/useAxiosInstance.tsx
index f7504dd45..1a3ddf587 100644
--- a/vite/src/services/useAxiosInstance.tsx
+++ b/vite/src/services/useAxiosInstance.tsx
@@ -1,6 +1,5 @@
import axios from "axios";
import { endpoint } from "@/utils/constants";
-import { useAuth } from "@clerk/clerk-react";
import { AppEnv } from "@autumn/shared";
import { useEnv } from "@/utils/envUtils";
const defaultParams = {
@@ -17,30 +16,50 @@ export function useAxiosInstance(params?: { env?: AppEnv; isAuth?: boolean }) {
const axiosInstance = axios.create({
baseURL: endpoint,
+ withCredentials: true,
});
- const { getToken } = useAuth();
+ axiosInstance.interceptors.request.use(
+ async (config: any) => {
+ config.headers["app_env"] = trueEnv;
+ config.headers["x-api-version"] = "1.2";
+ // const token = await getToken({
+ // template: "custom_template",
+ // });
- if (finalParams.isAuth) {
- axiosInstance.interceptors.request.use(
- async (config: any) => {
- const token = await getToken({
- template: "custom_template",
- });
+ // if (token) {
+ // // config.headers["Authorization"] = `Bearer ${token}`;
+ // config.headers["app_env"] = trueEnv;
+ // config.headers["x-api-version"] = "1.2";
+ // }
- if (token) {
- config.headers["Authorization"] = `Bearer ${token}`;
- config.headers["app_env"] = trueEnv;
- config.headers["x-api-version"] = "1.2";
- }
+ return config;
+ },
+ (error: any) => {
+ return Promise.reject(error);
+ },
+ );
- return config;
- },
- (error: any) => {
- return Promise.reject(error);
- },
- );
- }
+ // if (finalParams.isAuth) {
+ // axiosInstance.interceptors.request.use(
+ // async (config: any) => {
+ // const token = await getToken({
+ // template: "custom_template",
+ // });
+
+ // if (token) {
+ // config.headers["Authorization"] = `Bearer ${token}`;
+ // config.headers["app_env"] = trueEnv;
+ // config.headers["x-api-version"] = "1.2";
+ // }
+
+ // return config;
+ // },
+ // (error: any) => {
+ // return Promise.reject(error);
+ // },
+ // );
+ // }
return axiosInstance;
}
diff --git a/vite/src/services/useAxiosSwr.tsx b/vite/src/services/useAxiosSwr.tsx
index ea173b4c0..e2c2ba8e5 100644
--- a/vite/src/services/useAxiosSwr.tsx
+++ b/vite/src/services/useAxiosSwr.tsx
@@ -11,12 +11,12 @@ export function useAxiosSWR({
enabled = true,
}: {
url: string;
- env: AppEnv;
+ env?: AppEnv;
withAuth?: boolean;
options?: SWRConfiguration;
enabled?: boolean;
}) {
- const axiosInstance = useAxiosInstance({ env, isAuth: withAuth });
+ const axiosInstance = useAxiosInstance({ isAuth: withAuth });
const fetcher = async (url: string) => {
const res = await axiosInstance.get(url);
diff --git a/vite/src/utils/formatUtils/formatDateUtils.ts b/vite/src/utils/formatUtils/formatDateUtils.ts
index c13463ca8..42e2dd8dc 100644
--- a/vite/src/utils/formatUtils/formatDateUtils.ts
+++ b/vite/src/utils/formatUtils/formatDateUtils.ts
@@ -1,5 +1,9 @@
import { format } from "date-fns";
+export const formatDateStr = (date: Date | string) => {
+ return format(new Date(date), "dd MMM yyyy");
+};
+
export const formatTimestamp = (timestamp: number | null | undefined) => {
if (!timestamp) return "";
return format(new Date(timestamp), "MM/dd/yyyy");
diff --git a/vite/src/utils/formatUtils/formatTextUtils.ts b/vite/src/utils/formatUtils/formatTextUtils.ts
index be1197b79..c40fb7d06 100644
--- a/vite/src/utils/formatUtils/formatTextUtils.ts
+++ b/vite/src/utils/formatUtils/formatTextUtils.ts
@@ -11,10 +11,13 @@ export const keyToTitleFirstCaps = (key: string) => {
return res.replace(/_/g, " ");
};
-export const slugify = (text: string) => {
+export const slugify = (
+ text: string,
+ type: "underscore" | "dash" = "underscore",
+) => {
return text
.toLowerCase()
- .replace(/ /g, "_")
+ .replace(/ /g, type == "underscore" ? "_" : "-")
.replace(/[^\w\s-]/g, "");
};
diff --git a/vite/src/utils/orgUtils.ts b/vite/src/utils/orgUtils.ts
new file mode 100644
index 000000000..e49637ffa
--- /dev/null
+++ b/vite/src/utils/orgUtils.ts
@@ -0,0 +1,3 @@
+export const getOrgLogoUrl = (orgId: string) => {
+ return `${import.meta.env.VITE_SUPABASE_URL}/storage/v1/object/public/autumn/logo/${orgId}`;
+};
diff --git a/vite/src/views/DefaultView.tsx b/vite/src/views/DefaultView.tsx
index 09b9e414a..46731a928 100644
--- a/vite/src/views/DefaultView.tsx
+++ b/vite/src/views/DefaultView.tsx
@@ -1,5 +1,3 @@
-import { RedirectToSignIn, useOrganization, useUser } from "@clerk/clerk-react";
-import LoadingScreen from "./general/LoadingScreen";
import { Link, Navigate, useLocation } from "react-router";
import ErrorScreen from "./general/ErrorScreen";
@@ -18,11 +16,4 @@ export const DefaultView = () => {
);
-
- // By default, will come here
- // 2. if user, redirect to customers
- // return [];
+ title: string;
+}) => {
+ const [search, setSearch] = useState("");
+ const [after, setAfter] = useState(undefined);
+ const [before, setBefore] = useState(undefined);
+ const [sortKey, setSortKey] = useState("createdAt");
+ const [sortOrder, setSortOrder] = useState<"asc" | "desc">("desc");
+ const [page, setPage] = useState(1);
+
+ // Build query string for params
+ const params = new URLSearchParams();
+ if (search) params.append("search", search);
+ if (after) params.append("after", after);
+ if (before) params.append("before", before);
+ if (sortKey) params.append("sortKey", sortKey);
+ if (sortOrder) params.append("sortOrder", sortOrder);
+ const url = `${path}${params.toString() ? `?${params.toString()}` : ""}`;
+
+ const { data, isLoading } = useAxiosSWR({
+ url,
+ });
+
+ const rows = data?.rows || [];
+
+ const pageInfo = {
+ hasNextPage: data?.hasNextPage || false,
+ hasPrevPage: rows.length !== 0,
+ lastItem: `${rows[rows.length - 1]?.id},${rows[rows.length - 1]?.createdAt}`,
+ firstItem: `${rows[0]?.id},${rows[0]?.createdAt}`,
+ page,
+ };
+
+ const handleSearch = useCallback((value: string) => {
+ setSearch(value);
+ setAfter(undefined);
+ setBefore(undefined);
+ setPage(1);
+ }, []);
+
+ const handlePaginate = useCallback(
+ (direction: "next" | "prev") => {
+ if (direction === "next") {
+ setAfter(pageInfo.lastItem);
+ setBefore(undefined);
+ } else {
+ setBefore(pageInfo.firstItem);
+ setAfter(undefined);
+ }
+ setPage((p) => (direction === "next" ? p + 1 : Math.max(1, p - 1)));
+ },
+ [pageInfo],
+ );
+
+ const handleSort = useCallback((key: string, order: "asc" | "desc") => {
+ setSortKey(key);
+ setSortOrder(order);
+ setAfter(undefined);
+ setBefore(undefined);
+ setPage(1);
+ }, []);
+
+ return (
+ {
+ columns: ColumnDef[];
+ data: TData[];
+ isLoading: boolean;
+ pageInfo: {
+ hasNextPage: boolean;
+ hasPrevPage: boolean;
+ nextCursor?: string;
+ prevCursor?: string;
+ page: number;
+ };
+ onSearch: (search: string) => void;
+ onPaginate: (direction: "next" | "prev") => void;
+ onSort: (sortKey: string, sortOrder: "asc" | "desc") => void;
+ sortKey: string;
+ sortOrder: "asc" | "desc";
+}
+
+export function DataTable({
+ columns,
+ data,
+ isLoading,
+ pageInfo,
+ onSearch,
+ onPaginate,
+ onSort,
+}: DataTableProps) {
+ const [search, setSearch] = React.useState("");
+ const [sorting, setSorting] = React.useState([]);
+
+ const debounceRef = React.useRef(null);
+
+ React.useEffect(() => {
+ if (debounceRef.current) clearTimeout(debounceRef.current);
+ debounceRef.current = setTimeout(() => {
+ onSearch(search);
+ }, 300);
+ return () => {
+ if (debounceRef.current) clearTimeout(debounceRef.current);
+ };
+ }, [search, onSearch]);
+
+ React.useEffect(() => {
+ if (sorting.length > 0) {
+ const sort = sorting[0];
+ onSort(sort.id, sort.desc ? "desc" : "asc");
+ }
+ }, [sorting, onSort]);
+
+ const table = useReactTable({
+ data,
+ columns,
+ getCoreRowModel: getCoreRowModel(),
+ getSortedRowModel: getSortedRowModel(),
+ state: {
+ sorting,
+ },
+ onSortingChange: setSorting,
+ manualSorting: true,
+ });
+
+ return (
+ {children} ;
+};
diff --git a/vite/src/views/admin/hooks/useAdmin.tsx b/vite/src/views/admin/hooks/useAdmin.tsx
new file mode 100644
index 000000000..4768aa306
--- /dev/null
+++ b/vite/src/views/admin/hooks/useAdmin.tsx
@@ -0,0 +1,19 @@
+import { useSession } from "@/lib/auth-client";
+import { notNullish } from "@/utils/genUtils";
+import { useEffect, useState } from "react";
+
+export const useAdmin = () => {
+ const { data, isPending } = useSession();
+ const [isAdmin, setIsAdmin] = useState(false);
+
+ useEffect(() => {
+ if (
+ data?.user?.role === "admin" ||
+ notNullish(data?.session.impersonatedBy)
+ ) {
+ setIsAdmin(true);
+ }
+ }, [data]);
+
+ return { isAdmin, isPending };
+};
diff --git a/vite/src/views/admin/orgColumns.tsx b/vite/src/views/admin/orgColumns.tsx
new file mode 100644
index 000000000..f704945de
--- /dev/null
+++ b/vite/src/views/admin/orgColumns.tsx
@@ -0,0 +1,82 @@
+import { ColumnDef, Row } from "@tanstack/react-table";
+import CopyButton from "@/components/general/CopyButton";
+import { format } from "date-fns";
+
+export type Org = {
+ id: string;
+ name: string;
+ slug: string;
+ createdAt: string;
+ users: string[];
+};
+
+// Helper to add width and canCopy to columns
+interface ExtraColumnOptions {
+ width?: string | number;
+ canCopy?: boolean;
+}
+
+type OrgColumnDef = ColumnDef & ExtraColumnOptions;
+
+export const columns: OrgColumnDef[] = [
+ {
+ accessorKey: "id",
+ header: "ID",
+ width: 60,
+ canCopy: true,
+ cell: ({ row }: { row: Row }) => {
+ const value = row.getValue("id") as string;
+ return (
+ }) => {
+ const value = row.getValue("name") as string;
+ return }) => {
+ const value = row.getValue("slug") as string;
+ return (
+
+ {value}
+
+ );
+ },
+ },
+ {
+ accessorKey: "createdAt",
+ header: "Created At",
+ width: 150,
+ cell: ({ row }: { row: Row }) => {
+ const value = row.getValue("createdAt");
+ return (
+
+ {format(new Date(value as string), "dd MMM hh:mm")}
+
+ );
+ },
+ },
+ {
+ accessorKey: "users",
+ header: "Users",
+ width: "100%",
+ cell: ({ row }: { row: Row }) => {
+ const value = row.getValue("users");
+ return {(value as string[]).join(", ")};
+ },
+ },
+];
diff --git a/vite/src/views/admin/userColumns.tsx b/vite/src/views/admin/userColumns.tsx
new file mode 100644
index 000000000..2b06cb4f4
--- /dev/null
+++ b/vite/src/views/admin/userColumns.tsx
@@ -0,0 +1,104 @@
+import { ColumnDef, Row } from "@tanstack/react-table";
+import { Button } from "@/components/ui/button";
+import CopyButton from "@/components/general/CopyButton";
+import { format } from "date-fns";
+import { authClient } from "@/lib/auth-client";
+import { toast } from "sonner";
+
+export type User = {
+ id: string;
+ name: string;
+ email: string;
+ createdAt: string;
+ lastSignedIn: string;
+};
+
+// Helper to add width and canCopy to columns
+interface ExtraColumnOptions {
+ width?: string | number;
+ canCopy?: boolean;
+}
+
+type UserColumnDef = ColumnDef & ExtraColumnOptions;
+
+export const columns: UserColumnDef[] = [
+ {
+ accessorKey: "id",
+ header: "ID",
+ width: 60,
+ canCopy: true,
+ cell: ({ row }: { row: Row }) => {
+ const value = row.getValue("id") as string;
+ return (
+ }) => {
+ const value = row.getValue("name") as string;
+ return }) => {
+ const value = row.getValue("email") as string;
+ return (
+
+ {value}
+
+ );
+ },
+ },
+ {
+ accessorKey: "createdAt",
+ header: "Created At",
+ width: 150,
+ cell: ({ row }: { row: Row }) => {
+ const value = row.getValue("createdAt");
+ return (
+
+ {format(new Date(value as string), "dd MMM hh:mm")}
+
+ );
+ },
+ },
+
+ {
+ id: "impersonate",
+ header: "Impersonate",
+ width: "100%",
+ cell: ({ row }: { row: Row }) => (
+
+ ),
+ enableSorting: false,
+ enableHiding: false,
+ },
+];
diff --git a/vite/src/views/auth/AcceptInvitation.tsx b/vite/src/views/auth/AcceptInvitation.tsx
new file mode 100644
index 000000000..43c897d33
--- /dev/null
+++ b/vite/src/views/auth/AcceptInvitation.tsx
@@ -0,0 +1,22 @@
+import { useSession } from "@/lib/auth-client";
+import LoadingScreen from "../general/LoadingScreen";
+import { useNavigate } from "react-router";
+
+export const AcceptInvitation = () => {
+ const { data, isPending } = useSession();
+ const navigate = useNavigate();
+
+ if (isPending)
+ return (
+ ([]);
const [searchQuery, setSearchQuery] = useState("");
const [open, setOpen] = useState(false);
+ const { org } = useOrg();
const filteredProducts = products.filter((product: Product) => {
if (product.is_add_on && !searchQuery) return true;
@@ -52,15 +54,14 @@ function AddProduct() {
const navigate = useNavigate();
const handleAddProduct = async (productId: string, setLoading: any) => {
- const { data } = await OrgService.get(axiosInstance);
+ let stripeConnected = org?.stripe_connected;
- if (!data.org) {
- toast.error("Something went wrong...please try again later");
- setLoading(false);
- return;
+ if (!stripeConnected) {
+ const { data: org } = await OrgService.get(axiosInstance);
+ stripeConnected = org?.stripe_connected;
}
- if (!data.org.stripe_connected) {
+ if (!stripeConnected) {
toast.error("Connect to Stripe to add products to customers");
const redirectUrl = getRedirectUrl(`/customers/${customer.id}`, env);
navigateTo(`/integrations/stripe?redirect=${redirectUrl}`, navigate, env);
diff --git a/vite/src/views/main-sidebar/EnvDropdown.tsx b/vite/src/views/main-sidebar/EnvDropdown.tsx
index acfa9dff0..757d46479 100644
--- a/vite/src/views/main-sidebar/EnvDropdown.tsx
+++ b/vite/src/views/main-sidebar/EnvDropdown.tsx
@@ -13,20 +13,12 @@ import { envToPath } from "@/utils/genUtils";
import { useLocation } from "react-router";
import { useSidebarContext } from "./SidebarContext";
import { cn } from "@/lib/utils";
-import {
- Check,
- ChevronDown,
- ChevronLeft,
- ChevronRight,
- FlaskConical,
- Sailboat,
- TestTube,
-} from "lucide-react";
+import { Check } from "lucide-react";
import { useState } from "react";
+import { ExpandedEnvTrigger } from "./env-dropdown/ExpandedEnvTrigger";
export const EnvDropdown = ({ env }: { env: AppEnv }) => {
const location = useLocation();
- const expanded = true;
const { state } = useSidebarContext();
@@ -38,66 +30,27 @@ export const EnvDropdown = ({ env }: { env: AppEnv }) => {
}
};
- let [isHovered, setIsHovered] = useState(false);
- let [open, setOpen] = useState(false);
+ const [isHovered, setIsHovered] = useState(false);
+ const [open, setOpen] = useState(false);
const envText = env === AppEnv.Sandbox ? "Sandbox" : "Production";
+ const expanded = state == "expanded";
return (
+ {
+ try {
+ setLoading(true);
+ await authClient.signOut();
+ await navigate("/sign-in");
+ } catch (error) {
+ console.error("Error signing out:", error);
+ } finally {
+ setLoading(false);
+ }
+ }}
+ >
+
+ {/* {
+ await authClient.deleteUser({
+ callbackURL: "http://localhost:3000/sign-in",
+ });
+ }}
+ >
+ */}
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/components/ManageOrg.tsx b/vite/src/views/main-sidebar/components/ManageOrg.tsx
new file mode 100644
index 000000000..3008d462e
--- /dev/null
+++ b/vite/src/views/main-sidebar/components/ManageOrg.tsx
@@ -0,0 +1,79 @@
+import FieldLabel from "@/components/general/modal-components/FieldLabel";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+
+import { OrgMembersList } from "../org-dropdown/manage-org/OrgMembersList";
+import { OrgInvitesList } from "../org-dropdown/manage-org/OrgInvitesList";
+import { PageSectionHeader } from "@/components/general/PageSectionHeader";
+import { InvitePopover } from "../org-dropdown/manage-org/InvitePopover";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { OrgDetails } from "./OrgDetails";
+
+export const ManageOrg = ({
+ open,
+ setOpen,
+}: {
+ open: boolean;
+ setOpen: (open: boolean) => void;
+}) => {
+ return (
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/components/OrgDetails.tsx b/vite/src/views/main-sidebar/components/OrgDetails.tsx
new file mode 100644
index 000000000..4a667f33f
--- /dev/null
+++ b/vite/src/views/main-sidebar/components/OrgDetails.tsx
@@ -0,0 +1,106 @@
+import FieldLabel from "@/components/general/modal-components/FieldLabel";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { useOrg } from "@/hooks/useOrg";
+import { authClient } from "@/lib/auth-client";
+import { useEffect, useMemo, useState } from "react";
+import { toast } from "sonner";
+import OrgLogoUploader from "@/views/main-sidebar/org-dropdown/manage-org/OrgLogoUploader";
+import { Separator } from "@/components/ui/separator";
+import { DeleteOrgPopover } from "../org-dropdown/manage-org/DeleteOrgPopover";
+
+export const OrgDetails = () => {
+ const { org, mutate } = useOrg();
+
+ const [inputs, setInputs] = useState({
+ name: org?.name,
+ slug: org?.slug,
+ });
+
+ const [saving, setSaving] = useState(false);
+
+ const canSave = useMemo(() => {
+ return inputs.name !== org?.name || inputs.slug !== org?.slug;
+ }, [inputs, org]);
+
+ const handleSave = async () => {
+ try {
+ setSaving(true);
+ const { data, error } = await authClient.organization.update({
+ data: {
+ name: inputs.name,
+ slug: inputs.slug,
+ },
+ organizationId: org.id,
+ });
+
+ if (error) {
+ toast.error(error.message || "Failed to update organization");
+ return;
+ }
+
+ await mutate();
+
+ toast.success("Successfully updated organization");
+ } catch (error) {
+ console.error(error);
+ } finally {
+ setSaving(false);
+ }
+ };
+
+ return (
+ {
+ e.preventDefault();
+ await handleSwitchOrg(org.id);
+ setDropdownOpen(false);
+ }}
+ shimmer={loading}
+ className="flex justify-between"
+ >
+ {org.name}
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/components/UserButton.tsx b/vite/src/views/main-sidebar/components/UserButton.tsx
new file mode 100644
index 000000000..10e611a34
--- /dev/null
+++ b/vite/src/views/main-sidebar/components/UserButton.tsx
@@ -0,0 +1,92 @@
+import { useSession, signOut, deleteUser } from "@/lib/auth-client";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { LogOut } from "lucide-react";
+import { useState } from "react";
+
+export const UserButton = () => {
+ const { data: session } = useSession();
+ const user = session?.user;
+ const [isLoading, setIsLoading] = useState(false);
+
+ if (!user) return null;
+
+ const handleSignOut = async () => {
+ setIsLoading(true);
+ try {
+ await signOut();
+ } catch (error) {
+ console.error("Sign out failed:", error);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ const handleDeleteAccount = async () => {
+ await deleteUser();
+ };
+
+ const getInitials = (name: string) => {
+ return name
+ .split(" ")
+ .map((part) => part[0])
+ .join("")
+ .toUpperCase()
+ .slice(0, 2);
+ };
+
+ const displayName = user.name || user.email?.split("@")[0] || "User";
+ const initials = getInitials(displayName);
+
+ return (
+
+
+
+
+
+
+
+
+
+ Delete Account
+
+
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/env-dropdown/ExpandedEnvTrigger.tsx b/vite/src/views/main-sidebar/env-dropdown/ExpandedEnvTrigger.tsx
new file mode 100644
index 000000000..23d457353
--- /dev/null
+++ b/vite/src/views/main-sidebar/env-dropdown/ExpandedEnvTrigger.tsx
@@ -0,0 +1,56 @@
+import { AppEnv } from "@autumn/shared";
+import { cn } from "@/lib/utils";
+import { FlaskConical, Sailboat } from "lucide-react";
+import { useEnv } from "@/utils/envUtils";
+import { DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+import { useSidebarContext } from "../SidebarContext";
+
+export const sandboxStyles =
+ "text-amber-600 bg-amber-100 border-amber-500 w-[100px]";
+export const liveStyles = "text-primary bg-purple-100 border-primary w-[120px]";
+
+export const ExpandedEnvTrigger = ({ isHovered }: { isHovered: boolean }) => {
+ const env = useEnv();
+ const { state } = useSidebarContext();
+
+ const isSandbox = env === AppEnv.Sandbox;
+ const expanded = state == "expanded";
+ return (
+
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/org-dropdown/components/OrgLogo.tsx b/vite/src/views/main-sidebar/org-dropdown/components/OrgLogo.tsx
new file mode 100644
index 000000000..cc40ed08a
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/components/OrgLogo.tsx
@@ -0,0 +1,25 @@
+import { cn } from "@/lib/utils";
+import { FrontendOrg } from "@autumn/shared";
+import { useSidebarContext } from "../../SidebarContext";
+
+export const OrgLogo = ({ org }: { org: FrontendOrg }) => {
+ const { state } = useSidebarContext();
+ const firstLetter = org.name.charAt(0).toUpperCase();
+ const expanded = state === "expanded";
+ return (
+
+
+
+
+
+
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/org-dropdown/manage-org/InvitePopover.tsx b/vite/src/views/main-sidebar/org-dropdown/manage-org/InvitePopover.tsx
new file mode 100644
index 000000000..3b8eedb43
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/manage-org/InvitePopover.tsx
@@ -0,0 +1,87 @@
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import { authClient } from "@/lib/auth-client";
+import { useAxiosInstance } from "@/services/useAxiosInstance";
+import { getBackendErr } from "@/utils/genUtils";
+import { Mail, PlusIcon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import { useMemberships } from "../hooks/useMemberships";
+
+export const InvitePopover = () => {
+ const [email, setEmail] = useState("");
+ const [loading, setLoading] = useState(false);
+ const axiosInstance = useAxiosInstance();
+ const { mutate } = useMemberships();
+ const [open, setOpen] = useState(false);
+
+ const handleInvite = async () => {
+ try {
+ setLoading(true);
+ const { data, status } = await axiosInstance.post(
+ "/organization/invite",
+ {
+ email: email,
+ role: "member",
+ },
+ );
+
+ if (status === 202) {
+ await authClient.organization.inviteMember({
+ email: email,
+ role: "admin",
+ });
+ toast.success(`Successfully sent invitation to ${email}`);
+ } else {
+ toast.success(data.message);
+ }
+ await mutate();
+ setOpen(false);
+ } catch (error) {
+ console.error(error);
+ toast.error(getBackendErr(error, "Failed to invite user"));
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ return (
+
+
+
+
+
+
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/org-dropdown/manage-org/MemberRowToolbar.tsx b/vite/src/views/main-sidebar/org-dropdown/manage-org/MemberRowToolbar.tsx
new file mode 100644
index 000000000..e8c847139
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/manage-org/MemberRowToolbar.tsx
@@ -0,0 +1,98 @@
+import { ToolbarButton } from "@/components/general/table-components/ToolbarButton";
+import { Button } from "@/components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuItem,
+ DropdownMenuContent,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { useOrg } from "@/hooks/useOrg";
+import { authClient } from "@/lib/auth-client";
+import { Invite, Membership } from "@autumn/shared";
+import { TrashIcon } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import { useMemberships } from "../hooks/useMemberships";
+
+export const MemberRowToolbar = ({
+ membership,
+ invite,
+}: {
+ membership?: Membership;
+ invite?: Invite;
+}) => {
+ const [deleteLoading, setDeleteLoading] = useState(false);
+ const [open, setOpen] = useState(false);
+ const { org } = useOrg();
+ const { mutate } = useMemberships();
+
+ const handleDeleteMember = async (e: any) => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ setDeleteLoading(true);
+ try {
+ const { data, error } = await authClient.organization.removeMember({
+ memberIdOrEmail: membership!.member.id,
+ organizationId: org.id,
+ });
+
+ if (error) {
+ toast.error(error.message);
+ } else {
+ await mutate();
+ toast.success("Member removed");
+ }
+ } catch (error) {
+ toast.error("Failed to remove member");
+ }
+ setDeleteLoading(false);
+ };
+
+ const handleDeleteInvite = async (e: any) => {
+ e.preventDefault();
+ e.stopPropagation();
+
+ setDeleteLoading(true);
+ try {
+ const { data, error } = await authClient.organization.cancelInvitation({
+ invitationId: invite!.id,
+ });
+ if (error) {
+ toast.error(error.message);
+ }
+
+ await mutate();
+ toast.success("Invite cancelled");
+ } catch (error) {
+ toast.error("Failed to remove invite");
+ }
+ setDeleteLoading(false);
+ };
+
+ return (
+
+
+
+
+ {
+ if (membership) {
+ handleDeleteMember(e);
+ } else {
+ handleDeleteInvite(e);
+ }
+ }}
+ >
+
+
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgInvitesList.tsx b/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgInvitesList.tsx
new file mode 100644
index 000000000..befb63afa
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgInvitesList.tsx
@@ -0,0 +1,60 @@
+import { useMemberships } from "../hooks/useMemberships";
+import { Invite, Membership } from "@autumn/shared";
+import { PageSectionHeader } from "@/components/general/PageSectionHeader";
+import { Item, Row } from "@/components/general/TableGrid";
+import { cn } from "@/lib/utils";
+import { formatDateStr } from "@/utils/formatUtils/formatDateUtils";
+import { Badge } from "@/components/ui/badge";
+import { InvitePopover } from "./InvitePopover";
+import { useSession } from "@/lib/auth-client";
+import { MemberRowToolbar } from "./MemberRowToolbar";
+
+export const OrgInvitesList = () => {
+ const {
+ memberships,
+ invites,
+ isLoading: isMembersLoading,
+ } = useMemberships();
+ const { data } = useSession();
+
+ if (isMembersLoading) return null;
+ const membership = memberships.find(
+ (membership: Membership) => membership.user.id === data?.session?.userId,
+ );
+ const isAdmin =
+ membership?.member.role === "admin" || membership?.member.role === "owner";
+
+ return (
+ = ({
+ initialLogoUrl,
+}) => {
+ const { org, mutate } = useOrg();
+ const [error, setError] = useState(null);
+ const inputRef = useRef(null);
+ const [uploading, setUploading] = useState(false);
+ const axiosInstance = useAxiosInstance();
+ const [logoVersion, setLogoVersion] = useState(0);
+
+ const [removing, setRemoving] = useState(false);
+
+ // Removal logic
+ const handleRemove = async () => {
+ setRemoving(true);
+ try {
+ const { error } = await authClient.organization.update({
+ data: {
+ logo: "",
+ },
+ });
+
+ if (error) {
+ toast.error(error.message || "Failed to remove logo");
+ return;
+ }
+
+ await mutate();
+ setRemoving(false);
+ } catch (error) {
+ setRemoving(false);
+ }
+ };
+
+ // Upload logic
+ const handleUploadClick = () => {
+ inputRef.current?.click();
+ };
+
+ const uploadToSupabase = async (file: File) => {
+ const { data } = await axiosInstance.get("/organization/upload_url");
+ const { signedUrl } = data;
+
+ await axios.put(signedUrl, file, {
+ headers: {
+ "Content-Type": file.type,
+ },
+ });
+ };
+
+ const handleUploading = async (e: React.ChangeEvent) => {
+ const file = e.target.files?.[0];
+
+ if (!file) return;
+
+ setUploading(true);
+ try {
+ await uploadToSupabase(file);
+
+ const { error } = await authClient.organization.update({
+ data: {
+ logo: getOrgLogoUrl(org.id),
+ },
+ });
+
+ if (error) {
+ toast.error(error.message || "Failed to update logo");
+ return;
+ }
+
+ await mutate();
+ setLogoVersion(logoVersion + 1);
+ toast.success("Successfully uploaded logo");
+ } catch (error) {
+ toast.error(getBackendErr(error, "Failed to upload logo"));
+ } finally {
+ setUploading(false);
+ }
+ };
+
+ return (
+ {
- const token = await getToken({
- template: "custom_template",
- });
- return token;
- }}
+ backendUrl={`${import.meta.env.VITE_BACKEND_URL}/demo`}
>
diff --git a/vite/src/views/onboarding/hooks/useCreateOrg.tsx b/vite/src/views/onboarding/hooks/useCreateOrg.tsx
index 5a95df463..c0bd6a9ed 100644
--- a/vite/src/views/onboarding/hooks/useCreateOrg.tsx
+++ b/vite/src/views/onboarding/hooks/useCreateOrg.tsx
@@ -1,8 +1,13 @@
-import { useOrganization, useUser } from "@clerk/clerk-react";
-
+import { useOrg } from "@/hooks/useOrg";
+import {
+ authClient,
+ useListOrganizations,
+ useSession,
+} from "@/lib/auth-client";
import { useAxiosInstance } from "@/services/useAxiosInstance";
-import { useOrganizationList } from "@clerk/clerk-react";
-import { useEffect, useRef, useState } from "react";
+import { slugify } from "@/utils/formatUtils/formatTextUtils";
+import { useEffect, useRef } from "react";
+import { toast } from "sonner";
export const useCreateOrg = ({
productMutate,
@@ -10,43 +15,50 @@ export const useCreateOrg = ({
productMutate: () => Promise;
}) => {
const axiosInstance = useAxiosInstance();
- const { user } = useUser();
- const { organization: org } = useOrganization();
- const { setActive } = useOrganizationList();
const hasCreatedOrg = useRef(false);
+ const { data: session } = useSession();
+ const { data: organizations, isPending } = useListOrganizations();
+ const { mutate } = useOrg();
+
+ const getOrgSlug = () => {
+ const randomDigits = Math.floor(10000000 + Math.random() * 90000000);
+ return `${slugify(session?.user!.name || "org")}_${randomDigits}`;
+ };
+
useEffect(() => {
const createDefaultOrg = async () => {
- if (hasCreatedOrg.current) return;
-
+ if (hasCreatedOrg.current || isPending || !session?.user) return;
hasCreatedOrg.current = true;
-
// Either set first org active, or create a new org
try {
- if (
- user?.organizationMemberships?.length &&
- user.organizationMemberships.length > 0
- ) {
- await setActive?.({
- organization: user.organizationMemberships[0].organization.id,
+ if (organizations && organizations.length > 0) {
+ await authClient.organization.setActive({
+ organizationId: organizations[0]?.id,
});
- await productMutate();
-
- return;
} else {
- const { data } = await axiosInstance.post("/organization");
+ const { data, error } = await authClient.organization.create({
+ name: `${session?.user.name}'s Org`,
+ slug: getOrgSlug(),
+ });
- const res = await setActive?.({ organization: data.id });
+ if (error) throw error;
+ await authClient.organization.setActive({
+ organizationId: data?.id,
+ });
+
+ await mutate();
await productMutate();
}
- } catch (error) {
- console.error("Error creating organization:", error);
+ } catch (error: any) {
+ toast.error(`Error initializing org: ${error.message}`);
}
};
+ createDefaultOrg();
- if (!org && setActive) {
- createDefaultOrg();
- }
- }, [org, axiosInstance, setActive, productMutate, user]);
+ // if (!org && setActive) {
+ // createDefaultOrg();
+ // }
+ }, [session, axiosInstance, productMutate]);
};
diff --git a/vite/src/views/onboarding/onboarding-steps/CreateOrg.tsx b/vite/src/views/onboarding/onboarding-steps/CreateOrg.tsx
index ef7cb8a3b..25dfa312d 100644
--- a/vite/src/views/onboarding/onboarding-steps/CreateOrg.tsx
+++ b/vite/src/views/onboarding/onboarding-steps/CreateOrg.tsx
@@ -3,125 +3,122 @@ import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { useAxiosInstance } from "@/services/useAxiosInstance";
import { useEnv } from "@/utils/envUtils";
-import { useOrganization, useOrganizationList } from "@clerk/clerk-react";
-import { Building } from "lucide-react";
import { useState } from "react";
import ConfettiExplosion from "react-confetti-explosion";
import { toast } from "sonner";
-export const CreateOrgStep = ({
- number,
- pollForOrg,
-}: {
- number: number;
- pollForOrg: () => Promise;
-}) => {
- const { organization: org } = useOrganization();
- const env = useEnv();
- const axios = useAxiosInstance({ env });
- const { createOrganization, setActive } = useOrganizationList();
+// export const CreateOrgStep = ({
+// number,
+// pollForOrg,
+// }: {
+// number: number;
+// pollForOrg: () => Promise;
+// }) => {
- const [isExploding, setIsExploding] = useState(false);
- const [loading, setLoading] = useState(false);
- const [fields, setFields] = useState({
- name: org?.name || "",
- slug: "",
- });
+// const env = useEnv();
+// const axios = useAxiosInstance({ env });
- const handleCreateOrg = async () => {
- setLoading(true);
+// const [isExploding, setIsExploding] = useState(false);
+// const [loading, setLoading] = useState(false);
+// const [fields, setFields] = useState({
+// name: org?.name || "",
+// slug: "",
+// });
- try {
- if (!createOrganization) {
- toast.error("Error creating organization");
- return;
- }
+// const handleCreateOrg = async () => {
+// setLoading(true);
- const org = await createOrganization({
- name: fields.name,
- });
+// try {
+// if (!createOrganization) {
+// toast.error("Error creating organization");
+// return;
+// }
- // Create org in Autumn
- const res = await axios.post("/organization", {
- orgId: org.id,
- });
+// const org = await createOrganization({
+// name: fields.name,
+// });
- console.log("Org created in Autumn", res);
+// // Create org in Autumn
+// const res = await axios.post("/organization", {
+// orgId: org.id,
+// });
- await setActive({ organization: org.id });
- // await pollForOrg();
- toast.success(`Created your organization: ${org.name}`);
- setIsExploding(true);
- } catch (error: any) {
- if (error.message) {
- toast.error(error.message);
- } else {
- toast.error("Error creating organization");
- }
- }
- setLoading(false);
- };
+// console.log("Org created in Autumn", res);
- return (
-
-
- );
-};
+// return (
+//
+//
+// );
+// };
diff --git a/vite/src/views/onboarding/onboarding-steps/ProductList.tsx b/vite/src/views/onboarding/onboarding-steps/ProductList.tsx
index 64f2f56cd..34f2d82e5 100644
--- a/vite/src/views/onboarding/onboarding-steps/ProductList.tsx
+++ b/vite/src/views/onboarding/onboarding-steps/ProductList.tsx
@@ -9,15 +9,12 @@ import { ProductsContext } from "@/views/products/ProductsContext";
import { ProductsTable } from "@/views/products/ProductsTable";
import { Product, products, ProductV2 } from "@autumn/shared";
import {
- DialogHeader,
DialogContent,
- DialogTrigger,
DialogTitle,
DialogFooter,
} from "@/components/ui/dialog";
import { useState } from "react";
import { Dialog } from "@/components/ui/dialog";
-import { AddProductButton } from "@/views/customers/customer/add-product/AddProductButton";
import { ProductService } from "@/services/products/ProductService";
import { useAxiosInstance } from "@/services/useAxiosInstance";
import { getBackendErr } from "@/utils/genUtils";
diff --git a/vite/src/views/products/ProductsView.tsx b/vite/src/views/products/ProductsView.tsx
index cccde94d6..491c41013 100644
--- a/vite/src/views/products/ProductsView.tsx
+++ b/vite/src/views/products/ProductsView.tsx
@@ -8,11 +8,9 @@ import { ProductsContext } from "./ProductsContext";
import { AppEnv } from "@autumn/shared";
import CreateProduct from "./CreateProduct";
import { ProductsTable } from "./ProductsTable";
-import { ToggleDisplayButton } from "@/components/general/ToggleDisplayButton";
import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
-import { Ticket, Package, Gift, Flag, Banknote } from "lucide-react";
-import React from "react";
+import { Package, Gift, Flag } from "lucide-react";
import { RewardsTable } from "./rewards/RewardsTable";
import CreateReward from "./rewards/CreateReward";
diff --git a/vite/src/views/products/product/prices/CreateFixedPrice.tsx b/vite/src/views/products/product/prices/CreateFixedPrice.tsx
index 55c6c1718..9c31040d1 100644
--- a/vite/src/views/products/product/prices/CreateFixedPrice.tsx
+++ b/vite/src/views/products/product/prices/CreateFixedPrice.tsx
@@ -1,15 +1,4 @@
-import React from "react";
-import { BillingInterval, FixedPriceConfig } from "@autumn/shared";
import { Input } from "@/components/ui/input";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
-import { keyToTitle } from "@/utils/formatUtils/formatTextUtils";
-
import FieldLabel from "@/components/general/modal-components/FieldLabel";
import { useProductContext } from "../ProductContext";
import { SelectCycle } from "../product-item/components/SelectCycle";
@@ -30,10 +19,10 @@ function CreateFixedPrice({
return (
Hello World
;
- // }
};
diff --git a/vite/src/views/admin/AdminTable.tsx b/vite/src/views/admin/AdminTable.tsx
new file mode 100644
index 000000000..1ea00ecaa
--- /dev/null
+++ b/vite/src/views/admin/AdminTable.tsx
@@ -0,0 +1,91 @@
+import { useState, useCallback } from "react";
+import { useAxiosSWR } from "@/services/useAxiosSwr";
+
+import { DataTable } from "./DataTable";
+import { ColumnDef } from "@tanstack/react-table";
+
+export const AdminTable = ({
+ path,
+ columns,
+ title,
+}: {
+ path: string;
+ columns: ColumnDef
+
+ columns={columns}
+ data={rows}
+ isLoading={isLoading}
+ pageInfo={pageInfo}
+ onSearch={handleSearch}
+ onPaginate={handlePaginate}
+ onSort={handleSort}
+ sortKey={sortKey}
+ sortOrder={sortOrder}
+ />
+
+ );
+};
diff --git a/vite/src/views/admin/AdminView.tsx b/vite/src/views/admin/AdminView.tsx
new file mode 100644
index 000000000..65ffc21bb
--- /dev/null
+++ b/vite/src/views/admin/AdminView.tsx
@@ -0,0 +1,58 @@
+import LoadingScreen from "../general/LoadingScreen";
+import { authClient } from "@/lib/auth-client";
+import { DefaultView } from "../DefaultView";
+import { useAdmin } from "./hooks/useAdmin";
+import { toast } from "sonner";
+import { AdminTable } from "./AdminTable";
+import { columns as userColumns } from "./userColumns";
+import { columns as orgColumns } from "./orgColumns";
+import { Button } from "@/components/ui/button";
+
+export const AdminView = () => {
+ const { isAdmin, isPending } = useAdmin();
+
+ if (isPending) {
+ return (
+ {title}
+
+
+ );
+ }
+
+ if (!isAdmin) {
+ return
+ {/* 1. User list */}
+
+
+ );
+};
diff --git a/vite/src/views/admin/DataTable.tsx b/vite/src/views/admin/DataTable.tsx
new file mode 100644
index 000000000..187d50df5
--- /dev/null
+++ b/vite/src/views/admin/DataTable.tsx
@@ -0,0 +1,190 @@
+import * as React from "react";
+import {
+ ColumnDef,
+ SortingState,
+ flexRender,
+ getCoreRowModel,
+ getSortedRowModel,
+ useReactTable,
+ HeaderGroup,
+ Header,
+ Row,
+ Cell,
+} from "@tanstack/react-table";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/components/ui/table";
+import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
+import { SearchIcon } from "lucide-react";
+
+interface DataTableProps
+
+
+
+
+
+
+
+ );
+}
diff --git a/vite/src/views/admin/OrgTable.tsx b/vite/src/views/admin/OrgTable.tsx
new file mode 100644
index 000000000..22cda18d4
--- /dev/null
+++ b/vite/src/views/admin/OrgTable.tsx
@@ -0,0 +1,3 @@
+export const OrgTable = () => {
+ return
+ setSearch(e.target.value)}
+ className="max-w-sm"
+ />
+
+
+
+
+
+
+
+ Page {pageInfo.page}
+
+
+ OrgTable
;
+};
diff --git a/vite/src/views/admin/components/AdminOnly.tsx b/vite/src/views/admin/components/AdminOnly.tsx
new file mode 100644
index 000000000..2834bdebc
--- /dev/null
+++ b/vite/src/views/admin/components/AdminOnly.tsx
@@ -0,0 +1,12 @@
+import React from "react";
+import { useAdmin } from "../hooks/useAdmin";
+
+export const AdminOnly = ({ children }: { children: React.ReactNode }) => {
+ const { isAdmin, isPending } = useAdmin();
+
+ if (!isAdmin) {
+ return null;
+ }
+
+ return
+
+ );
+ },
+ },
+ {
+ accessorKey: "name",
+ header: "Name",
+ width: 150,
+ cell: ({ row }: { row: Row{value}
;
+ },
+ },
+
+ {
+ accessorKey: "slug",
+ header: "Slug",
+ canCopy: true,
+ width: 200,
+ cell: ({ row }: { row: Row
+
+ );
+ },
+ },
+ {
+ accessorKey: "name",
+ header: "Name",
+ width: 150,
+ cell: ({ row }: { row: Row{value}
;
+ },
+ },
+ {
+ accessorKey: "email",
+ header: "Email",
+ canCopy: true,
+ width: 200,
+ cell: ({ row }: { row: Row
+
+ );
+
+ if (!data) {
+ navigate("/sign-in");
+ return;
+ }
+
+ return AcceptInvitation!
;
+};
diff --git a/vite/src/views/auth/SignIn.tsx b/vite/src/views/auth/SignIn.tsx
new file mode 100644
index 000000000..452300f59
--- /dev/null
+++ b/vite/src/views/auth/SignIn.tsx
@@ -0,0 +1,171 @@
+import { useEffect, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Link, useNavigate, useSearchParams } from "react-router";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faGoogle } from "@fortawesome/free-brands-svg-icons";
+import { authClient, signIn, useSession } from "@/lib/auth-client";
+import { OTPSignIn } from "./components/OTPSignIn";
+import { Mail } from "lucide-react";
+import { CustomToaster } from "@/components/general/CustomToaster";
+import { toast } from "sonner";
+import { getBackendErr } from "@/utils/genUtils";
+
+export const SignIn = () => {
+ const [email, setEmail] = useState("");
+ const [googleLoading, setGoogleLoading] = useState(false);
+ const [sendOtpLoading, setSendOtpLoading] = useState(false);
+ const [otpSent, setOtpSent] = useState(false);
+ const { data: session } = useSession();
+
+ const [searchParams] = useSearchParams();
+ const token = searchParams.get("token");
+
+ const newPath = token
+ ? `/sandbox/onboarding?token=${token}`
+ : "/sandbox/onboarding";
+ const callbackPath = token
+ ? `/sandbox/onboarding?token=${token}`
+ : "/customers";
+
+ useEffect(() => {
+ if (session?.user) {
+ window.location.href = callbackPath;
+ }
+ }, [session]);
+
+ const handleEmailSignIn = async (e: React.FormEvent) => {
+ e.preventDefault();
+ setSendOtpLoading(true);
+
+ try {
+ const { data, error } = await authClient.emailOtp.sendVerificationOtp({
+ email: email,
+ type: "sign-in",
+ });
+
+ if (error) {
+ toast.error(error.message || "Something went wrong. Please try again.");
+ } else {
+ setOtpSent(true);
+ }
+ } catch (error) {
+ toast.error("Something went wrong. Please try again.");
+ } finally {
+ setSendOtpLoading(false);
+ }
+ };
+
+ const handleGoogleSignIn = async () => {
+ setGoogleLoading(true);
+ try {
+ const frontendUrl = import.meta.env.VITE_FRONTEND_URL;
+ const { data, error } = await signIn.social({
+ provider: "google",
+ callbackURL: `${frontendUrl}${callbackPath}`,
+ newUserCallbackURL: `${frontendUrl}${newPath}`,
+ });
+ if (error) {
+ toast.error(error.message || "Failed to sign in with Google");
+ }
+ } catch (error) {
+ toast.error(getBackendErr(error, "Failed to sign in with Google"));
+ } finally {
+ setTimeout(() => {
+ setGoogleLoading(false);
+ }, 1000);
+ }
+ };
+
+ const height = "h-9";
+
+ return (
+
+
+ );
+};
diff --git a/vite/src/views/auth/components/OTPSignIn.tsx b/vite/src/views/auth/components/OTPSignIn.tsx
new file mode 100644
index 000000000..bfa88383c
--- /dev/null
+++ b/vite/src/views/auth/components/OTPSignIn.tsx
@@ -0,0 +1,135 @@
+import { Button } from "@/components/ui/button";
+import {
+ InputOTP,
+ InputOTPGroup,
+ InputOTPSeparator,
+ InputOTPSlot,
+} from "@/components/ui/input-otp";
+import { authClient } from "@/lib/auth-client";
+import { cn } from "@/lib/utils";
+import { differenceInSeconds } from "date-fns";
+import { useEffect, useState } from "react";
+import { useNavigate } from "react-router";
+import { toast } from "sonner";
+
+export const OTPSignIn = ({
+ email,
+ newPath,
+ callbackPath,
+}: {
+ email: string;
+ newPath: string;
+ callbackPath: string;
+}) => {
+ const [otp, setOtp] = useState("");
+ const [resending, setResending] = useState(false);
+ const [resendCountdown, setResendCountdown] = useState(0);
+ const [verifying, setVerifying] = useState(false);
+ const navigate = useNavigate();
+
+ useEffect(() => {
+ if (resendCountdown > 0) {
+ setTimeout(() => setResendCountdown(resendCountdown - 1), 1000);
+ }
+ }, [resendCountdown]);
+
+ const handleSubmit = async (otp: string) => {
+ setVerifying(true);
+ try {
+ const { data, error } = await authClient.signIn.emailOtp({
+ email: email,
+ otp: otp,
+ });
+
+ console.log("Data", data);
+ console.log("Error", error);
+
+ if (error) {
+ toast.error(error.message || "Failed to verify code");
+ setVerifying(false);
+ return;
+ }
+
+ const user = data.user;
+
+ const createdRecently =
+ differenceInSeconds(new Date(), new Date(user.createdAt)) < 20;
+
+ if (createdRecently) {
+ window.location.href = newPath;
+ } else {
+ window.location.href = callbackPath;
+ }
+ } catch (error) {
+ toast.error("Failed to verify code");
+ }
+ setVerifying(false);
+ };
+
+ const handleResend = async () => {
+ setResending(true);
+ try {
+ const { data, error } = await authClient.emailOtp.sendVerificationOtp({
+ email: email,
+ type: "sign-in",
+ });
+
+ console.log(data);
+ console.log(error);
+
+ if (error) {
+ toast.error(error.message);
+ return;
+ }
+
+ setResendCountdown(30);
+ } catch (error) {
+ toast.error("Failed to resend code");
+ return;
+ }
+
+ setResending(false);
+ };
+
+ return (
+
+ {/* Logo */}
+
+
+ 
+
+
+ {/* Title */}
+
+
+
+
+ {otpSent && (
+ + Sign in to Autumn +
+
+ {/* Google Sign In Button */}
+
+ }
+ className={height}
+ >
+ Continue with Google
+
+
+ {/* Divider */}
+
+
+ {/* Footer */}
+ {/*
+
+
+
+
+
+
+
+ Or
+
+
+
+
+
+ setEmail(e.target.value)}
+ required
+ className="text-base"
+ />
+
+
+ {/* Sign In Button */}
+ }
+ >
+ Continue with email
+
+
+
+ Create an account here
+
+
*/}
+
+ )}
+
+
+ );
+};
diff --git a/vite/src/views/customers/customer/CustomerView.tsx b/vite/src/views/customers/customer/CustomerView.tsx
index 869796fe0..a0c2336f5 100644
--- a/vite/src/views/customers/customer/CustomerView.tsx
+++ b/vite/src/views/customers/customer/CustomerView.tsx
@@ -3,13 +3,7 @@
import { useAxiosSWR } from "@/services/useAxiosSwr";
import LoadingScreen from "@/views/general/LoadingScreen";
import { AppEnv } from "@autumn/shared";
-import {
- Breadcrumb,
- BreadcrumbItem,
- BreadcrumbLink,
- BreadcrumbList,
- BreadcrumbSeparator,
-} from "@/components/ui/breadcrumb";
+
import { CustomerContext } from "./CustomerContext";
import { Link, useNavigate, useParams, useSearchParams } from "react-router";
import { CustomerProductList } from "./CustomerProductList";
diff --git a/vite/src/views/customers/customer/add-product/NewProductDropdown.tsx b/vite/src/views/customers/customer/add-product/NewProductDropdown.tsx
index 31881b051..86ca60789 100644
--- a/vite/src/views/customers/customer/add-product/NewProductDropdown.tsx
+++ b/vite/src/views/customers/customer/add-product/NewProductDropdown.tsx
@@ -19,6 +19,7 @@ import { OrgService } from "@/services/OrgService";
import { CusProductStatus, Entity, Product } from "@autumn/shared";
import SmallSpinner from "@/components/general/SmallSpinner";
import { Search } from "lucide-react";
+import { useOrg } from "@/hooks/useOrg";
function AddProduct() {
const { products, customer, env, entityId, entities } = useCustomerContext();
@@ -26,6 +27,7 @@ function AddProduct() {
const [options, setOptions] = useState+ Check your email for the 6 digit code +
+
+
+
+
+
+
+
+
+
+
+
+
+ setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
>
- {expanded ? (
-
- {state == "expanded" ? (
-
+ {envText.slice(0, 1)}
- )}
+
{
handleEnvChange(AppEnv.Sandbox);
}}
@@ -109,7 +62,7 @@ export const EnvDropdown = ({ env }: { env: AppEnv }) => {
{
handleEnvChange(AppEnv.Live);
}}
diff --git a/vite/src/views/main-sidebar/MainSidebar.tsx b/vite/src/views/main-sidebar/MainSidebar.tsx
index 9cadbea66..73ad08133 100644
--- a/vite/src/views/main-sidebar/MainSidebar.tsx
+++ b/vite/src/views/main-sidebar/MainSidebar.tsx
@@ -7,8 +7,10 @@ import { useState } from "react";
import { cn } from "@/lib/utils";
import { SidebarContext } from "./SidebarContext";
import { useHotkeys } from "react-hotkeys-hook";
-import { Code, Flag, Package, Tag, User } from "lucide-react";
+import { Code, Package, Shield, User } from "lucide-react";
import { EnvDropdown } from "./EnvDropdown";
+import { OrgDropdown } from "./components/OrgDropdown";
+import { AdminOnly } from "../admin/components/AdminOnly";
export const MainSidebar = () => {
const env = useEnv();
@@ -25,20 +27,14 @@ export const MainSidebar = () => {
`h-full bg-stone-100 py-4 flex flex-col justify-between transition-all duration-150`,
state == "expanded"
? "min-w-[200px] max-w-[200px]"
- : "min-w-[50px] max-w-[50px]"
+ : "min-w-[50px] max-w-[50px]",
)}
>
-
);
};
+
+// {
+// state == "expanded" && (
+//
-
- ) : (
-
- {env === AppEnv.Sandbox ? (
-
- {envText}
- {/*{envText.slice(0, 1)}
- )} -
- (null);
-
- useEffect(() => {
- // Skip the first render
- if (prevOrgIdRef.current === null) {
- prevOrgIdRef.current = organization?.id || null;
- return;
- }
-
- // If organization changed (switched or created/deleted)
- if (prevOrgIdRef.current !== (organization?.id || null)) {
- console.log("Organization changed, refreshing page");
- window.location.reload();
- }
-
- // Update the ref
- prevOrgIdRef.current = organization?.id || null;
- }, [organization]);
return (
);
};
@@ -141,3 +78,38 @@ const CopyText = ({ text }: { text: string }) => {
-
- {state == "expanded" && {title}}
+
+ {title}
+
{online && (
diff --git a/vite/src/views/main-sidebar/SidebarBottom.tsx b/vite/src/views/main-sidebar/SidebarBottom.tsx
index 564e8d5a0..9c3661b3d 100644
--- a/vite/src/views/main-sidebar/SidebarBottom.tsx
+++ b/vite/src/views/main-sidebar/SidebarBottom.tsx
@@ -1,20 +1,23 @@
"use client";
-import { UserButton, useUser } from "@clerk/clerk-react";
-
import { NavButton } from "./NavButton";
import { useEnv } from "@/utils/envUtils";
import { SidebarContact } from "./SidebarContact";
import { useSidebarContext } from "./SidebarContext";
import { cn } from "@/lib/utils";
import { Blocks, Book } from "lucide-react";
+import { useSession } from "@/lib/auth-client";
+import { UserButton } from "./components/UserButton";
export default function SidebarBottom() {
const env = useEnv();
- const { user, isLoaded } = useUser();
+ // const { user, isLoaded } = useUser();
const { state } = useSidebarContext();
const expanded = state == "expanded";
+ const { data: session } = useSession();
+ const user = session?.user;
+
return (
+
+ */}
{/* Sidebar bottom */}
diff --git a/vite/src/views/main-sidebar/NavButton.tsx b/vite/src/views/main-sidebar/NavButton.tsx
index 91d25359d..7d716f436 100644
--- a/vite/src/views/main-sidebar/NavButton.tsx
+++ b/vite/src/views/main-sidebar/NavButton.tsx
@@ -39,7 +39,7 @@ export const NavButton = ({
`cursor-pointer font-medium transition-all duration-100
text-sm flex h-9 items-center text-t2 hover:text-primary`,
isActive && "font-semibold text-primary hover:text-primary/80",
- className
+ className,
)}
target={href ? "_blank" : undefined}
>
@@ -47,12 +47,21 @@ export const NavButton = ({
className={cn(
"flex justify-center w-4 h-4 items-center rounded-sm transition-all duration-100",
state == "expanded" && "mr-2",
- isHovered && "translate-x-[-1px]"
+ isHovered && "translate-x-[-1px]",
)}
>
{icon}
@@ -33,24 +36,30 @@ export default function SidebarBottom() {
/>
-
-
-
-
- {expanded && (
-
-
- )}
- {user?.firstName}
-{user?.primaryEmailAddress?.emailAddress}
-
+
; */
+}
diff --git a/vite/src/views/main-sidebar/SidebarTop.tsx b/vite/src/views/main-sidebar/SidebarTop.tsx
index a9e93e9a6..47e3a7d98 100644
--- a/vite/src/views/main-sidebar/SidebarTop.tsx
+++ b/vite/src/views/main-sidebar/SidebarTop.tsx
@@ -1,90 +1,27 @@
import { cn } from "@/lib/utils";
-import {
- OrganizationSwitcher,
- useOrganization,
- useUser,
-} from "@clerk/clerk-react";
+import { OrganizationSwitcher, useUser } from "@clerk/clerk-react";
import { useEffect, useRef, useState } from "react";
import { Button } from "@/components/ui/button";
-import { EnvDropdown } from "./EnvDropdown";
-
import { useEnv } from "@/utils/envUtils";
import { useSidebarContext } from "./SidebarContext";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
+
import { Check, ChevronLeft, ChevronRight, Copy } from "lucide-react";
import { AdminHover } from "@/components/general/AdminHover";
+import { OrgDropdown } from "./components/OrgDropdown";
export const SidebarTop = () => {
- const { isLoaded, user } = useUser();
const { state, setState } = useSidebarContext();
- const primaryEmail = user?.primaryEmailAddress?.emailAddress;
- const env = useEnv();
- const { organization } = useOrganization();
- const prevOrgIdRef = useRef
+
+ {expanded && (
+
+
+ )}
+{user?.name}
++ {user?.email} +
+
-
+ {/*
*/}
- {state == "expanded" && (
-
+
-
- )}
-
- {organization && (
-
-
- )}
-
-
+//
+// );
+// }
diff --git a/vite/src/views/main-sidebar/components/CreateNewOrg.tsx b/vite/src/views/main-sidebar/components/CreateNewOrg.tsx
new file mode 100644
index 000000000..bfc835232
--- /dev/null
+++ b/vite/src/views/main-sidebar/components/CreateNewOrg.tsx
@@ -0,0 +1,104 @@
+import FieldLabel from "@/components/general/modal-components/FieldLabel";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { useOrg } from "@/hooks/useOrg";
+import { authClient } from "@/lib/auth-client";
+import { slugify } from "@/utils/formatUtils/formatTextUtils";
+import { useState } from "react";
+import { toast } from "sonner";
+
+export const CreateNewOrg = ({
+ dialogType,
+ setDialogType,
+}: {
+ dialogType: "create" | "manage" | null;
+ setDialogType: (dialogType: "create" | "manage" | null) => void;
+}) => {
+ const { mutate } = useOrg();
+ const [name, setName] = useState("");
+ const [slugChanged, setSlugChanged] = useState(false);
+ const [slug, setSlug] = useState("");
+ const [isLoading, setIsLoading] = useState(false);
+
+ const handleCreate = async () => {
+ setIsLoading(true);
+ try {
+ const { data, error } = await authClient.organization.create({
+ name,
+ slug,
+ });
+
+ if (error) throw error;
+
+ await authClient.organization.setActive({
+ organizationId: data.id,
+ });
+
+ await mutate();
+
+ toast.success("Organization created");
+ setDialogType(null);
+ } catch (error: any) {
+ console.log(error);
+ toast.error(error.message);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ return (
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/components/LogOutItem.tsx b/vite/src/views/main-sidebar/components/LogOutItem.tsx
new file mode 100644
index 000000000..7cd1c837d
--- /dev/null
+++ b/vite/src/views/main-sidebar/components/LogOutItem.tsx
@@ -0,0 +1,46 @@
+import { authClient } from "@/lib/auth-client";
+import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import { LogOut, Trash } from "lucide-react";
+import { useState } from "react";
+import React from "react";
+import { useNavigate } from "react-router";
+
+export const LogOutItem = () => {
+ const [loading, setLoading] = useState(false);
+ const navigate = useNavigate();
+
+ return (
+
+//
+
+//
+// )}
+//
+//
+ Log Out
+
+
+ Delete Account
+
+
+
+ );
+};
+
+const OrgDetailInput = ({
+ label,
+ value,
+ setValue,
+}: {
+ label: string;
+ value: string;
+ setValue: (value: string) => void;
+}) => {
+ return (
+
+
+
+
+
+ setInputs({ ...inputs, name: value })}
+ />
+ setInputs({ ...inputs, slug: value })}
+ />
+
+
+
+
+
+
+ {label}
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/components/OrgDropdown.tsx b/vite/src/views/main-sidebar/components/OrgDropdown.tsx
new file mode 100644
index 000000000..cb45fe117
--- /dev/null
+++ b/vite/src/views/main-sidebar/components/OrgDropdown.tsx
@@ -0,0 +1,205 @@
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuPortal,
+ DropdownMenuSeparator,
+ DropdownMenuSub,
+ DropdownMenuSubContent,
+ DropdownMenuSubTrigger,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { useOrg } from "@/hooks/useOrg";
+import {
+ authClient,
+ useListOrganizations,
+ useSession,
+} from "@/lib/auth-client";
+import { FrontendOrg, user } from "@autumn/shared";
+import { DropdownMenuGroup } from "@radix-ui/react-dropdown-menu";
+import { ChevronDown, LogOut, Plus, Settings, Trash } from "lucide-react";
+import React from "react";
+import { useState } from "react";
+import { CreateNewOrg } from "./CreateNewOrg";
+import { toast } from "sonner";
+import { LogOutItem } from "./LogOutItem";
+import { cn } from "@/lib/utils";
+import { Skeleton } from "@/components/ui/skeleton";
+import { ManageOrg } from "./ManageOrg";
+import { useMemberships } from "../org-dropdown/hooks/useMemberships";
+import { useSidebarContext } from "../SidebarContext";
+import { OrgLogo } from "../org-dropdown/components/OrgLogo";
+import { AdminHover } from "@/components/general/AdminHover";
+
+export const OrgDropdown = () => {
+ const { org, isLoading, error } = useOrg();
+ const { state, setState } = useSidebarContext();
+
+ const { data: orgs, isPending } = useListOrganizations();
+ const [dialogType, setDialogType] = useState<"create" | "manage" | null>(
+ null,
+ );
+
+ const { data: session } = useSession();
+
+ // To pre-fetch data
+ useMemberships();
+ const [dropdownOpen, setDropdownOpen] = useState(false);
+ const [manageOpen, setManageOpen] = useState(false);
+
+ if (isLoading)
+ return (
+
+ setValue(e.target.value)} />
+
+
+
+ );
+
+ if (!org || error) return null;
+
+ const expanded = state === "expanded";
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ {
+ e.preventDefault();
+ setManageOpen(true);
+ setDropdownOpen(false);
+ }}
+ >
+
+ {
+ setDialogType("create");
+ }}
+ >
+
+
+
+ Switch Organization
+
+
+
+ {orgs?.map((org) => (
+
+
+
+
+
+
+
+ );
+};
+
+const SwitchOrgItem = ({ org, setDropdownOpen }: any) => {
+ const [loading, setLoading] = useState(false);
+
+ const { mutate } = useOrg();
+
+ const handleSwitchOrg = async (orgId: string) => {
+ setLoading(true);
+
+ try {
+ await authClient.organization.setActive({
+ organizationId: orgId,
+ });
+
+ window.location.reload();
+ } catch (error: any) {
+ toast.error(error.message);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ return (
+
+ {session?.user?.name}
+
+ {session?.user?.email}
+
+
+
+ Manage
+
+
+ Create New
+
+
+
+
+ {env === AppEnv.Sandbox ? (
+
+ + {isSandbox ? "Sandbox" : "Production"} +
+
+ {org.logo ? (
+ 
+ ) : (
+
+ {firstLetter}
+
+ )}
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/org-dropdown/hooks/useMemberships.tsx b/vite/src/views/main-sidebar/org-dropdown/hooks/useMemberships.tsx
new file mode 100644
index 000000000..b3fec796e
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/hooks/useMemberships.tsx
@@ -0,0 +1,47 @@
+import {
+ authClient,
+ useListOrganizations,
+ useSession,
+} from "@/lib/auth-client";
+import { useAxiosSWR } from "@/services/useAxiosSwr";
+import { useEffect } from "react";
+
+export const useMemberships = () => {
+ const { data, error, isLoading, mutate } = useAxiosSWR({
+ url: "/organization/members",
+ });
+
+ const { data: session } = useSession();
+ const { data: orgs } = useListOrganizations();
+
+ const handleRemovedFromOrg = async () => {
+ const inOrg = orgs?.find(
+ (org: any) => org.id === session?.session?.activeOrganizationId,
+ );
+
+ if (!inOrg) {
+ if (orgs && orgs.length > 0) {
+ await authClient.organization.setActive({
+ organizationId: orgs[0].id,
+ });
+ } else {
+ const { data, error } = await authClient.revokeSessions();
+ console.log("Revoked sessions", data, error);
+ }
+ window.location.reload();
+ }
+ };
+
+ useEffect(() => {
+ if (!orgs) return;
+ handleRemovedFromOrg();
+ }, [orgs]);
+
+ return {
+ memberships: data?.memberships || [],
+ invites: data?.invites || [],
+ isLoading,
+ error,
+ mutate,
+ };
+};
diff --git a/vite/src/views/main-sidebar/org-dropdown/manage-org/DeleteOrgPopover.tsx b/vite/src/views/main-sidebar/org-dropdown/manage-org/DeleteOrgPopover.tsx
new file mode 100644
index 000000000..2c508dc5a
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/manage-org/DeleteOrgPopover.tsx
@@ -0,0 +1,102 @@
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import { useOrg } from "@/hooks/useOrg";
+import { authClient, useListOrganizations } from "@/lib/auth-client";
+import { useAxiosInstance } from "@/services/useAxiosInstance";
+import { getBackendErr } from "@/utils/genUtils";
+import { useState } from "react";
+import { toast } from "sonner";
+import { useMemberships } from "../hooks/useMemberships";
+
+export const DeleteOrgPopover = () => {
+ const { org } = useOrg();
+ const { data: organizations } = useListOrganizations();
+ const { memberships } = useMemberships();
+ const [confirmText, setConfirmText] = useState("");
+ const [deleting, setDeleting] = useState(false);
+ const axiosInstance = useAxiosInstance();
+
+ const deleteOrg = async () => {
+ if (!organizations || !memberships) {
+ toast.error("Failed to delete org");
+ return;
+ }
+ if (organizations.length === 1) {
+ toast.error("You must have at least one organization");
+ return;
+ }
+
+ if (memberships.length > 1) {
+ toast.error("Can't delete org with multiple members");
+ return;
+ }
+
+ if (confirmText !== org?.name) {
+ toast.error("Please type the org name to confirm");
+ return;
+ }
+
+ await axiosInstance.delete(`/organization`);
+
+ // Other org is now the active org
+ const otherOrg = organizations.find((o) => o.id !== org.id);
+ await authClient.organization.setActive({
+ organizationId: otherOrg!.id,
+ });
+
+ const { data, error } = await authClient.organization.delete({
+ organizationId: org.id,
+ });
+
+ if (error) {
+ throw error;
+ }
+
+ window.location.reload();
+ };
+ const handleDeleteClicked = async () => {
+ setDeleting(true);
+ try {
+ await deleteOrg();
+ } catch (error) {
+ toast.error(getBackendErr(error, "Failed to delete org"));
+ }
+
+ setDeleting(false);
+ };
+ return (
+
+
+ + Are you sure you want to delete this organization? +
+ setConfirmText(e.target.value)} + /> + +
+
+
+ Invite by email
+
+ setEmail(e.target.value)}
+ />
+ }
+ onClick={handleInvite}
+ isLoading={loading}
+ >
+ Add
+
+
+
+ Remove
+
+
+
+ - Email
+ - Status
+ - Role
+ - Expires At
+
+ {invites.map((invite: Invite) => {
+ return (
+
+ - {invite.email}
+ - {invite.status}
+ -
+
{invite.role}
+
+ -
+ {formatDateStr(invite.expiresAt)}
+
+ -
+ {isAdmin &&
+
+ );
+ })}
+
+ );
+};
diff --git a/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgLogoUploader.tsx b/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgLogoUploader.tsx
new file mode 100644
index 000000000..ebfda3f4b
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgLogoUploader.tsx
@@ -0,0 +1,155 @@
+import React, { useRef, useState } from "react";
+import { Button } from "@/components/ui/button";
+import FieldLabel from "@/components/general/modal-components/FieldLabel";
+import { toast } from "sonner";
+import { authClient } from "@/lib/auth-client";
+import { useAxiosInstance } from "@/services/useAxiosInstance";
+import axios from "axios";
+import { useOrg } from "@/hooks/useOrg";
+import { getOrgLogoUrl } from "@/utils/orgUtils";
+import { getBackendErr } from "@/utils/genUtils";
+
+const MAX_SIZE_MB = 10;
+const MAX_SIZE_BYTES = MAX_SIZE_MB * 1024 * 1024;
+
+export interface OrgLogoUploaderProps {
+ initialLogoUrl?: string;
+}
+
+const OrgLogoUploader: React.FC
+ Logo
+
+ );
+};
+
+export default OrgLogoUploader;
diff --git a/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgMembersList.tsx b/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgMembersList.tsx
new file mode 100644
index 000000000..a9fe65ef5
--- /dev/null
+++ b/vite/src/views/main-sidebar/org-dropdown/manage-org/OrgMembersList.tsx
@@ -0,0 +1,70 @@
+import { useMemberships } from "../hooks/useMemberships";
+import { Membership } from "@autumn/shared";
+import { PageSectionHeader } from "@/components/general/PageSectionHeader";
+import { Item, Row } from "@/components/general/TableGrid";
+import { cn } from "@/lib/utils";
+import { formatDateStr } from "@/utils/formatUtils/formatDateUtils";
+import { Badge } from "@/components/ui/badge";
+import { InvitePopover } from "./InvitePopover";
+import { useSession } from "@/lib/auth-client";
+import { MemberRowToolbar } from "./MemberRowToolbar";
+
+export const OrgMembersList = () => {
+ const { memberships, isLoading: isMembersLoading } = useMemberships();
+ const { data } = useSession();
+
+ if (isMembersLoading) return null;
+
+ const membership = memberships.find(
+ (membership: Membership) => membership.user.id === data?.session?.userId,
+ );
+
+ const isAdmin =
+ membership?.member.role === "admin" || membership?.member.role === "owner";
+
+ return (
+
+
+ {org.logo ? (
+ 
+ ) : (
+
+
+ +
+
+ )}
+
+
+
+
+ {org.logo && (
+
+ )}
+
+
+ Recommended size 1:1, up to 10MB.
+
+ {error && {error}}
+
+ {/*
+ - Email
+ - Name
+ - Role
+ {/* - Created At
+
+ {memberships.map((membership: Membership) => {
+ const user = membership.user;
+ const member = membership.member;
+ return (
+
+ - {user.email}
+ - {user.name}
+ -
+
{member.role}
+
+ {/* -
+ {formatDateStr(member.createdAt)}
+
+ -
+ {isAdmin &&
+
+ );
+ })}
+
+ );
+};
diff --git a/vite/src/views/onboarding/ConnectStripe.tsx b/vite/src/views/onboarding/ConnectStripe.tsx
index 78a820af9..83100fc02 100644
--- a/vite/src/views/onboarding/ConnectStripe.tsx
+++ b/vite/src/views/onboarding/ConnectStripe.tsx
@@ -37,6 +37,7 @@ import SmallSpinner from "@/components/general/SmallSpinner";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faStripeS } from "@fortawesome/free-brands-svg-icons";
import { useNavigate } from "react-router";
+import { useOrg } from "@/hooks/useOrg";
function ConnectStripe({
className,
@@ -45,29 +46,19 @@ function ConnectStripe({
className?: string;
onboarding?: boolean;
}) {
+ const axiosInstance = useAxiosInstance({ env: AppEnv.Live });
+
const navigate = useNavigate();
+ const { org, mutate, isLoading: isOrgLoading } = useOrg();
const [searchParams] = useSearchParams();
const redirect = searchParams.get("redirect");
- const axiosInstance = useAxiosInstance({ env: AppEnv.Live });
-
const [testApiKey, setTestApiKey] = useState("");
const [liveApiKey, setLiveApiKey] = useState("");
const [successUrl, setSuccessUrl] = useState("https://useautumn.com");
const [defaultCurrency, setDefaultCurrency] = useState("USD");
const [isLoading, setIsLoading] = useState(false);
- const {
- data: orgData,
- mutate: mutateOrg,
- isLoading: isOrgLoading,
- } = useAxiosSWR({
- url: `/organization`,
- env: AppEnv.Live,
- });
-
- const org = orgData?.org;
-
const handleConnectStripe = async () => {
if (!testApiKey || !successUrl || !defaultCurrency) {
toast.error("Please fill in all fields");
@@ -90,7 +81,7 @@ function ConnectStripe({
});
toast.success("Successfully connected to Stripe");
- await mutateOrg();
+ await mutate();
if (redirect && !onboarding) {
navigate(redirect);
}
@@ -107,7 +98,7 @@ function ConnectStripe({
try {
setIsDisconnecting(true);
await OrgService.disconnectStripe(axiosInstance);
- await mutateOrg();
+ await mutate();
toast.success("Successfully disconnected from Stripe");
} catch (error) {
toast.error(getBackendErr(error, "Failed to disconnect Stripe"));
@@ -125,7 +116,7 @@ function ConnectStripe({
className={cn(
"flex flex-col gap-4",
className,
- onboarding && "flex-row justify-between items-center"
+ onboarding && "flex-row justify-between items-center",
)}
>
Stripe Connected ✅
@@ -222,7 +213,7 @@ export const CurrencySelect = ({ "w-full justify-between transition-colors duration-100", open && "border-[rgb(139,92,246)] shadow-[0_0_2px_1px_rgba(139,92,246,0.25)]", - className + className, )} disabled={disabled} > diff --git a/vite/src/views/onboarding/OnboardingView.tsx b/vite/src/views/onboarding/OnboardingView.tsx index a29fa519c..6471e7d86 100644 --- a/vite/src/views/onboarding/OnboardingView.tsx +++ b/vite/src/views/onboarding/OnboardingView.tsx @@ -1,42 +1,42 @@ "use client"; -import { useState, useEffect, useRef } from "react"; -import { useAuth, useOrganization } from "@clerk/clerk-react"; -import { useSearchParams } from "react-router"; +import EnvStep from "./onboarding-steps/Env"; +import MountHandler from "./onboarding-steps/MountHandler"; import Step from "@/components/general/OnboardingStep"; -import { useAxiosSWR } from "@/services/useAxiosSwr"; -import { useAxiosInstance } from "@/services/useAxiosInstance"; -import { useEnv } from "@/utils/envUtils"; -import { Book } from "lucide-react"; -import { ConnectStripeStep } from "./onboarding-steps/ConnectStripe"; -import { CreateSecretKey } from "./onboarding-steps/CreateSecretKey"; import AttachProduct from "./onboarding-steps/AttachProduct"; import CheckAccessStep from "./onboarding-steps/CheckAccess"; import Install from "./onboarding-steps/Install"; import LoadingScreen from "../general/LoadingScreen"; -import { ProductList } from "./onboarding-steps/ProductList"; -import { useCreateOrg } from "./hooks/useCreateOrg"; -import EnvStep from "./onboarding-steps/Env"; -import MountHandler from "./onboarding-steps/MountHandler"; -import { SampleApp } from "./onboarding-steps/SampleApp"; import IntegrationGuideStep from "./onboarding-steps/IntegrationGuide"; import AutumnProviderStep from "./onboarding-steps/AutumnProvider"; + +import { useState, useEffect, useRef } from "react"; +import { useSearchParams } from "react-router"; +import { useAxiosSWR } from "@/services/useAxiosSwr"; +import { useEnv } from "@/utils/envUtils"; +import { Book } from "lucide-react"; +import { ConnectStripeStep } from "./onboarding-steps/ConnectStripe"; +import { CreateSecretKey } from "./onboarding-steps/CreateSecretKey"; +import { ProductList } from "./onboarding-steps/ProductList"; +import { SampleApp } from "./onboarding-steps/SampleApp"; import { AutumnProvider } from "autumn-js/react"; +import { useSession } from "@/lib/auth-client"; +import { useAxiosInstance } from "@/services/useAxiosInstance"; function OnboardingView() { const env = useEnv(); - const { organization: org } = useOrganization(); const [searchParams] = useSearchParams(); - + const token = searchParams.get("token"); const [apiKey, setApiKey] = useState(""); const [showIntegrationSteps, setShowIntegrationSteps] = useState(false); - - const hasHandledToken = useRef(false); - const axiosInstance = useAxiosInstance(); - const token = searchParams.get("token"); const [loading, setLoading] = useState(true); - const { getToken } = useAuth(); + const { data } = useSession(); + + const axiosInstance = useAxiosInstance(); + const hasHandledToken = useRef(false); + + const orgId = data?.session?.activeOrganizationId; const { data: productData, @@ -48,12 +48,10 @@ function OnboardingView() { withAuth: true, }); - useCreateOrg({ productMutate }); - useEffect(() => { const handleToken = async () => { try { - const { data } = await axiosInstance.post("/onboarding", { + await axiosInstance.post("/onboarding", { token, }); @@ -65,17 +63,17 @@ function OnboardingView() { } }; - if (org && token && !hasHandledToken.current) { + if (token && !hasHandledToken.current) { hasHandledToken.current = true; handleToken(); } - }, [org, searchParams, token, axiosInstance, productMutate]); + }, [searchParams, token, axiosInstance, productMutate]); useEffect(() => { - if (org && !token) { + if (orgId && !token) { setLoading(false); } - }, [org, token]); + }, [orgId, token]); if (loading || productLoading) { return
-
-
- - 👋 - - Welcome to Autumn - -
-- Create an organization to get started and integrate pricing within 5 - minutes. -
- - } - > - {/* */}
-
*/}
-
- {
- const newFields = { ...fields, name: e.target.value };
- setFields(newFields);
- }}
- />
- }
- >
- Create Organization
-
+// await setActive({ organization: org.id });
+// // await pollForOrg();
+// toast.success(`Created your organization: ${org.name}`);
+// setIsExploding(true);
+// } catch (error: any) {
+// if (error.message) {
+// toast.error(error.message);
+// } else {
+// toast.error("Error creating organization");
+// }
+// }
+// setLoading(false);
+// };
- {isExploding && (
- {
- console.log("complete");
- }}
- />
- )}
-
- {/*
+//
+//
+// +// 👋 +// +// Welcome to Autumn +// +//
+//+// Create an organization to get started and integrate pricing within 5 +// minutes. +//
+// +// } +// > +// {/* */}
+//
*/}
+//
+// {
+// const newFields = { ...fields, name: e.target.value };
+// setFields(newFields);
+// }}
+// />
+// }
+// >
+// Create Organization
+//
+
+// {isExploding && (
+// {
+// console.log("complete");
+// }}
+// />
+// )}
+//
+// {/*
{/*
Rates
*/} -
+
Fixed Price
-
diff --git a/vite/src/views/products/product/product-item/CreateProductItem.tsx b/vite/src/views/products/product/product-item/CreateProductItem.tsx
index d0de8ffb9..787b6f212 100644
--- a/vite/src/views/products/product/product-item/CreateProductItem.tsx
+++ b/vite/src/views/products/product/product-item/CreateProductItem.tsx
@@ -107,12 +107,10 @@ export function CreateProductItem() {
-
+
{
@@ -45,29 +34,11 @@ function CreateFixedPrice({
className="h-full !text-lg min-w-36"
/>
- {org?.default_currency.toUpperCase() || "USD"}
+ {org?.default_currency?.toUpperCase() || "USD"}
- {/* Billing Cycle
- */}
+
{showCreateFeature && (
-
+
{showCreateFeature ||
(features.length == 0 && item.price === null) ? (
@@ -138,7 +136,7 @@ export function CreateProductItem() {
/>
) : (
-
+
1 && "w-2xl",
)}
>
{!show.feature ? (
-
+
+