@carlonicora/nextjs-jsonapi 6.21.0 → 6.23.0

package/src/features/discord-connection/data/discord-connection.ts

@@ -0,0 +1,41 @@
+import { AbstractApiData, JsonApiHydratedDataInterface, Modules } from "../../../core";
+import { DiscordConnectionInterface } from "./discord-connection.interface";
+
+export class DiscordConnection extends AbstractApiData implements DiscordConnectionInterface {
+  private _connected: boolean = false;
+  private _discordName?: string;
+
+  get connected(): boolean {
+    return this._connected;
+  }
+
+  get discordName(): string | undefined {
+    return this._discordName;
+  }
+
+  rehydrate(data: JsonApiHydratedDataInterface): this {
+    super.rehydrate(data);
+
+    const attributes = data.jsonApi.attributes ?? {};
+
+    this._connected = attributes.connected === true;
+    this._discordName = attributes.discordName ?? undefined;
+
+    return this;
+  }
+
+  /** Read-only resource: the body only identifies the user. */
+  createJsonApi(data: { id: string }) {
+    const response: any = {
+      data: {
+        type: Modules.DiscordConnection.name,
+        id: data.id,
+        attributes: {},
+        relationships: {},
+      },
+      included: [],
+    };
+
+    return response;
+  }
+}

package/src/features/discord-connection/data/index.ts

@@ -0,0 +1,9 @@
+export * from "./discord-connection.interface";
+export * from "./discord-connection";
+export * from "./discord-connection.service";
+export * from "./discord-connect-intent.interface";
+export * from "./discord-connect-intent";
+export * from "./discord-connect-intent.service";
+export * from "./discord-connect-confirmation.interface";
+export * from "./discord-connect-confirmation";
+export * from "./discord-connect-confirmation.service";

package/src/features/discord-connection/discord-connection.module.ts

@@ -0,0 +1,28 @@
+import { ModuleFactory } from "../../permissions";
+import { DiscordConnectConfirmation } from "./data/discord-connect-confirmation";
+import { DiscordConnectIntent } from "./data/discord-connect-intent";
+import { DiscordConnection } from "./data/discord-connection";
+
+// Bootstrapper key: `DiscordConnection: DiscordConnectionModule(moduleFactory)`.
+export const DiscordConnectionModule = (factory: ModuleFactory) =>
+  factory({
+    name: "discord-connections",
+    pageUrl: "/settings",
+    model: DiscordConnection,
+  });
+
+// Bootstrapper key: `DiscordConnectIntent: DiscordConnectIntentModule(moduleFactory)`.
+export const DiscordConnectIntentModule = (factory: ModuleFactory) =>
+  factory({
+    name: "discord-connect-intents",
+    pageUrl: "/settings",
+    model: DiscordConnectIntent,
+  });
+
+// Bootstrapper key: `DiscordConnectConfirmation: DiscordConnectConfirmationModule(moduleFactory)`.
+export const DiscordConnectConfirmationModule = (factory: ModuleFactory) =>
+  factory({
+    name: "discord-connect-confirmations",
+    pageUrl: "/settings",
+    model: DiscordConnectConfirmation,
+  });

package/src/features/discord-connection/index.ts

@@ -0,0 +1,2 @@
+export * from "./discord-connection.module";
+export * from "./data";

package/src/features/oauth/components/OAuthClientDetail.tsx

@@ -201,7 +201,7 @@ export function OAuthClientDetail({
           {/* Actions */}
           <div className="flex gap-3 pt-4">
             {onEdit && (
-              <Button variant="outline" onClick={onEdit} disabled={isLoading}>
+              <Button onClick={onEdit} disabled={isLoading}>
                 <Pencil className="h-4 w-4 me-2" />
                 {t("ui.buttons.edit")}
               </Button>

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

@@ -76,6 +76,7 @@ export const UserProvider = ({ children, dehydratedUser }: UserProviderProps) =>
     };
 
     const functions: ReactNode[] = [];
+    const actionBar: ReactNode[] = [];
 
     if (user) {
       response.element = `${user.name}${user.isDeleted ? ` (${t(`user.deleted`)})` : ""}`;
@@ -86,17 +87,20 @@ export const UserProvider = ({ children, dehydratedUser }: UserProviderProps) =>
         if (!user.isActivated)
           functions.push(<UserResentInvitationEmail key={`UserResentInvitationEmail`} user={user} />);
 
-        functions.push(<UserDeleter key={`UserDeleter`} user={user} />);
+        actionBar.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} />);
+      // Delete and Edit live in the secondary header (action bar), where they
+      // render as labelled buttons, like every other entity page.
+      actionBar.push(<UserEditor key={`UserEditor`} user={user} propagateChanges={setUser} />);
     }
 
     if (functions.length > 0) response.functions = functions;
+    if (actionBar.length > 0) response.actionBar = actionBar;
 
     return response;
   };

package/src/index.ts

@@ -23,7 +23,7 @@ export { configureI18n } from "./i18n";
 export type { I18nConfig } from "./i18n";
 
 // Login configuration (multi-provider auth)
-export { configureLogin } from "./login";
+export { configureLogin, isDiscordAuthEnabled } from "./login";
 export type { LoginConfig } from "./login";
 
 // Roles configuration

package/src/unified/JsonApiRequest.ts

@@ -17,6 +17,7 @@ type DirectFetchFn = (params: {
   companyId?: string;
   language: string;
   additionalHeaders?: Record<string, string>;
+  credentials?: RequestCredentials;
 }) => Promise<ApiData>;
 
 type ServerRequestFn = (params: {
@@ -95,6 +96,8 @@ async function makeRequest(params: {
   companyId?: string;
   language: string;
   additionalHeaders?: Record<string, string>;
+  /** Client-side only: forwarded to the browser `fetch`. Ignored on the server. */
+  credentials?: RequestCredentials;
 }): Promise<ApiData> {
   if (typeof window !== "undefined") {
     // Client-side: use direct fetch
@@ -111,6 +114,7 @@ async function makeRequest(params: {
       companyId: params.companyId,
       language: params.language,
       additionalHeaders: params.additionalHeaders,
+      credentials: params.credentials,
     });
   } else {
     // Server-side: use server request with caching
@@ -188,6 +192,7 @@ export async function JsonApiGet(params: {
   language: string;
   token?: string;
   baseUrl?: string;
+  credentials?: RequestCredentials;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   // A cached server GET never sends the token, so it must not read the cookie either:
@@ -203,6 +208,7 @@ export async function JsonApiGet(params: {
     companyId: params.companyId,
     language: params.language,
     additionalHeaders: _staticConfig?.additionalHeaders,
+    credentials: params.credentials,
   });
 
   return translateResponse({
@@ -233,6 +239,7 @@ export async function JsonApiPost(params: {
   responseType?: ApiRequestDataTypeInterface;
   token?: string;
   baseUrl?: string;
+  credentials?: RequestCredentials;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = params.token ?? (await getToken());
@@ -253,6 +260,7 @@ export async function JsonApiPost(params: {
     companyId: params.companyId,
     language: params.language,
     additionalHeaders: _staticConfig?.additionalHeaders,
+    credentials: params.credentials,
   });
 
   return translateResponse({
@@ -273,6 +281,7 @@ export async function JsonApiPut(params: {
   responseType?: ApiRequestDataTypeInterface;
   token?: string;
   baseUrl?: string;
+  credentials?: RequestCredentials;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = params.token ?? (await getToken());
@@ -293,6 +302,7 @@ export async function JsonApiPut(params: {
     companyId: params.companyId,
     language: params.language,
     additionalHeaders: _staticConfig?.additionalHeaders,
+    credentials: params.credentials,
   });
 
   return translateResponse({
@@ -314,6 +324,7 @@ export async function JsonApiPatch(params: {
   language: string;
   token?: string;
   baseUrl?: string;
+  credentials?: RequestCredentials;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = params.token ?? (await getToken());
@@ -334,6 +345,7 @@ export async function JsonApiPatch(params: {
     companyId: params.companyId,
     language: params.language,
     additionalHeaders: _staticConfig?.additionalHeaders,
+    credentials: params.credentials,
   });
 
   return translateResponse({
@@ -352,6 +364,7 @@ export async function JsonApiDelete(params: {
   responseType?: ApiRequestDataTypeInterface;
   token?: string;
   baseUrl?: string;
+  credentials?: RequestCredentials;
 }): Promise<ApiResponseInterface> {
   runBootstrapper();
   const token = params.token ?? (await getToken());
@@ -363,6 +376,7 @@ export async function JsonApiDelete(params: {
     companyId: params.companyId,
     language: params.language,
     additionalHeaders: _staticConfig?.additionalHeaders,
+    credentials: params.credentials,
   });
 
   return translateResponse({

package/dist/JsonApiRequest-G4J2WTSU.js

@@ -1,26 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-
-
-
-
-
-
-
-
-
-var _chunkGM4VZTWLjs = require('./chunk-GM4VZTWL.js');
-require('./chunk-7QVYU63E.js');
-
-
-
-
-
-
-
-
-
-
-
-exports.JsonApiDelete = _chunkGM4VZTWLjs.JsonApiDelete; exports.JsonApiGet = _chunkGM4VZTWLjs.JsonApiGet; exports.JsonApiPatch = _chunkGM4VZTWLjs.JsonApiPatch; exports.JsonApiPost = _chunkGM4VZTWLjs.JsonApiPost; exports.JsonApiPut = _chunkGM4VZTWLjs.JsonApiPut; exports.buildUrl = _chunkGM4VZTWLjs.buildUrl; exports.configureJsonApi = _chunkGM4VZTWLjs.configureJsonApi; exports.getApiUrl = _chunkGM4VZTWLjs.getApiUrl; exports.getAppUrl = _chunkGM4VZTWLjs.getAppUrl; exports.getTrackablePages = _chunkGM4VZTWLjs.getTrackablePages;
-//# sourceMappingURL=JsonApiRequest-G4J2WTSU.js.map