@carlonicora/nextjs-jsonapi 1.29.6 → 1.31.0

package/dist/{s3.service-DsXo9nop.d.ts → s3.service-D7NyMnNY.d.ts}

@@ -283,6 +283,14 @@ declare class AuthService extends AbstractService {
     static saveToken(params: {
         dehydratedAuth: JsonApiHydratedDataInterface;
     }): Promise<void>;
+    static completeOAuthRegistration(params: {
+        pendingId: string;
+        termsAcceptedAt: string;
+        marketingConsent: boolean;
+        marketingConsentAt: string | null;
+    }): Promise<{
+        code: string;
+    }>;
 }
 
 declare class CompanyService extends AbstractService {

package/dist/server/index.d.mts

@@ -2,7 +2,7 @@ import { A as ApiData } from '../ApiData-DPKNfY-9.mjs';
 import { M as ModuleWithPermissions, A as Action } from '../notification.interface-D5MbtfZK.mjs';
 import { A as ApiRequestDataTypeInterface } from '../ApiRequestDataTypeInterface-CUKFDBx2.mjs';
 import { A as ApiResponseInterface } from '../ApiResponseInterface-zeewugD7.mjs';
-export { d as ServerAuthService, C as ServerCompanyService, e as ServerContentService, F as ServerFeatureService, f as ServerNotificationService, h as ServerPushService, R as ServerRoleService, k as ServerS3Service, U as ServerUserService } from '../s3.service-BMT7W6KS.mjs';
+export { d as ServerAuthService, C as ServerCompanyService, e as ServerContentService, F as ServerFeatureService, f as ServerNotificationService, h as ServerPushService, R as ServerRoleService, k as ServerS3Service, U as ServerUserService } from '../s3.service-D2vIfl9y.mjs';
 import 'lucide-react';
 import '../ApiDataInterface-DPP8s46n.mjs';
 import '../content.interface-BSpowEiW.mjs';

package/dist/server/index.d.ts

@@ -2,7 +2,7 @@ import { A as ApiData } from '../ApiData-DPKNfY-9.js';
 import { M as ModuleWithPermissions, A as Action } from '../notification.interface-CmKmObIU.js';
 import { A as ApiRequestDataTypeInterface } from '../ApiRequestDataTypeInterface-CUKFDBx2.js';
 import { A as ApiResponseInterface } from '../ApiResponseInterface-CAIAeP5d.js';
-export { d as ServerAuthService, C as ServerCompanyService, e as ServerContentService, F as ServerFeatureService, f as ServerNotificationService, h as ServerPushService, R as ServerRoleService, k as ServerS3Service, U as ServerUserService } from '../s3.service-DsXo9nop.js';
+export { d as ServerAuthService, C as ServerCompanyService, e as ServerContentService, F as ServerFeatureService, f as ServerNotificationService, h as ServerPushService, R as ServerRoleService, k as ServerS3Service, U as ServerUserService } from '../s3.service-D7NyMnNY.js';
 import 'lucide-react';
 import '../ApiDataInterface-DPP8s46n.js';
 import '../content.interface-DFQ7mkpL.js';

package/dist/server/index.js

@@ -15,7 +15,7 @@ var _chunk3ZPK4QOBjs = require('../chunk-3ZPK4QOB.js');
 
 
 
-var _chunk5KQXRLK3js = require('../chunk-5KQXRLK3.js');
+var _chunkHBCIT6KEjs = require('../chunk-HBCIT6KE.js');
 require('../chunk-LXKSUWAV.js');
 require('../chunk-IBS6NI7D.js');
 
@@ -86,7 +86,7 @@ var ServerSession = class {
     if (!rawModules) return false;
     const modules = JSON.parse(_pako2.default.ungzip(Buffer.from(rawModules, "base64"), { to: "string" }));
     const selectedModule = modules.find((module) => module.id === params.module.moduleId);
-    return _chunk5KQXRLK3js.checkPermissionsFromServer.call(void 0, {
+    return _chunkHBCIT6KEjs.checkPermissionsFromServer.call(void 0, {
       module: params.module,
       action: params.action,
       data: params.data,
@@ -296,5 +296,5 @@ _chunk7QVYU63Ejs.__name.call(void 0, ServerJsonApiDelete, "ServerJsonApiDelete")
 
 
 
-exports.ServerAuthService = _chunk5KQXRLK3js.AuthService; exports.ServerCompanyService = _chunk5KQXRLK3js.CompanyService; exports.ServerContentService = _chunk5KQXRLK3js.ContentService; exports.ServerFeatureService = _chunk5KQXRLK3js.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunk5KQXRLK3js.NotificationService; exports.ServerPushService = _chunk5KQXRLK3js.PushService; exports.ServerRoleService = _chunk5KQXRLK3js.RoleService; exports.ServerS3Service = _chunk5KQXRLK3js.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunk5KQXRLK3js.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunk3ZPK4QOBjs.serverRequest;
+exports.ServerAuthService = _chunkHBCIT6KEjs.AuthService; exports.ServerCompanyService = _chunkHBCIT6KEjs.CompanyService; exports.ServerContentService = _chunkHBCIT6KEjs.ContentService; exports.ServerFeatureService = _chunkHBCIT6KEjs.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunkHBCIT6KEjs.NotificationService; exports.ServerPushService = _chunkHBCIT6KEjs.PushService; exports.ServerRoleService = _chunkHBCIT6KEjs.RoleService; exports.ServerS3Service = _chunkHBCIT6KEjs.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunkHBCIT6KEjs.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunk3ZPK4QOBjs.serverRequest;
 //# sourceMappingURL=index.js.map

package/dist/server/index.mjs

@@ -15,7 +15,7 @@ import {
   S3Service,
   UserService,
   checkPermissionsFromServer
-} from "../chunk-WQ3KF6BG.mjs";
+} from "../chunk-RACFENTQ.mjs";
 import "../chunk-AUXK7QSA.mjs";
 import "../chunk-C7C7VY4F.mjs";
 import {

package/package.json

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

package/src/components/containers/ReactMarkdownContainer.tsx

@@ -19,7 +19,7 @@ export function ReactMarkdownContainer({
   initialLines = 4,
   size = "normal",
 }: ReactMarkdownContainerProps) {
-  const t = useTranslations("generic.buttons");
+  const t = useTranslations("ui.buttons");
   const [isExpanded, setIsExpanded] = useState(false);
   const [showExpandButton, setShowExpandButton] = useState(false);
   const contentRef = useRef<HTMLDivElement>(null);

package/src/components/forms/GdprConsentCheckbox.tsx

@@ -0,0 +1,45 @@
+"use client";
+
+import { ReactNode } from "react";
+import { FieldValues, Path, UseFormReturn } from "react-hook-form";
+import { Checkbox, FieldDescription } from "../../shadcnui";
+import { FormFieldWrapper } from "./FormFieldWrapper";
+
+interface GdprConsentCheckboxProps<T extends FieldValues> {
+  form: UseFormReturn<T>;
+  id: Path<T>;
+  label: ReactNode;
+  description?: string;
+  required?: boolean;
+}
+
+export function GdprConsentCheckbox<T extends FieldValues>({
+  form,
+  id,
+  label,
+  description,
+  required,
+}: GdprConsentCheckboxProps<T>) {
+  return (
+    <FormFieldWrapper form={form} name={id} orientation="horizontal">
+      {(field) => (
+        <div className="flex flex-row items-start space-x-3 space-y-0">
+          <Checkbox
+            checked={field.value}
+            onCheckedChange={field.onChange}
+            aria-required={required}
+          />
+          <div className="space-y-1 leading-none">
+            <span className="text-sm font-normal">
+              {label}
+              {required && <span className="text-destructive ml-1">*</span>}
+            </span>
+            {description && (
+              <FieldDescription className="text-xs">{description}</FieldDescription>
+            )}
+          </div>
+        </div>
+      )}
+    </FormFieldWrapper>
+  );
+}

package/src/components/forms/index.ts

@@ -17,6 +17,7 @@ export * from "./FormSelect";
 export * from "./FormSlider";
 export * from "./FormSwitch";
 export * from "./FormTextarea";
+export * from "./GdprConsentCheckbox";
 export * from "./MultiFileUploader";
 export * from "./PasswordInput";
 export { FormFeatures } from "../../features/feature/components/forms/FormFeatures";

package/src/features/auth/components/GdprConsentSection.tsx

@@ -0,0 +1,50 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { FieldValues, Path, UseFormReturn } from "react-hook-form";
+import { GdprConsentCheckbox } from "../../../components/forms/GdprConsentCheckbox";
+import { Link } from "../../../shadcnui";
+
+interface GdprConsentSectionProps<T extends FieldValues> {
+  form: UseFormReturn<T>;
+  termsCheckboxId?: Path<T>;
+  marketingCheckboxId?: Path<T>;
+}
+
+export function GdprConsentSection<T extends FieldValues>({
+  form,
+  termsCheckboxId = "termsAccepted" as Path<T>,
+  marketingCheckboxId = "marketingConsent" as Path<T>,
+}: GdprConsentSectionProps<T>) {
+  const t = useTranslations("auth.gdpr");
+
+  const termsLabel = (
+    <>
+      {t("terms_prefix")}{" "}
+      <Link href="/terms" target="_blank" rel="noopener" className="underline">
+        {t("terms_of_service")}
+      </Link>{" "}
+      {t("and")}{" "}
+      <Link href="/privacy" target="_blank" rel="noopener" className="underline">
+        {t("privacy_policy")}
+      </Link>
+    </>
+  );
+
+  return (
+    <div className="space-y-4 py-4">
+      <GdprConsentCheckbox
+        form={form}
+        id={termsCheckboxId}
+        label={termsLabel}
+        required
+      />
+      <GdprConsentCheckbox
+        form={form}
+        id={marketingCheckboxId}
+        label={t("marketing_consent")}
+        description={t("marketing_description")}
+      />
+    </div>
+  );
+}

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

@@ -58,7 +58,7 @@ export function ForgotPassword() {
       <CardHeader data-testid="page-forgot-password-container">
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t("auth.forgot_password")}
+          {t("auth.buttons.forgot_password")}
         </CardTitle>
         <CardDescription className="text-sm">
           {showConfirmation ? <> </> : <>{t(`auth.add_email_to_reset`)}</>}

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

@@ -69,7 +69,7 @@ export function Login() {
       <CardHeader data-testid="page-login-container">
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t("auth.login")}
+          {t("auth.buttons.login")}
         </CardTitle>
 
         <CardDescription className="text-sm">{t(`auth.login_description`)}</CardDescription>
@@ -95,7 +95,7 @@ export function Login() {
                   testId="form-login-input-password"
                 />
                 <Button className="mt-4 w-full" type={"submit"} data-testid="form-login-button-submit">
-                  {t(`auth.login`)}
+                  {t(`auth.buttons.login`)}
                 </Button>
               </>
             )}
@@ -114,7 +114,7 @@ export function Login() {
                 className="flex w-full justify-start"
                 onClick={() => setComponentType(AuthComponent.Register)}
               >
-                {t(`auth.register`)}
+                {t(`auth.buttons.register`)}
               </Link>
               <Link
                 href="#"
@@ -122,7 +122,7 @@ export function Login() {
                 onClick={() => setComponentType(AuthComponent.ForgotPassword)}
                 data-testid="form-login-link-forgot-password"
               >
-                {t(`auth.forgot_password`)}
+                {t(`auth.buttons.forgot_password`)}
               </Link>
             </div>
           </CardFooter>

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

@@ -8,6 +8,7 @@ import { SubmitHandler, useForm } from "react-hook-form";
 import { v4 } from "uuid";
 import { z } from "zod";
 import { errorToast, FormInput, FormPassword } from "../../../../components";
+import { GdprConsentSection } from "../GdprConsentSection";
 import {
   Button,
   CardContent,
@@ -44,6 +45,10 @@ export default function Register() {
       .regex(/^(?=.*[0-9])(?=.*[^a-zA-Z0-9]).*$/, {
         message: t(`auth.errors.password_invalid_format`),
       }),
+    termsAccepted: z.literal(true, {
+      message: t("auth.gdpr.terms_required"),
+    }),
+    marketingConsent: z.boolean().optional(),
   });
 
   const form = useForm<z.infer<typeof formSchema>>({
@@ -53,6 +58,8 @@ export default function Register() {
       name: "",
       email: "",
       password: "",
+      termsAccepted: false as unknown as true,
+      marketingConsent: false,
     },
   });
 
@@ -64,6 +71,9 @@ export default function Register() {
         name: values.name,
         email: values.email,
         password: values.password,
+        termsAcceptedAt: new Date().toISOString(),
+        marketingConsent: values.marketingConsent ?? false,
+        marketingConsentAt: values.marketingConsent ? new Date().toISOString() : null,
       };
 
       await AuthService.register(payload);
@@ -78,7 +88,7 @@ export default function Register() {
       <CardHeader>
         <CardTitle className="text-primary flex flex-col items-center pb-10 text-4xl">
           <Image src="/logo.webp" alt="Logo" width={100} height={100} priority />
-          {t(`auth.register`)}
+          {t(`auth.buttons.register`)}
         </CardTitle>
         <CardDescription className="text-sm">
           {showConfirmation ? <> </> : <>{t(`auth.register_description`)}</>}
@@ -120,6 +130,7 @@ export default function Register() {
                 name={t(`user.fields.password.label`)}
                 placeholder={t(`user.fields.password.placeholder`)}
               />
+              <GdprConsentSection form={form} />
               <Button className="mt-4 w-full" type={"submit"}>
                 {t(`auth.buttons.register`)}
               </Button>

package/src/features/auth/components/index.ts

@@ -1,3 +1,4 @@
 export * from "./containers";
 export * from "./details";
 export * from "./forms";
+export * from "./GdprConsentSection";

package/src/features/auth/data/auth.service.ts

@@ -154,4 +154,24 @@ export class AuthService extends AbstractService {
       });
     }
   }
+
+  static async completeOAuthRegistration(params: {
+    pendingId: string;
+    termsAcceptedAt: string;
+    marketingConsent: boolean;
+    marketingConsentAt: string | null;
+  }): Promise<{ code: string }> {
+    const endpoint = new EndpointCreator({ endpoint: Modules.Auth, id: "oauth", childEndpoint: "complete" });
+
+    const response: ApiResponseInterface = await JsonApiPost({
+      classKey: Modules.Auth,
+      endpoint: endpoint.generate(),
+      body: params,
+      language: "en",
+    });
+
+    if (!response.ok) throw new Error(response.error);
+
+    return response.data as unknown as { code: string };
+  }
 }

package/src/features/company/components/forms/CompanyConfigurationEditor.tsx

@@ -110,7 +110,7 @@ function CompanyConfigurationEditorInternal({ company }: CompanyConfigurationEdi
       </DialogTrigger>
       <DialogContent className={`flex max-h-[70vh] max-w-4xl flex-col overflow-y-auto`}>
         <DialogHeader>
-          <DialogTitle>{t(`entities.configuration`, { count: 2 })}</DialogTitle>
+          <DialogTitle>{t(`entities.configurations`, { count: 2 })}</DialogTitle>
           <DialogDescription className="text-destructive">
             {t(`features.configuration.warning_description`)}
           </DialogDescription>

package/src/features/company/components/forms/CompanyDeleter.tsx

@@ -101,7 +101,7 @@ function CompanyDeleterInternal({ company }: CompanyDeleterProps) {
           >
             {isDeleting ? (
               <>
-                {t(`ui.buttons.is_deleting`)}
+                {t(`ui.buttons.deleting`)}
                 <LoaderCircleIcon className="animate-spin-slow h-5 w-5" />
               </>
             ) : (

package/src/features/user/components/widgets/UserSearchPopover.tsx

@@ -81,7 +81,7 @@ export const UserSearchPopover = ({ children, onSelect, align = "start", classNa
             ) : (
               <div className="text-muted-foreground py-6 text-center text-sm">
                 {isLoading
-                  ? t(`common.loading`)
+                  ? t(`ui.buttons.loading`)
                   : t(`ui.search.no_results`, { type: t(`entities.users`, { count: 1 }) })}
               </div>
             )}