Merge pull request #312 from giselles-ai/remove-unneeded-feature-flags

Remove unneeded feature flags: freePlanFlag, proTeamPlanFlag, teamCreationFlag

.env.example

@@ -12,9 +12,6 @@ DEBUG_FLAG="true"
 VIEW_FLAG="true"
 GITHUB_INTEGRATION_FLAG="true"
 PLAYGROUND_V2_FLAG="true"
-FREE_PLAN_FLAG="true"
-PRO_TEAM_PLAN_FLAG="true"
-TEAM_CREATION_FLAG="true"
 DEVELOPER_FLAG="true"
 
 # @vercel/blob https://vercel.com/docs/storage/vercel-blob/using-blob-sdk

app/(main)/layout.tsx

@@ -1,5 +1,4 @@
 import { GiselleLogo } from "@/components/giselle-logo";
-import { proTeamPlanFlag, teamCreationFlag } from "@/flags";
 import { UserButton } from "@/services/accounts/components";
 import TeamCreation from "@/services/teams/components/team-creation";
 import { TeamSelection } from "@/services/teams/components/team-selection";
@@ -8,9 +7,6 @@ import type { ReactNode } from "react";
 import { Nav } from "./nav";
 
 export default async function Layout({ children }: { children: ReactNode }) {
-	const proTeamPlan = await proTeamPlanFlag();
-	const teamCreation = await teamCreationFlag();
-
 	return (
 		<div className="h-screen overflow-y-hidden bg-black-100 divide-y divide-black-80 flex flex-col">
 			<header className="h-[60px] flex items-center px-[24px] justify-between">
@@ -21,12 +17,8 @@ export default async function Layout({ children }: { children: ReactNode }) {
 					<Nav />
 				</div>
 				<div className="flex items-center gap-4">
-					{proTeamPlan && (
-						<>
-							<TeamSelection />
-							{teamCreation && <TeamCreation />}
-						</>
-					)}
+					<TeamSelection />
+					<TeamCreation />
 					<UserButton />
 				</div>
 			</header>

app/(main)/settings/layout.tsx

@@ -1,5 +1,5 @@
-import { freePlanFlag, githubIntegrationFlag, proTeamPlanFlag } from "@/flags";
-import { CreditCardIcon, UserIcon, UsersIcon } from "lucide-react";
+import { githubIntegrationFlag } from "@/flags";
+import { UserIcon, UsersIcon } from "lucide-react";
 import type { ReactNode } from "react";
 import { IntegrationIcon } from "./components/integration-icon";
 import { MenuLink } from "./components/menu-link";
@@ -8,8 +8,6 @@ export default async function SettingLayout({
 	children,
 }: { children: ReactNode }) {
 	const displayGitHubIntegration = await githubIntegrationFlag();
-	const displayFreePlan = await freePlanFlag();
-	const displayProTeamPlan = await proTeamPlanFlag();
 
 	return (
 		<div className="flex divide-x divide-black-80 h-full">
@@ -32,22 +30,12 @@ export default async function SettingLayout({
 							Integration
 						</MenuLink>
 					)}
-					{!displayFreePlan && (
-						<MenuLink
-							href="/settings/billing"
-							icon={<CreditCardIcon className="w-4 h-4" />}
-						>
-							Billing
-						</MenuLink>
-					)}
-					{displayFreePlan && (
-						<MenuLink
-							href="/settings/team"
-							icon={<UsersIcon className="w-4 h-4" />}
-						>
-							Team
-						</MenuLink>
-					)}
+					<MenuLink
+						href="/settings/team"
+						icon={<UsersIcon className="w-4 h-4" />}
+					>
+						Team
+					</MenuLink>
 				</div>
 			</div>
 			<div className="px-[48px] py-[32px] flex-1">{children}</div>

app/(main)/settings/team/billing-section.tsx

@@ -1,6 +1,5 @@
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
-import { proTeamPlanFlag } from "@/flags";
 import { fetchCurrentTeam, isProPlan } from "@/services/teams";
 import { manageBilling } from "@/services/teams/actions/manage-billing";
 import { upgradeTeam } from "@/services/teams/actions/upgrade-team";
@@ -12,7 +11,6 @@ import { LocalDateTime } from "./components/local-date-time";
 
 export default async function BillingSection() {
 	const team = await fetchCurrentTeam();
-	const proTeamPlan = await proTeamPlanFlag();
 
 	return (
 		<Card title="Billing">
@@ -30,7 +28,7 @@ export default async function BillingSection() {
 					)}
 				</div>
 
-				{proTeamPlan && team.type !== "internal" && (
+				{team.type !== "internal" && (
 					<form>
 						<Suspense
 							fallback={<Skeleton className="h-10 w-[120px] rounded-md" />}

drizzle/schema.ts

@@ -104,14 +104,6 @@ export const supabaseUserMappings = pgTable("supabase_user_mappings", {
 	supabaseUserId: text("supabase_user_id").notNull().unique(),
 });
 
-export const stripeUserMappings = pgTable("stripe_user_mappings", {
-	userDbId: integer("user_db_id")
-		.notNull()
-		.unique()
-		.references(() => users.dbId),
-	stripeCustomerId: text("stripe_customer_id").notNull().unique(),
-});
-
 export type TeamRole = "admin" | "member";
 export const teamMemberships = pgTable(
 	"team_memberships",

flags.ts

@@ -52,20 +52,6 @@ export const githubIntegrationFlag = flag<boolean>({
 	],
 });
 
-export const freePlanFlag = flag<boolean>({
-	key: "free-plan",
-	async decide() {
-		return true;
-		// return takeLocalEnv("FREE_PLAN_FLAG");
-	},
-	description: "Enable Free Plan",
-	defaultValue: false,
-	options: [
-		{ value: false, label: "disable" },
-		{ value: true, label: "Enable" },
-	],
-});
-
 export const playgroundV2Flag = flag<boolean>({
 	key: "playground-v2",
 	async decide() {
@@ -92,34 +78,6 @@ export const googleOauthFlag = flag<boolean>({
 	],
 });
 
-export const proTeamPlanFlag = flag<boolean>({
-	key: "pro-team-plan",
-	async decide() {
-		return true;
-		// return takeLocalEnv("PRO_TEAM_PLAN_FLAG");
-	},
-	description: "Enable Pro Team Plan",
-	defaultValue: false,
-	options: [
-		{ value: false, label: "disable" },
-		{ value: true, label: "Enable" },
-	],
-});
-
-export const teamCreationFlag = flag<boolean>({
-	key: "team-creation",
-	async decide() {
-		return true;
-		// return takeLocalEnv("TEAM_CREATION_FLAG");
-	},
-	description: "Enable Team Creation",
-	defaultValue: false,
-	options: [
-		{ value: false, label: "disable" },
-		{ value: true, label: "Enable" },
-	],
-});
-
 export const developerFlag = flag<boolean>({
 	key: "developer",
 	async decide() {

middleware.ts

@@ -1,8 +1,5 @@
-import { retrieveActiveStripeSubscriptionBySupabaseUserId } from "@/services/accounts/actions";
 import { NextResponse } from "next/server";
-import { freePlanFlag } from "./flags";
 import { supabaseMiddleware } from "./lib/supabase";
-import { isEmailFromRoute06 } from "./lib/utils";
 
 export default supabaseMiddleware(async (user, request) => {
 	if (user == null) {
@@ -11,28 +8,7 @@ export default supabaseMiddleware(async (user, request) => {
 		url.pathname = "/login";
 		return NextResponse.redirect(url);
 	}
-
-	// Users can use giselle without subscription if the free plan is enabled
-	const freePlanEnabled = await freePlanFlag();
-	if (freePlanEnabled) {
-		return;
-	}
-
-	// Proceeding to check the user's subscription status since the email is not from the route06.co.jp
-	if (!isEmailFromRoute06(user.email ?? "")) {
-		const subscription = await retrieveActiveStripeSubscriptionBySupabaseUserId(
-			user.id,
-		);
-		if (subscription == null) {
-			const url = request.nextUrl.clone();
-			// We are planning a pricing revision.
-			// Temporarily hide new signups until the new plan is ready.
-			// url.pathname = "/subscriptions/checkout";
-			url.pathname = "/subscriptions/coming-soon";
-			return NextResponse.redirect(url);
-		}
-		/** @todo Validate subscription status */
-	}
+	return;
 });
 
 export const config = {

migrations/0026_military_spirit.sql

@@ -0,0 +1 @@
+DROP TABLE "stripe_user_mappings";