⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
refactor(web): move public environment variables to the config route
daniel31x134f79dcff17fb
diff --git a/apps/web/components/ModalContent/EmailChangeVerificationModal.tsx b/apps/web/components/ModalContent/EmailChangeVerificationModal.tsxindex 68fd6c1c..0320bc2e 100644--- a/apps/web/components/ModalContent/EmailChangeVerificationModal.tsx+++ b/apps/web/components/ModalContent/EmailChangeVerificationModal.tsx@@ -4,6 +4,7 @@ import Modal from "../Modal";import { useTranslation } from "next-i18next";import { Button } from "../ui/button";import { Separator } from "../ui/separator";+import { useConfig } from "@linkwarden/router/config";type Props = {onClose: Function;@@ -20,6 +21,7 @@ export default function EmailChangeVerificationModal({}: Props) {const { t } = useTranslation();const [password, setPassword] = useState("");+ const { data: config } = useConfig();return (<Modal toggleModal={onClose}>@@ -30,13 +32,12 @@ export default function EmailChangeVerificationModal({<div className="flex flex-col gap-5"><p>{t("password_change_warning")}- {process.env.NEXT_PUBLIC_STRIPE === "true" && t("stripe_update_note")}+ {config?.STRIPE_ENABLED && t("stripe_update_note")}</p><p>{t("sso_will_be_removed_warning", {- service:- process.env.NEXT_PUBLIC_GOOGLE_ENABLED === "true" ? "Google" : "",+ service: config?.GOOGLE_ENABLED ? "Google" : "",})}</p>diff --git a/apps/web/components/SettingsSidebar.tsx b/apps/web/components/SettingsSidebar.tsxindex ffec4f64..d2be53e1 100644--- a/apps/web/components/SettingsSidebar.tsx+++ b/apps/web/components/SettingsSidebar.tsx@@ -1,5 +1,6 @@import { useTranslation } from "next-i18next";import { useUser } from "@linkwarden/router/user";+import { useConfig } from "@linkwarden/router/config";import SecondarySidebar, {SecondarySidebarLink,} from "@/components/SecondarySidebar";@@ -15,6 +16,7 @@ export default function SettingsSidebar({}) {const { t } = useTranslation();const { data: user } = useUser();+ const { data: config } = useConfig();const links: SecondarySidebarLink[] = [{@@ -44,7 +46,7 @@ export default function SettingsSidebar({},];- if (process.env.NEXT_PUBLIC_STRIPE && !user?.parentSubscriptionId) {+ if (config?.STRIPE_ENABLED && !user?.parentSubscriptionId) {links.push({title: t("billing"),href: "/settings/billing",diff --git a/apps/web/components/TrialBanner.tsx b/apps/web/components/TrialBanner.tsxindex 388c0f11..27fbd3e4 100644--- a/apps/web/components/TrialBanner.tsx+++ b/apps/web/components/TrialBanner.tsx@@ -2,14 +2,15 @@ import { useEffect, useState } from "react";import Link from "next/link";import { useTranslation } from "next-i18next";import { useUser } from "@linkwarden/router/user";--const STRIPE_ENABLED = process.env.NEXT_PUBLIC_STRIPE === "true";-const TRIAL_PERIOD_DAYS =- Number(process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS) || 14;+import { useConfig } from "@linkwarden/router/config";export default function TrialBanner() {const { t } = useTranslation();const { data: user } = useUser();+ const { data: config } = useConfig();++ const STRIPE_ENABLED = Boolean(config?.STRIPE_ENABLED);+ const TRIAL_PERIOD_DAYS = config?.TRIAL_PERIOD_DAYS || 14;const [daysLeft, setDaysLeft] = useState<number>(0);const [isTrialing, setIsTrialing] = useState<boolean>(false);@@ -22,7 +23,7 @@ export default function TrialBanner() {setDaysLeft(Math.floor((trialEndTime - Date.now()) / 86400000));}- }, [user]);+ }, [user, config]);useEffect(() => {const isTrialing =diff --git a/apps/web/components/UserListing.tsx b/apps/web/components/UserListing.tsxindex 04a294ee..29f49c2f 100644--- a/apps/web/components/UserListing.tsx+++ b/apps/web/components/UserListing.tsx@@ -37,7 +37,7 @@ const UserListing: React.FC<UserListingProps> = ({<th></th><th>{t("username")}</th>{config?.EMAIL_PROVIDER && <th>{t("email")}</th>}- {process.env.NEXT_PUBLIC_STRIPE === "true" && (+ {config?.STRIPE_ENABLED && (<th>{t("subscribed")}</th>)}<th>{t("created_at")}</th>@@ -55,7 +55,7 @@ const UserListing: React.FC<UserListingProps> = ({{user.username ? user.username : <b>{t("not_available")}</b>}</td>{config?.EMAIL_PROVIDER && <td>{user.email}</td>}- {process.env.NEXT_PUBLIC_STRIPE === "true" && (+ {config?.STRIPE_ENABLED && (<td>{user.subscriptions?.active ? (<i className="bi bi-check text-green-500"></i>diff --git a/apps/web/layouts/AuthRedirect.tsx b/apps/web/layouts/AuthRedirect.tsxindex 8715fa6f..00e5321e 100644--- a/apps/web/layouts/AuthRedirect.tsx+++ b/apps/web/layouts/AuthRedirect.tsx@@ -4,20 +4,22 @@ import { useSession } from "next-auth/react";import useInitialData from "@/hooks/useInitialData";import useTheme from "@/hooks/useTheme";import { useUser } from "@linkwarden/router/user";+import { useConfig } from "@linkwarden/router/config";interface Props {children: ReactNode;}-const STRIPE_ENABLED = process.env.NEXT_PUBLIC_STRIPE === "true";-const TRIAL_PERIOD_DAYS = process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS || 14;-const REQUIRE_CC = process.env.NEXT_PUBLIC_REQUIRE_CC === "true";-export default function AuthRedirect({ children }: Props) {const router = useRouter();const { status } = useSession();const [shouldRenderChildren, setShouldRenderChildren] = useState(false);const { data: user } = useUser();+ const { data: config } = useConfig();++ const STRIPE_ENABLED = Boolean(config?.STRIPE_ENABLED);+ const TRIAL_PERIOD_DAYS = config?.TRIAL_PERIOD_DAYS || 14;+ const REQUIRE_CC = Boolean(config?.REQUIRE_CC);useInitialData();useTheme();@@ -80,7 +82,7 @@ export default function AuthRedirect({ children }: Props) {setShouldRenderChildren(true);}}- }, [status, user, router.pathname]);+ }, [status, user, config, router.pathname]);function redirectTo(destination: string) {router.push(destination).then(() => setShouldRenderChildren(true));diff --git a/apps/web/pages/api/v1/config/index.ts b/apps/web/pages/api/v1/config/index.tsindex bcc7e32b..fb9e2d38 100644--- a/apps/web/pages/api/v1/config/index.ts+++ b/apps/web/pages/api/v1/config/index.ts@@ -30,9 +30,21 @@ export const getEnvData = () => {process.env.NEXT_PUBLIC_STRIPE === "true" ||Boolean(process.env.STRIPE_SECRET_KEY) ||null,+ STRIPE_BILLING_PORTAL_URL:+ process.env.NEXT_PUBLIC_STRIPE_BILLING_PORTAL_URL || null,TRIAL_PERIOD_DAYS:Number(process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS) || null,REQUIRE_CC: process.env.NEXT_PUBLIC_REQUIRE_CC === "true" || null,+ DEMO: process.env.NEXT_PUBLIC_DEMO === "true" || null,+ DEMO_USERNAME:+ (process.env.NEXT_PUBLIC_DEMO === "true" &&+ process.env.NEXT_PUBLIC_DEMO_USERNAME) ||+ null,+ DEMO_PASSWORD:+ (process.env.NEXT_PUBLIC_DEMO === "true" &&+ process.env.NEXT_PUBLIC_DEMO_PASSWORD) ||+ null,+ GOOGLE_ENABLED: process.env.NEXT_PUBLIC_GOOGLE_ENABLED === "true" || null,MOBILE_APP_REDIRECT_ENABLED:process.env.NEXT_PUBLIC_MOBILE_APP_REDIRECT_ENABLED === "true" || null,};diff --git a/apps/web/pages/auth/verify.tsx b/apps/web/pages/auth/verify.tsxindex 754f3e74..9be75fd5 100644--- a/apps/web/pages/auth/verify.tsx+++ b/apps/web/pages/auth/verify.tsx@@ -4,14 +4,17 @@ import { useTranslation } from "next-i18next";import CenteredForm from "@/components/CenteredForm";import { Button } from "@/components/ui/button";import getServerSideProps from "@/lib/client/getServerSideProps";--const MOBILE_APP_REDIRECT_ENABLED =- process.env.NEXT_PUBLIC_MOBILE_APP_REDIRECT_ENABLED === "true";+import { useConfig } from "@linkwarden/router/config";export default function Verify() {const router = useRouter();const { t } = useTranslation();const [isMobile, setIsMobile] = useState(false);+ const { data: config } = useConfig();++ const MOBILE_APP_REDIRECT_ENABLED = Boolean(+ config?.MOBILE_APP_REDIRECT_ENABLED+ );const token =typeof router.query.token === "string" ? router.query.token : "";@@ -30,7 +33,7 @@ export default function Verify() {)}`;useEffect(() => {- if (!router.isReady) return;+ if (!router.isReady || !config) return;if (!token || !email) {router.push("/login");@@ -45,7 +48,7 @@ export default function Verify() {} else {window.location.replace(webUrl);}- }, [router.isReady]);+ }, [router.isReady, config]);if (isMobile && MOBILE_APP_REDIRECT_ENABLED)return (diff --git a/apps/web/pages/dashboard.tsx b/apps/web/pages/dashboard.tsxindex dace7452..935c67c0 100644--- a/apps/web/pages/dashboard.tsx+++ b/apps/web/pages/dashboard.tsx@@ -11,6 +11,7 @@ import { useTranslation } from "next-i18next";import { useCollections } from "@linkwarden/router/collections";import { useDashboardData } from "@linkwarden/router/dashboardData";import { useUpdateUser, useUser } from "@linkwarden/router/user";+import { useConfig } from "@linkwarden/router/config";import SurveyModal from "@/components/ModalContent/SurveyModal";import ImportDropdown from "@/components/ImportDropdown";import { Button } from "@/components/ui/button";@@ -43,6 +44,7 @@ const Page: NextPageWithLayout = () => {} = useDashboardData();const { data: user } = useUser();+ const { data: config } = useConfig();const [numberOfLinks, setNumberOfLinks] = useState(0);@@ -70,7 +72,7 @@ const Page: NextPageWithLayout = () => {useEffect(() => {if (- process.env.NEXT_PUBLIC_STRIPE === "true" &&+ config?.STRIPE_ENABLED &&user &&user.id &&user.referredBy === null &&@@ -82,7 +84,7 @@ const Page: NextPageWithLayout = () => {setShowsSurveyModal(true);}, 1000);}- }, [user]);+ }, [user, config]);const orderedSections = useMemo(() => {return [...dashboardSections].sort((a, b) => {diff --git a/apps/web/pages/login.tsx b/apps/web/pages/login.tsxindex 7b67af4b..c1a70b3f 100644--- a/apps/web/pages/login.tsx+++ b/apps/web/pages/login.tsx@@ -14,6 +14,7 @@ import { prisma } from "@linkwarden/prisma";import { useTranslation } from "next-i18next";import { useRouter } from "next/router";import { Separator } from "@/components/ui/separator";+import { useConfig } from "@linkwarden/router/config";interface FormData {username: string;@@ -27,6 +28,8 @@ export default function Login({const router = useRouter();+ const { data: config } = useConfig();+const [submitLoader, setSubmitLoader] = useState(false);const [form, setForm] = useState<FormData>({@@ -88,9 +91,9 @@ export default function Login({if (availableLogins.credentialsEnabled === "true") {return (<>- {process.env.NEXT_PUBLIC_DEMO === "true" &&- process.env.NEXT_PUBLIC_DEMO_USERNAME &&- process.env.NEXT_PUBLIC_DEMO_PASSWORD && (+ {config?.DEMO &&+ config?.DEMO_USERNAME &&+ config?.DEMO_PASSWORD && (<div className="p-3 shadow-lg border border-primary rounded-xl"><div className="flex flex-col gap-2 items-center text-center w-full"><div className="flex items-center gap-2">@@ -128,14 +131,12 @@ export default function Login({const load = toast.loading(t("authenticating"));setForm({- username: process.env- .NEXT_PUBLIC_DEMO_USERNAME as string,- password: process.env- .NEXT_PUBLIC_DEMO_PASSWORD as string,+ username: config?.DEMO_USERNAME as string,+ password: config?.DEMO_PASSWORD as string,});await signIn("credentials", {- username: process.env.NEXT_PUBLIC_DEMO_USERNAME,- password: process.env.NEXT_PUBLIC_DEMO_PASSWORD,+ username: config?.DEMO_USERNAME,+ password: config?.DEMO_PASSWORD,redirect: false,});diff --git a/apps/web/pages/member-onboarding.tsx b/apps/web/pages/member-onboarding.tsxindex 14fe9da4..29134b01 100644--- a/apps/web/pages/member-onboarding.tsx+++ b/apps/web/pages/member-onboarding.tsx@@ -8,6 +8,7 @@ import { toast } from "react-hot-toast";import getServerSideProps from "@/lib/client/getServerSideProps";import { useTranslation } from "next-i18next";import { useUpdateUser, useUser } from "@linkwarden/router/user";+import { useConfig } from "@linkwarden/router/config";interface FormData {password: string;@@ -25,6 +26,7 @@ export default function MemberOnboarding() {});const { data: user } = useUser();+ const { data: config } = useConfig();const updateUser = useUpdateUser();async function submit(event: FormEvent<HTMLFormElement>) {@@ -96,7 +98,7 @@ export default function MemberOnboarding() {/></div>- {process.env.NEXT_PUBLIC_STRIPE && (+ {config?.STRIPE_ENABLED && (<div className="text-xs text-neutral text-center"><p>By continuing, you agree to our{" "}diff --git a/apps/web/pages/register.tsx b/apps/web/pages/register.tsxindex 85c298ae..0e1105d1 100644--- a/apps/web/pages/register.tsx+++ b/apps/web/pages/register.tsx@@ -149,9 +149,9 @@ export default function Register({<CenteredFormheader={t("reimagine_how_you_save_links")}text={- process.env.NEXT_PUBLIC_STRIPE+ config?.STRIPE_ENABLED? t("trial_offer_desc", {- count: Number(process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS || 14),+ count: config?.TRIAL_PERIOD_DAYS || 14,}): t("register_desc")}@@ -213,7 +213,7 @@ export default function Register({/></div>- {process.env.NEXT_PUBLIC_STRIPE && (+ {config?.STRIPE_ENABLED && (<><CheckboxclassName="p-0"@@ -249,7 +249,7 @@ export default function Register({{displayLoginExternalButton()}- {process.env.NEXT_PUBLIC_STRIPE && (+ {config?.STRIPE_ENABLED && (<div className="text-xs text-neutral text-center"><p>By continuing, you agree to our{" "}@@ -284,7 +284,7 @@ export default function Register({{t("login")}</Link></div>- {process.env.NEXT_PUBLIC_STRIPE && (+ {config?.STRIPE_ENABLED && (<div className="text-neutral text-center flex items-baseline gap-1 justify-center"><p>{t("need_help")}</p><Linkdiff --git a/apps/web/pages/settings/account.tsx b/apps/web/pages/settings/account.tsxindex 0c218783..32463e0e 100644--- a/apps/web/pages/settings/account.tsx+++ b/apps/web/pages/settings/account.tsx@@ -338,8 +338,7 @@ const Page: NextPageWithLayout = () => {<p>{t("delete_account_warning")}- {process.env.NEXT_PUBLIC_STRIPE &&- " " + t("cancel_subscription_notice")}+ {config?.STRIPE_ENABLED && " " + t("cancel_subscription_notice")}</p></div>diff --git a/apps/web/pages/settings/billing.tsx b/apps/web/pages/settings/billing.tsxindex 24faa836..2fba8fe5 100644--- a/apps/web/pages/settings/billing.tsx+++ b/apps/web/pages/settings/billing.tsx@@ -21,6 +21,7 @@ import {import { Button } from "@/components/ui/button";import { Separator } from "@/components/ui/separator";import { NextPageWithLayout } from "../_app";+import { useConfig } from "@linkwarden/router/config";interface User extends U {subscriptions: {@@ -33,17 +34,20 @@ type UserModal = {userId: number | null;};-const TRIAL_PERIOD_DAYS = process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS || 14;-const Page: NextPageWithLayout = () => {const router = useRouter();const { t } = useTranslation();const { data: account } = useUser();const { data: users = [] } = useUsers();+ const { data: config } = useConfig();++ const TRIAL_PERIOD_DAYS = config?.TRIAL_PERIOD_DAYS || 14;useEffect(() => {- if (!process.env.NEXT_PUBLIC_STRIPE || account?.parentSubscriptionId) {+ if (!config) return;++ if (!config.STRIPE_ENABLED || account?.parentSubscriptionId) {router.push("/settings/account");} else if (account?.createdAt) {const trialEndTime =@@ -56,7 +60,7 @@ const Page: NextPageWithLayout = () => {router.push("/subscribe");}}- }, [account]);+ }, [account, config]);const [searchQuery, setSearchQuery] = useState("");const [filteredUsers, setFilteredUsers] = useState<User[]>();@@ -105,7 +109,7 @@ const Page: NextPageWithLayout = () => {<p className="text-md">{t("manage_subscription_intro")}{" "}<a- href={process.env.NEXT_PUBLIC_STRIPE_BILLING_PORTAL_URL}+ href={config?.STRIPE_BILLING_PORTAL_URL || undefined}className="underline"target="_blank">@@ -177,10 +181,10 @@ const Page: NextPageWithLayout = () => {<table className="table bg-base-300 rounded-md"><thead><tr className="sm:table-row hidden border-b-neutral-content">- {process.env.NEXT_PUBLIC_EMAIL_PROVIDER === "true" && (+ {config?.EMAIL_PROVIDER && (<th>{t("email")}</th>)}- {process.env.NEXT_PUBLIC_STRIPE === "true" && (+ {config?.STRIPE_ENABLED && (<th>{t("status")}</th>)}<th>{t("date_added")}</th>@@ -197,7 +201,7 @@ const Page: NextPageWithLayout = () => {"hover:bg-neutral-content hover:bg-opacity-30")}>- {process.env.NEXT_PUBLIC_EMAIL_PROVIDER === "true" && (+ {config?.EMAIL_PROVIDER && (<tdclassName="truncate max-w-full"title={user.email || ""}@@ -208,7 +212,7 @@ const Page: NextPageWithLayout = () => {<p>{user.email}</p></td>)}- {process.env.NEXT_PUBLIC_STRIPE === "true" && (+ {config?.STRIPE_ENABLED && (<td><p className="sm:hidden block text-neutral text-xs font-bold mb-2">{t("status")}diff --git a/apps/web/pages/subscribe.tsx b/apps/web/pages/subscribe.tsxindex 45909d77..67ce88eb 100644--- a/apps/web/pages/subscribe.tsx+++ b/apps/web/pages/subscribe.tsx@@ -16,10 +16,7 @@ import {DropdownMenuTrigger,} from "@/components/ui/dropdown-menu";import DeleteOwnAccountModal from "@/components/ModalContent/DeleteOwnAccountModal";--const TRIAL_PERIOD_DAYS =- Number(process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS) || 14;-const REQUIRE_CC = process.env.NEXT_PUBLIC_REQUIRE_CC === "true";+import { useConfig } from "@linkwarden/router/config";export default function Subscribe() {const { t } = useTranslation();@@ -32,6 +29,10 @@ export default function Subscribe() {const router = useRouter();const { data: user } = useUser();+ const { data: config } = useConfig();++ const TRIAL_PERIOD_DAYS = config?.TRIAL_PERIOD_DAYS || 14;+ const REQUIRE_CC = Boolean(config?.REQUIRE_CC);const [daysLeft, setDaysLeft] = useState<number>(0);@@ -43,7 +44,7 @@ export default function Subscribe() {setDaysLeft(Math.floor((trialEndTime - Date.now()) / 86400000));}- }, [user]);+ }, [user, config]);useEffect(() => {if (@@ -73,9 +74,7 @@ export default function Subscribe() {className="bg-gradient-to-b from-[#289DF220] to-transparent"text={REQUIRE_CC && user?.subscription?.provider === undefined- ? `Start with a ${- process.env.NEXT_PUBLIC_TRIAL_PERIOD_DAYS || 14- }-day free trial, cancel anytime!`+ ? `Start with a ${TRIAL_PERIOD_DAYS}-day free trial, cancel anytime!`: !REQUIRE_CC && daysLeft > 0? `You have ${daysLeft} ${daysLeft === 1 ? "day" : "days"diff --git a/packages/router/config.tsx b/packages/router/config.tsxindex 596e9869..7ee7bca3 100644--- a/packages/router/config.tsx+++ b/packages/router/config.tsx@@ -11,8 +11,14 @@ export type Config = {AI_ENABLED: boolean | null;INSTANCE_VERSION: string | null;STRIPE_ENABLED: boolean | null;+ STRIPE_BILLING_PORTAL_URL: string | null;TRIAL_PERIOD_DAYS: number | null;REQUIRE_CC: boolean | null;+ DEMO: boolean | null;+ DEMO_USERNAME: string | null;+ DEMO_PASSWORD: string | null;+ GOOGLE_ENABLED: boolean | null;+ MOBILE_APP_REDIRECT_ENABLED: boolean | null;};const normalizeVersion = (version?: string | null) => {