@carlonicora/nextjs-jsonapi 1.84.0 → 1.86.0

package/dist/index.mjs

@@ -10,6 +10,7 @@ import {
   configureWaitlist,
   getApiUrl,
   getAppUrl,
+  getPublicApiUrl,
   getReferralConfig,
   getRoleId,
   getStripePublishableKey,
@@ -17,7 +18,7 @@ import {
   getWaitlistConfig,
   isReferralEnabled,
   isRolesConfigured
-} from "./chunk-PV5V6CVW.mjs";
+} from "./chunk-NEJ7CDM3.mjs";
 import {
   AVAILABLE_OAUTH_SCOPES,
   AbstractApiData,
@@ -392,6 +393,7 @@ export {
   getLucideIcon,
   getLucideIconByModule,
   getLucideIconByModuleName,
+  getPublicApiUrl,
   getReferralConfig,
   getRoleId,
   getStripePublishableKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carlonicora/nextjs-jsonapi",
-  "version": "1.84.0",
+  "version": "1.86.0",
   "description": "Next.js JSON:API client with server/client support and caching",
   "author": "Carlo Nicora",
   "license": "GPL-3.0-or-later",

package/src/client/config.ts

@@ -47,6 +47,11 @@ export function configureClientConfig(config: {
 
 /**
  * Get the configured API URL.
+ *
+ * This may resolve to an internal/private host (e.g. a docker-network
+ * hostname) when configured to do so for SSR fetches. Do NOT use this for
+ * URLs that are rendered into HTML and followed by the browser — use
+ * `getPublicApiUrl()` instead.
  */
 export function getApiUrl(): string {
   if (_clientConfig?.apiUrl) {
@@ -58,6 +63,21 @@ export function getApiUrl(): string {
   return "";
 }
 
+/**
+ * Get the public-facing API URL.
+ *
+ * Always sourced from `NEXT_PUBLIC_API_URL` so it is identical on server
+ * and client, and reachable from the user's browser. Use for any URL that
+ * gets rendered into HTML the browser will navigate to (links, redirects,
+ * OAuth hrefs).
+ */
+export function getPublicApiUrl(): string {
+  if (typeof process !== "undefined" && process.env?.NEXT_PUBLIC_API_URL) {
+    return process.env.NEXT_PUBLIC_API_URL;
+  }
+  return "";
+}
+
 /**
  * Get the configured app URL.
  */

package/src/components/forms/CommonEditorButtons.tsx

@@ -6,8 +6,9 @@ type CommonEditorButtonsProps = {
   form: any;
   disabled?: boolean;
   setOpen: (open: boolean) => void;
+  hideSubmit?: boolean;
 };
-export function CommonEditorButtons({ isEdit, form, disabled, setOpen }: CommonEditorButtonsProps) {
+export function CommonEditorButtons({ isEdit, form, disabled, setOpen, hideSubmit }: CommonEditorButtonsProps) {
   const t = useTranslations();
 
   return (
@@ -22,9 +23,11 @@ export function CommonEditorButtons({ isEdit, form, disabled, setOpen }: CommonE
         {t(`ui.buttons.cancel`)}
       </Button>
 
-      <Button type="submit" disabled={form.formState.isSubmitting || disabled} data-testid={`modal-button-create`}>
-        {isEdit ? t(`ui.buttons.confirm_update`) : t(`ui.buttons.confirm_create`)}
-      </Button>
+      {!hideSubmit && (
+        <Button type="submit" disabled={form.formState.isSubmitting || disabled} data-testid={`modal-button-create`}>
+          {isEdit ? t(`ui.buttons.confirm_update`) : t(`ui.buttons.confirm_create`)}
+        </Button>
+      )}
     </div>
   );
 }

package/src/components/forms/EditorSheet.tsx

@@ -51,6 +51,7 @@ export type EditorSheetProps<T extends FieldValues> = {
 
   size?: EditorSheetSize;
   disabled?: boolean;
+  hideSubmit?: boolean;
 
   trigger?: ReactNode;
   forceShow?: boolean;
@@ -78,6 +79,7 @@ export function EditorSheet<T extends FieldValues>({
   onNavigate,
   size = "xl",
   disabled,
+  hideSubmit,
   trigger,
   forceShow,
   onClose,
@@ -177,7 +179,13 @@ export function EditorSheet<T extends FieldValues>({
             <form onSubmit={form.handleSubmit(wrappedOnSubmit)} className="flex min-h-0 flex-1 flex-col">
               <div className="flex-1 overflow-y-auto px-6 py-4">{children}</div>
               <SheetFooter className="shrink-0 border-t px-6 py-4">
-                <CommonEditorButtons form={form} setOpen={handleOpenChange} isEdit={isEdit} disabled={disabled} />
+                <CommonEditorButtons
+                  form={form}
+                  setOpen={handleOpenChange}
+                  isEdit={isEdit}
+                  disabled={disabled}
+                  hideSubmit={hideSubmit}
+                />
               </SheetFooter>
             </form>
           </Form>

package/src/features/auth/components/buttons/GoogleSignInButton.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { getApiUrl } from "../../../../client/config";
+import { getPublicApiUrl } from "../../../../client/config";
 import { isGoogleAuthEnabled } from "../../../../login";
 import { Button, Link } from "../../../../shadcnui";
 
@@ -15,7 +15,7 @@ export function GoogleSignInButton({ referralCode }: GoogleSignInButtonProps) {
 
   // Build OAuth URL with referral parameter if available
   const buildGoogleOAuthUrl = (): string => {
-    const baseUrl = `${getApiUrl()}auth/google`;
+    const baseUrl = `${getPublicApiUrl()}auth/google`;
     if (!referralCode) return baseUrl;
     return `${baseUrl}?referral=${encodeURIComponent(referralCode)}`;
   };

package/src/features/auth/components/details/LandingComponent.tsx

@@ -2,7 +2,7 @@
 
 import { useTranslations } from "next-intl";
 import Image from "next/image";
-import { getApiUrl } from "../../../../client/config";
+import { getPublicApiUrl } from "../../../../client/config";
 import {
   isDiscordAuthEnabled,
   isGoogleAuthEnabled,
@@ -53,7 +53,7 @@ export function LandingComponent() {
         )}
         {isGoogleAuthEnabled() && <GoogleSignInButton />}
         {isDiscordAuthEnabled() && (
-          <Link href={`${getApiUrl()}auth/discord`} className="flex w-full justify-end">
+          <Link href={`${getPublicApiUrl()}auth/discord`} className="flex w-full justify-end">
             <Button className="w-full" variant={`outline`} data-testid="page-login-button-initial-login">
               Login with Discord
             </Button>

package/src/features/auth/components/forms/Login.tsx

@@ -7,7 +7,7 @@ import { useRouter, useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
 import { SubmitHandler, useForm } from "react-hook-form";
 import { z } from "zod";
-import { getApiUrl } from "../../../../client/config";
+import { getPublicApiUrl } from "../../../../client/config";
 import { errorToast, FormInput, FormPassword } from "../../../../components";
 import { useI18nRouter, usePageUrlGenerator } from "../../../../hooks";
 import { isDiscordAuthEnabled, isGoogleAuthEnabled, isInternalAuthEnabled } from "../../../../login";
@@ -55,7 +55,7 @@ export function Login() {
 
   // Helper function to build OAuth URL with referral
   const buildDiscordOAuthUrl = (): string => {
-    const baseUrl = `${getApiUrl()}auth/discord`;
+    const baseUrl = `${getPublicApiUrl()}auth/discord`;
     if (!referralCode) return baseUrl;
     return `${baseUrl}?referral=${encodeURIComponent(referralCode)}`;
   };

package/src/features/auth/components/forms/Register.tsx

@@ -9,7 +9,7 @@ import { useEffect, useState } from "react";
 import { SubmitHandler, useForm } from "react-hook-form";
 import { v4 } from "uuid";
 import { z } from "zod";
-import { getApiUrl } from "../../../../client/config";
+import { getPublicApiUrl } from "../../../../client/config";
 import { errorToast, FormInput, FormPassword } from "../../../../components";
 import { getRegistrationMode, isDiscordAuthEnabled, isGoogleAuthEnabled } from "../../../../login/config";
 import {
@@ -296,7 +296,7 @@ export default function Register() {
                     <div className="space-y-2">
                       {isGoogleAuthEnabled() && (
                         <Link
-                          href={`${getApiUrl()}auth/google${buildOAuthQueryParams(inviteCode, referralCode)}`}
+                          href={`${getPublicApiUrl()}auth/google${buildOAuthQueryParams(inviteCode, referralCode)}`}
                           className="flex w-full"
                         >
                           <Button
@@ -328,7 +328,7 @@ export default function Register() {
                       )}
                       {isDiscordAuthEnabled() && (
                         <Link
-                          href={`${getApiUrl()}auth/discord${buildOAuthQueryParams(inviteCode, referralCode)}`}
+                          href={`${getPublicApiUrl()}auth/discord${buildOAuthQueryParams(inviteCode, referralCode)}`}
                           className="flex w-full"
                         >
                           <Button className="w-full" variant="outline" type="button">

package/src/index.ts

@@ -9,7 +9,14 @@ export * from "./core";
 export * from "./permissions";
 
 // JSON:API configuration (client-safe)
-export { configureJsonApi, getApiUrl, getAppUrl, getTrackablePages, getStripePublishableKey } from "./client/config";
+export {
+  configureJsonApi,
+  getApiUrl,
+  getPublicApiUrl,
+  getAppUrl,
+  getTrackablePages,
+  getStripePublishableKey,
+} from "./client/config";
 
 // I18n configuration (NOT hooks - those are in /hooks with "use client")
 export { configureI18n } from "./i18n";