@carlonicora/nextjs-jsonapi 1.31.0 → 1.32.0

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

@@ -3,10 +3,11 @@
 import { useTranslations } from "next-intl";
 import Image from "next/image";
 import { getApiUrl } from "../../../../client/config";
-import { isDiscordAuthEnabled, isInternalAuthEnabled, isRegistrationAllowed } from "../../../../login";
+import { isDiscordAuthEnabled, isGoogleAuthEnabled, isInternalAuthEnabled, isRegistrationAllowed } from "../../../../login";
 import { Button, CardDescription, CardFooter, CardHeader, CardTitle, Link } from "../../../../shadcnui";
 import { useAuthContext } from "../../contexts";
 import { AuthComponent } from "../../enums";
+import { GoogleSignInButton } from "../buttons/GoogleSignInButton";
 
 export function LandingComponent() {
   const t = useTranslations();
@@ -45,6 +46,7 @@ export function LandingComponent() {
             </Link>
           </>
         )}
+        {isGoogleAuthEnabled() && <GoogleSignInButton />}
         {isDiscordAuthEnabled() && (
           <Link href={`${getApiUrl()}auth/discord`} className="flex w-full justify-end">
             <Button className="w-full" variant={`outline`} data-testid="page-login-button-initial-login">

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

@@ -8,7 +8,7 @@ import { z } from "zod";
 import { getApiUrl } from "../../../../client/config";
 import { errorToast, FormInput, FormPassword } from "../../../../components";
 import { useI18nRouter, usePageUrlGenerator } from "../../../../hooks";
-import { isDiscordAuthEnabled, isInternalAuthEnabled } from "../../../../login";
+import { isDiscordAuthEnabled, isGoogleAuthEnabled, isInternalAuthEnabled } from "../../../../login";
 import {
   Button,
   CardContent,
@@ -24,6 +24,7 @@ import { useCurrentUserContext } from "../../../user/contexts";
 import { useAuthContext } from "../../contexts";
 import { AuthService } from "../../data/auth.service";
 import { AuthComponent } from "../../enums";
+import { GoogleSignInButton } from "../buttons/GoogleSignInButton";
 
 export function Login() {
   const t = useTranslations();
@@ -101,6 +102,7 @@ export function Login() {
             )}
           </CardContent>
           <CardFooter className="flex w-full flex-col gap-y-4 mt-4">
+            {isGoogleAuthEnabled() && <GoogleSignInButton />}
             {isDiscordAuthEnabled() && (
               <Link href={`${getApiUrl()}auth/discord`} className="flex w-full justify-end">
                 <Button className="w-full" variant={`outline`} data-testid="page-login-button-initial-login">

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

@@ -9,6 +9,9 @@ export type AuthInput = {
   companyName?: string;
   partitaIva?: string;
   codiceFiscale?: string;
+  termsAcceptedAt?: string;
+  marketingConsent?: boolean;
+  marketingConsentAt?: string | null;
 };
 
 export type AuthQuery = {

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

@@ -167,6 +167,7 @@ export class AuthService extends AbstractService {
       classKey: Modules.Auth,
       endpoint: endpoint.generate(),
       body: params,
+      overridesJsonApiCreation: true,
       language: "en",
     });
 

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

@@ -46,6 +46,9 @@ export class Auth extends AbstractApiData implements AuthInterface {
     if (data.name !== undefined) response.data.attributes.name = data.name;
     if (data.companyName !== undefined) response.data.attributes.companyName = data.companyName;
     if (data.password !== undefined) response.data.attributes.password = data.password;
+    if (data.termsAcceptedAt !== undefined) response.data.attributes.termsAcceptedAt = data.termsAcceptedAt;
+    if (data.marketingConsent !== undefined) response.data.attributes.marketingConsent = data.marketingConsent;
+    if (data.marketingConsentAt !== undefined) response.data.attributes.marketingConsentAt = data.marketingConsentAt;
 
     return response;
   }

package/src/login/config.ts

@@ -1,15 +1,18 @@
 let _useDiscordAuth: boolean = false;
+let _useGoogleAuth: boolean = false;
 let _useInternalAuth: boolean = true;
 let _allowRegistration: boolean = true;
 
 export interface LoginConfig {
   useDiscordAuth: boolean;
+  useGoogleAuth: boolean;
   useInternalAuth: boolean;
   allowRegistration?: boolean;
 }
 
 export function configureLogin(params: LoginConfig): void {
   _useDiscordAuth = params.useDiscordAuth;
+  _useGoogleAuth = params.useGoogleAuth;
   _useInternalAuth = params.useInternalAuth;
   _allowRegistration = params.allowRegistration ?? true;
 }
@@ -18,6 +21,10 @@ export function isDiscordAuthEnabled(): boolean {
   return _useDiscordAuth;
 }
 
+export function isGoogleAuthEnabled(): boolean {
+  return _useGoogleAuth;
+}
+
 export function isInternalAuthEnabled(): boolean {
   return _useInternalAuth;
 }

package/src/login/index.ts

@@ -1,2 +1,8 @@
-export { configureLogin, isDiscordAuthEnabled, isInternalAuthEnabled, isRegistrationAllowed } from "./config";
+export {
+  configureLogin,
+  isDiscordAuthEnabled,
+  isGoogleAuthEnabled,
+  isInternalAuthEnabled,
+  isRegistrationAllowed,
+} from "./config";
 export type { LoginConfig } from "./config";