feat: premium plan for all (#10361)

* feat: removed premium plan * fix: failing test
EddieHubCommunity · May 13, 2024 · bb4383d · bb4383d
1 parent 8da58a5
commit bb4383d
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 89 deletions.
diff --git a/components/layouts/MultiLayout.js b/components/layouts/MultiLayout.js
@@ -8,9 +8,7 @@ export default function MultiLayout({ settings, children }) {
     <>
       <SkipLink />
       <div className="flex flex-col min-h-screen">
-        {(!settings ||
-          settings.type === "free" ||
-          (settings.type === "premium" && !settings.hideNavbar)) && (
+        {(!settings || !settings.hideNavbar) && (
           <>
             <Alert />
             <Navbar />
@@ -19,9 +17,7 @@ export default function MultiLayout({ settings, children }) {
         <main id="main" className="flex-1 dark:bg-dark-2 dark:z-40">
           {children}
         </main>
-        {(!settings ||
-          settings.type === "free" ||
-          (settings.type === "premium" && !settings.hideFooter)) && <Footer />}
+        {(!settings || !settings.hideFooter) && <Footer />}
       </div>
     </>
   );

diff --git a/middleware.js b/middleware.js
@@ -54,7 +54,6 @@ export async function middleware(req) {
 
     if (
       profile?.username &&
-      profile.user.type === "premium" &&
       profile.settings?.domain &&
       profile.settings.domain === hostname
     ) {

diff --git a/pages/account/manage/premium.js b/pages/account/manage/premium.js
@@ -59,7 +59,7 @@ export default function ManageSettings({
   const [domain, setDomain] = useState(
     settings.domain?.replaceAll("|", ".") || "",
   ); // TODO: use getter/setter instead
-  const [enableForm] = useState(accountType === "premium" ? true : false);
+  const [enableForm] = useState(false);
 
   const handleSubmit = async (e) => {
     e.preventDefault();

diff --git a/pages/account/statistics/index.js b/pages/account/statistics/index.js
@@ -116,7 +116,7 @@ export default function Statistics({ data, profile, BASE_URL }) {
           </div>
         )}
 
-        {session && session.accountType === "premium" && profile.stats && (
+        {session && profile.stats && (
           <ul
             role="list"
             className="grid grid-cols-1 gap-x-6 gap-y-8 lg:grid-cols-2 xl:gap-x-8 mb-8"
@@ -208,14 +208,9 @@ export default function Statistics({ data, profile, BASE_URL }) {
               data.links.individual.map((link) => (
                 <tr key={link._id}>
                   <td className="md:whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-primary-high dark:text-primary-low sm:pl-6 text-ellipsis overflow-hidden">
-                    {session && session.accountType === "premium" && (
-                      <Link href={`/account/statistics/link/${link._id}`}>
-                        {link.url}
-                      </Link>
-                    )}
-                    {session && session.accountType === "free" && (
-                      <>{link.url}</>
-                    )}
+                    <Link href={`/account/statistics/link/${link._id}`}>
+                      {link.url}
+                    </Link>
                   </td>
                   <td className="whitespace-nowrap px-3 py-4 text-sm text-primary-medium dark:text-primary-low">
                     {abbreviateNumber(link.clicks)}

diff --git a/pages/account/statistics/link/[id].js b/pages/account/statistics/link/[id].js
@@ -19,14 +19,6 @@ const DynamicChart = dynamic(
 export async function getServerSideProps(context) {
   const { req, res } = context;
   const session = await getServerSession(req, res, authOptions);
-  if (session.accountType !== "premium") {
-    return {
-      redirect: {
-        destination: "/account/onboarding",
-        permanent: false,
-      },
-    };
-  }
 
   const username = session.username;
   const { status, profile } = await getUserApi(req, res, username);

diff --git a/pages/account/statistics/locations.js b/pages/account/statistics/locations.js
@@ -20,15 +20,6 @@ export async function getServerSideProps(context) {
   const { req, res } = context;
   const session = await getServerSession(req, res, authOptions);
 
-  if (session.accountType !== "premium") {
-    return {
-      redirect: {
-        destination: "/account/onboarding",
-        permanent: false,
-      },
-    };
-  }
-
   const username = session.username;
   const { status, profile } = await getUserApi(req, res, username);
   if (status !== 200) {

diff --git a/pages/account/statistics/referers.js b/pages/account/statistics/referers.js
@@ -20,15 +20,6 @@ export async function getServerSideProps(context) {
   const { req, res } = context;
   const session = await getServerSession(req, res, authOptions);
 
-  if (session.accountType !== "premium") {
-    return {
-      redirect: {
-        destination: "/account/onboarding",
-        permanent: false,
-      },
-    };
-  }
-
   const username = session.username;
   const { status, profile } = await getUserApi(req, res, username);
   if (status !== 200) {

diff --git a/pages/api/account/statistics/link/[id].js b/pages/api/account/statistics/link/[id].js
@@ -15,10 +15,6 @@ export default async function handler(req, res) {
       .json({ error: "Invalid request: GET request required" });
   }
 
-  if (session.accountType !== "premium") {
-    res.status(401).json({ message: "You must have a Premium account." });
-  }
-
   const data = await getStatsForLink(session.username, req.query.id);
   if (data.error) {
     res.status(400).json({ error: data.error });

diff --git a/pages/pricing.js b/pages/pricing.js
@@ -87,30 +87,9 @@ export default function Premium({ user }) {
             return "Join Premium plan";
           }
         },
-        action: () => {
-          if (user.isLoggedIn && user.accountType === "premium") {
-            return "/api/stripe";
-          }
-          if (user.isLoggedIn && user.accountType === "free") {
-            return "/api/stripe";
-          }
-          if (!user.isLoggedIn) {
-            return "/auth/signin";
-          }
-        },
-        isDisabled: () => {
-          if (user.isLoggedIn && user.accountType === "premium") {
-            return true;
-          }
-          return false;
-        },
-        onClick: () => {
-          if (typeof window !== "undefined" && window.localStorage) {
-            if (user.accountType !== "premium") {
-              localStorage.setItem("premium-intent", true);
-            }
-          }
-        },
+        action: () => "/auth/signin",
+        isDisabled: () => true,
+        onClick: () => {},
       },
     },
   ];

diff --git a/tests/account/stats/location.spec.js b/tests/account/stats/location.spec.js
@@ -18,15 +18,16 @@ test("Guest user cannot access premium locations stats", async ({
   await expect(page).toHaveURL("/auth/signin");
 });
 
-test("Logged in free user cannot access premium locations stats", async ({
-  browser,
-}) => {
-  const context = await login(browser);
-  const page = await context.newPage();
-  await page.goto("/account/statistics/locations");
-  await page.waitForLoadState("domcontentloaded");
-  await expect(page).toHaveURL(/account\/onboarding/);
-});
+// THIS PREMIUM IS BEING GIVEN TO EVERYONE
+// test("Logged in free user cannot access premium locations stats", async ({
+//   browser,
+// }) => {
+//   const context = await login(browser);
+//   const page = await context.newPage();
+//   await page.goto("/account/statistics/locations");
+//   await page.waitForLoadState("domcontentloaded");
+//   await expect(page).toHaveURL(/account\/onboarding/);
+// });
 
 test("Logged in premium user can access premium locations stats", async ({
   browser,

diff --git a/tests/account/stats/referer.spec.js b/tests/account/stats/referer.spec.js
@@ -16,15 +16,16 @@ test("Guest user cannot access premium referers stats", async ({ browser }) => {
   await expect(page).toHaveURL("/auth/signin");
 });
 
-test("Logged in free user cannot access premium referers stats", async ({
-  browser,
-}) => {
-  const context = await login(browser);
-  const page = await context.newPage();
-  await page.goto("/account/statistics/referers");
-  await page.waitForLoadState("domcontentloaded");
-  await expect(page).toHaveURL(/account\/onboarding/);
-});
+// THIS PREMIUM IS BEING GIVEN TO EVERYONE
+// test("Logged in free user cannot access premium referers stats", async ({
+//   browser,
+// }) => {
+//   const context = await login(browser);
+//   const page = await context.newPage();
+//   await page.goto("/account/statistics/referers");
+//   await page.waitForLoadState("domcontentloaded");
+//   await expect(page).toHaveURL(/account\/onboarding/);
+// });
 
 test("Logged in premium user can access premium referers stats", async ({
   browser,