@carlonicora/nextjs-jsonapi 6.6.0 → 6.7.0

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

@@ -3,6 +3,7 @@
 import { useEffect, useState } from "react";
 import { JsonApiHydratedDataInterface, Modules, rehydrate } from "../../../../core";
 import { useI18nRouter } from "../../../../i18n";
+import { markAccountDeletionCancelled } from "../../../account-deletion/utils/account-deletion-notice";
 import { UserInterface } from "../../../user";
 import { useCurrentUserContext } from "../../../user/contexts";
 import { AuthInterface } from "../../data";
@@ -18,6 +19,8 @@ export function Cookies({ dehydratedAuth, page }: { dehydratedAuth: JsonApiHydra
     async function saveTokenOnServer() {
       await AuthService.saveToken({ dehydratedAuth });
       const auth: AuthInterface = rehydrate(Modules.Auth, dehydratedAuth) as AuthInterface;
+      // Discord / Google path: the flag is on the Auth document from the code exchange.
+      if (auth.deletionCancelled) markAccountDeletionCancelled();
       setUser(auth.user as UserInterface);
       setHasSaved(true);
 

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

@@ -18,6 +18,7 @@ import {
   TabsList,
   TabsTrigger,
 } from "../../../../shadcnui";
+import { markAccountDeletionCancelled } from "../../../account-deletion/utils/account-deletion-notice";
 import { UserInterface } from "../../../user";
 import { useCurrentUserContext } from "../../../user/contexts";
 import { useAuthContext } from "../../contexts";
@@ -46,6 +47,7 @@ export function TwoFactorChallenge() {
   }
 
   const handleSuccess = (auth: AuthInterface) => {
+    if (auth.deletionCancelled) markAccountDeletionCancelled();
     setPendingTwoFactor(undefined);
     setUser(auth.user);
 

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

@@ -0,0 +1,36 @@
+import { beforeAll, describe, expect, it } from "vitest";
+import { ApiRequestDataTypeInterface } from "../../../../core/interfaces/ApiRequestDataTypeInterface";
+import { ModuleRegistry } from "../../../../core/registry/ModuleRegistry";
+import { Auth } from "../auth";
+
+// Auth.rehydrate() resolves Modules.User through the real ModuleRegistry (the
+// argument of `_readIncluded`), so it must be registered even though these
+// fixtures carry no included user.
+const registerIfAbsent = (key: string, module: ApiRequestDataTypeInterface) => {
+  try {
+    ModuleRegistry.get(key as any);
+  } catch {
+    ModuleRegistry.register(key, module);
+  }
+};
+
+beforeAll(() => {
+  registerIfAbsent("Auth", { name: "auth", model: Auth } as any);
+  registerIfAbsent("User", { name: "users", model: class {} } as any);
+});
+
+const rehydrateWith = (attributes: Record<string, any>) =>
+  new Auth().rehydrate({
+    jsonApi: { type: "auth", id: "auth-1", attributes: { token: "t", refreshToken: "r", ...attributes } },
+    included: [],
+  } as any);
+
+describe("Auth", () => {
+  describe("rehydrate", () => {
+    it("deletionCancelled true when the attribute is true, false otherwise", () => {
+      expect(rehydrateWith({ deletionCancelled: true }).deletionCancelled).toBe(true);
+      expect(rehydrateWith({ deletionCancelled: false }).deletionCancelled).toBe(false);
+      expect(rehydrateWith({}).deletionCancelled).toBe(false);
+    });
+  });
+});

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

@@ -35,4 +35,6 @@ export interface AuthInterface extends ApiDataInterface {
   get token(): string;
   get refreshToken(): string;
   get user(): UserInterface;
+  /** True on the session created by the login that cancelled a pending account deletion. */
+  get deletionCancelled(): boolean;
 }

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

@@ -9,6 +9,7 @@ import {
   rehydrate,
 } from "../../../core";
 import { JsonApiDelete, JsonApiGet, JsonApiPost } from "../../../unified";
+import { markAccountDeletionCancelled } from "../../account-deletion/utils/account-deletion-notice";
 import { UserInterface } from "../../user";
 import { getTokenHandler } from "../config";
 import { PendingRegistrationInterface } from "./pending-registration.interface";
@@ -45,6 +46,9 @@ export class AuthService extends AbstractService {
     // Normal auth response
     const auth = apiResponse.data as AuthInterface;
 
+    // Login returns only the user to Login.tsx, so the flag is read here.
+    if (auth.deletionCancelled) markAccountDeletionCancelled();
+
     // Use injected token handler if configured
     const handler = getTokenHandler();
     if (handler) {

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

@@ -6,6 +6,12 @@ export class Auth extends AbstractApiData implements AuthInterface {
   private _token?: string;
   private _refreshToken?: string;
   private _user?: UserInterface;
+  private _deletionCancelled: boolean = false;
+
+  /** True on the session created by the login that cancelled a pending account deletion. */
+  get deletionCancelled(): boolean {
+    return this._deletionCancelled;
+  }
 
   get token(): string {
     if (!this._token) throw new Error("Token is not defined");
@@ -27,6 +33,7 @@ export class Auth extends AbstractApiData implements AuthInterface {
 
     this._token = data.jsonApi.attributes.token ?? undefined;
     this._refreshToken = data.jsonApi.attributes.refreshToken ?? undefined;
+    this._deletionCancelled = data.jsonApi.attributes.deletionCancelled === true;
 
     this._user = this._readIncluded(data, "user", Modules.User) as UserInterface;
 

package/src/features/user/contexts/UserContext.tsx

@@ -8,6 +8,10 @@ import { usePageUrlGenerator } from "../../../hooks";
 import { BreadcrumbItemData } from "../../../interfaces";
 import { Action } from "../../../permissions";
 import { getRoleId } from "../../../roles";
+import {
+  AccountDeletionAdminTrigger,
+  isAccountDeletionEnabled,
+} from "../../account-deletion/components/AccountDeletionAdminTrigger";
 import { UserDeleter, UserEditor, UserReactivator, UserResentInvitationEmail } from "../components/forms";
 import { UserInterface } from "../data";
 import { useCurrentUserContext } from "./CurrentUserContext";
@@ -83,6 +87,10 @@ export const UserProvider = ({ children, dehydratedUser }: UserProviderProps) =>
           functions.push(<UserResentInvitationEmail key={`UserResentInvitationEmail`} user={user} />);
 
         functions.push(<UserDeleter key={`UserDeleter`} user={user} />);
+
+        // Opt-in: only apps that registered AccountDeletionModule, platform administrators only.
+        if (hasRole(getRoleId().Administrator) && isAccountDeletionEnabled())
+          functions.push(<AccountDeletionAdminTrigger key={`AccountDeletionAdminTrigger`} user={user} />);
       }
 
       functions.push(<UserEditor key={`UserEditor`} user={user} propagateChanges={setUser} />);