@strapi/admin 5.50.2 → 5.51.1

package/dist/admin/shared/utils/auth-cookie-path.js

@@ -0,0 +1,40 @@
+'use strict';
+
+/**
+ * Path attribute of the admin auth (access) token cookie, configurable
+ * through `admin.auth.cookie.path` so multiple Strapi instances on the same
+ * parent domain can keep separate cookies (e.g. `/strapi-de/admin`).
+ *
+ * Browser-safe single source for both sides of the handoff: the admin panel
+ * cannot read server config, so the build transports the config value into
+ * the bundle through the internal `STRAPI_ADMIN_AUTH_COOKIE_PATH` variable
+ * (see create-build-context.ts in @strapi/strapi); the server resolves the
+ * same config at runtime. Changing the path requires an admin rebuild, like
+ * any other admin config change.
+ *
+ * Defaults to `/admin` to match the refresh-cookie path used by
+ * `getRefreshCookieOptions`.
+ */ const DEFAULT_AUTH_COOKIE_PATH = '/admin';
+const isValidCookiePath = (path)=>{
+    if (!path.startsWith('/')) {
+        return false;
+    }
+    // RFC 6265 path-av: any CHAR except CTLs or ";".
+    // eslint-disable-next-line no-control-regex -- CTL chars are exactly what RFC 6265 forbids
+    return !/[\x00-\x1F\x7F;]/.test(path);
+};
+const resolveAuthCookiePath = (configuredPath, warn = console.warn)=>{
+    const cookiePath = (configuredPath || '').trim();
+    if (!cookiePath) {
+        return DEFAULT_AUTH_COOKIE_PATH;
+    }
+    if (!isValidCookiePath(cookiePath)) {
+        warn(`Ignoring invalid admin auth cookie path "${cookiePath}" (must be an absolute path without ";"); using "${DEFAULT_AUTH_COOKIE_PATH}" instead.`);
+        return DEFAULT_AUTH_COOKIE_PATH;
+    }
+    return cookiePath;
+};
+
+exports.DEFAULT_AUTH_COOKIE_PATH = DEFAULT_AUTH_COOKIE_PATH;
+exports.resolveAuthCookiePath = resolveAuthCookiePath;
+//# sourceMappingURL=auth-cookie-path.js.map

package/dist/admin/shared/utils/auth-cookie-path.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth-cookie-path.js","sources":["../../../../shared/utils/auth-cookie-path.ts"],"sourcesContent":["/**\n * Path attribute of the admin auth (access) token cookie, configurable\n * through `admin.auth.cookie.path` so multiple Strapi instances on the same\n * parent domain can keep separate cookies (e.g. `/strapi-de/admin`).\n *\n * Browser-safe single source for both sides of the handoff: the admin panel\n * cannot read server config, so the build transports the config value into\n * the bundle through the internal `STRAPI_ADMIN_AUTH_COOKIE_PATH` variable\n * (see create-build-context.ts in @strapi/strapi); the server resolves the\n * same config at runtime. Changing the path requires an admin rebuild, like\n * any other admin config change.\n *\n * Defaults to `/admin` to match the refresh-cookie path used by\n * `getRefreshCookieOptions`.\n */\nexport const DEFAULT_AUTH_COOKIE_PATH = '/admin';\n\nconst isValidCookiePath = (path: string): boolean => {\n  if (!path.startsWith('/')) {\n    return false;\n  }\n\n  // RFC 6265 path-av: any CHAR except CTLs or \";\".\n  // eslint-disable-next-line no-control-regex -- CTL chars are exactly what RFC 6265 forbids\n  return !/[\\x00-\\x1F\\x7F;]/.test(path);\n};\n\nexport const resolveAuthCookiePath = (\n  configuredPath?: string,\n  warn: (message: string) => void = console.warn\n): string => {\n  const cookiePath = (configuredPath || '').trim();\n\n  if (!cookiePath) {\n    return DEFAULT_AUTH_COOKIE_PATH;\n  }\n\n  if (!isValidCookiePath(cookiePath)) {\n    warn(\n      `Ignoring invalid admin auth cookie path \"${cookiePath}\" (must be an absolute path without \";\"); using \"${DEFAULT_AUTH_COOKIE_PATH}\" instead.`\n    );\n    return DEFAULT_AUTH_COOKIE_PATH;\n  }\n\n  return cookiePath;\n};\n"],"names":["DEFAULT_AUTH_COOKIE_PATH","isValidCookiePath","path","startsWith","test","resolveAuthCookiePath","configuredPath","warn","console","cookiePath","trim"],"mappings":";;AAAA;;;;;;;;;;;;;;IAeO,MAAMA,wBAAAA,GAA2B;AAExC,MAAMC,oBAAoB,CAACC,IAAAA,GAAAA;AACzB,IAAA,IAAI,CAACA,IAAAA,CAAKC,UAAU,CAAC,GAAA,CAAA,EAAM;QACzB,OAAO,KAAA;AACT,IAAA;;;IAIA,OAAO,CAAC,kBAAA,CAAmBC,IAAI,CAACF,IAAAA,CAAAA;AAClC,CAAA;MAEaG,qBAAAA,GAAwB,CACnCC,cAAAA,EACAC,IAAAA,GAAkCC,QAAQD,IAAI,GAAA;AAE9C,IAAA,MAAME,aAAa,CAACH,cAAAA,IAAkB,EAAC,EAAGI,IAAI,EAAA;AAE9C,IAAA,IAAI,CAACD,UAAAA,EAAY;QACf,OAAOT,wBAAAA;AACT,IAAA;IAEA,IAAI,CAACC,kBAAkBQ,UAAAA,CAAAA,EAAa;QAClCF,IAAAA,CACE,CAAC,yCAAyC,EAAEE,UAAAA,CAAW,iDAAiD,EAAET,wBAAAA,CAAyB,UAAU,CAAC,CAAA;QAEhJ,OAAOA,wBAAAA;AACT,IAAA;IAEA,OAAOS,UAAAA;AACT;;;;;"}

package/dist/admin/shared/utils/auth-cookie-path.mjs

@@ -0,0 +1,37 @@
+/**
+ * Path attribute of the admin auth (access) token cookie, configurable
+ * through `admin.auth.cookie.path` so multiple Strapi instances on the same
+ * parent domain can keep separate cookies (e.g. `/strapi-de/admin`).
+ *
+ * Browser-safe single source for both sides of the handoff: the admin panel
+ * cannot read server config, so the build transports the config value into
+ * the bundle through the internal `STRAPI_ADMIN_AUTH_COOKIE_PATH` variable
+ * (see create-build-context.ts in @strapi/strapi); the server resolves the
+ * same config at runtime. Changing the path requires an admin rebuild, like
+ * any other admin config change.
+ *
+ * Defaults to `/admin` to match the refresh-cookie path used by
+ * `getRefreshCookieOptions`.
+ */ const DEFAULT_AUTH_COOKIE_PATH = '/admin';
+const isValidCookiePath = (path)=>{
+    if (!path.startsWith('/')) {
+        return false;
+    }
+    // RFC 6265 path-av: any CHAR except CTLs or ";".
+    // eslint-disable-next-line no-control-regex -- CTL chars are exactly what RFC 6265 forbids
+    return !/[\x00-\x1F\x7F;]/.test(path);
+};
+const resolveAuthCookiePath = (configuredPath, warn = console.warn)=>{
+    const cookiePath = (configuredPath || '').trim();
+    if (!cookiePath) {
+        return DEFAULT_AUTH_COOKIE_PATH;
+    }
+    if (!isValidCookiePath(cookiePath)) {
+        warn(`Ignoring invalid admin auth cookie path "${cookiePath}" (must be an absolute path without ";"); using "${DEFAULT_AUTH_COOKIE_PATH}" instead.`);
+        return DEFAULT_AUTH_COOKIE_PATH;
+    }
+    return cookiePath;
+};
+
+export { DEFAULT_AUTH_COOKIE_PATH, resolveAuthCookiePath };
+//# sourceMappingURL=auth-cookie-path.mjs.map

package/dist/admin/shared/utils/auth-cookie-path.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth-cookie-path.mjs","sources":["../../../../shared/utils/auth-cookie-path.ts"],"sourcesContent":["/**\n * Path attribute of the admin auth (access) token cookie, configurable\n * through `admin.auth.cookie.path` so multiple Strapi instances on the same\n * parent domain can keep separate cookies (e.g. `/strapi-de/admin`).\n *\n * Browser-safe single source for both sides of the handoff: the admin panel\n * cannot read server config, so the build transports the config value into\n * the bundle through the internal `STRAPI_ADMIN_AUTH_COOKIE_PATH` variable\n * (see create-build-context.ts in @strapi/strapi); the server resolves the\n * same config at runtime. Changing the path requires an admin rebuild, like\n * any other admin config change.\n *\n * Defaults to `/admin` to match the refresh-cookie path used by\n * `getRefreshCookieOptions`.\n */\nexport const DEFAULT_AUTH_COOKIE_PATH = '/admin';\n\nconst isValidCookiePath = (path: string): boolean => {\n  if (!path.startsWith('/')) {\n    return false;\n  }\n\n  // RFC 6265 path-av: any CHAR except CTLs or \";\".\n  // eslint-disable-next-line no-control-regex -- CTL chars are exactly what RFC 6265 forbids\n  return !/[\\x00-\\x1F\\x7F;]/.test(path);\n};\n\nexport const resolveAuthCookiePath = (\n  configuredPath?: string,\n  warn: (message: string) => void = console.warn\n): string => {\n  const cookiePath = (configuredPath || '').trim();\n\n  if (!cookiePath) {\n    return DEFAULT_AUTH_COOKIE_PATH;\n  }\n\n  if (!isValidCookiePath(cookiePath)) {\n    warn(\n      `Ignoring invalid admin auth cookie path \"${cookiePath}\" (must be an absolute path without \";\"); using \"${DEFAULT_AUTH_COOKIE_PATH}\" instead.`\n    );\n    return DEFAULT_AUTH_COOKIE_PATH;\n  }\n\n  return cookiePath;\n};\n"],"names":["DEFAULT_AUTH_COOKIE_PATH","isValidCookiePath","path","startsWith","test","resolveAuthCookiePath","configuredPath","warn","console","cookiePath","trim"],"mappings":"AAAA;;;;;;;;;;;;;;IAeO,MAAMA,wBAAAA,GAA2B;AAExC,MAAMC,oBAAoB,CAACC,IAAAA,GAAAA;AACzB,IAAA,IAAI,CAACA,IAAAA,CAAKC,UAAU,CAAC,GAAA,CAAA,EAAM;QACzB,OAAO,KAAA;AACT,IAAA;;;IAIA,OAAO,CAAC,kBAAA,CAAmBC,IAAI,CAACF,IAAAA,CAAAA;AAClC,CAAA;MAEaG,qBAAAA,GAAwB,CACnCC,cAAAA,EACAC,IAAAA,GAAkCC,QAAQD,IAAI,GAAA;AAE9C,IAAA,MAAME,aAAa,CAACH,cAAAA,IAAkB,EAAC,EAAGI,IAAI,EAAA;AAE9C,IAAA,IAAI,CAACD,UAAAA,EAAY;QACf,OAAOT,wBAAAA;AACT,IAAA;IAEA,IAAI,CAACC,kBAAkBQ,UAAAA,CAAAA,EAAa;QAClCF,IAAAA,CACE,CAAC,yCAAyC,EAAEE,UAAAA,CAAW,iDAAiD,EAAET,wBAAAA,CAAyB,UAAU,CAAC,CAAA;QAEhJ,OAAOA,wBAAAA;AACT,IAAA;IAEA,OAAOS,UAAAA;AACT;;;;"}

package/dist/admin/src/utils/cookies.d.ts

@@ -3,6 +3,17 @@
  * into the bundle as `STRAPI_ADMIN_AUTH_COOKIE_NAME`.
  */
 export declare const AUTH_COOKIE_NAME: string;
+/**
+ * Resolved once at module load: the build inlines `admin.auth.cookie.path`
+ * into the bundle as `STRAPI_ADMIN_AUTH_COOKIE_PATH`.
+ */
+export declare const AUTH_COOKIE_PATH: string;
+/**
+ * Resolved once at module load: the build inlines `admin.auth.cookie.domain`
+ * into the bundle as `STRAPI_ADMIN_AUTH_COOKIE_DOMAIN`. `undefined` means the
+ * cookie is host-only.
+ */
+export declare const AUTH_COOKIE_DOMAIN: string | undefined;
 /**
  * Retrieves the value of a specified cookie.
  *
@@ -12,6 +23,10 @@ export declare const AUTH_COOKIE_NAME: string;
 export declare const getCookieValue: (name: string) => string | null;
 /**
  * Sets a cookie with the given name, value, and optional expiration time.
+ * Uses `admin.auth.cookie.path` and `admin.auth.cookie.domain` (both inlined
+ * at build time) so the access cookie stays scoped to the same path and domain
+ * as the httpOnly refresh cookie and the EE SSO access cookie. The cookie is
+ * marked `Secure` whenever the page is served over TLS.
  *
  * @param name - The name of the cookie.
  * @param value - The value of the cookie.
@@ -21,6 +36,12 @@ export declare const setCookie: (name: string, value: string, days?: number) =>
 /**
  * Deletes a cookie by setting its expiration date to a past date.
  *
+ * Expires every combination of {configured path, legacy Path=/} and
+ * {configured domain, host-only}. A `Domain`-scoped cookie is a distinct entry
+ * from a host-only one in the browser cookie store, so both must be cleared or
+ * remote logout leaves the EE SSO cookie (written with `Domain` by the server)
+ * behind, rehydrating a dead session into an infinite login redirect.
+ *
  * @param name - The name of the cookie to delete.
  */
 export declare const deleteCookie: (name: string) => void;

package/dist/ee/admin/src/pages/SettingsPage/pages/AuditLogs/components/ComboboxFilter.d.ts

@@ -1,2 +1,7 @@
 import { Filters } from '../../../../../../../../admin/src/components/Filters';
-export declare const ComboboxFilter: (props: Filters.ValueInputProps) => import("react/jsx-runtime").JSX.Element;
+export interface ComboboxFilterProps extends Filters.ValueInputProps {
+    loading?: boolean;
+    hasMoreItems?: boolean;
+    onLoadMore?: () => void;
+}
+export declare const ComboboxFilter: ({ loading, hasMoreItems, onLoadMore, ...props }: ComboboxFilterProps) => import("react/jsx-runtime").JSX.Element;

package/dist/ee/admin/src/pages/SettingsPage/pages/AuditLogs/hooks/useAuditLogsData.d.ts

@@ -1,9 +1,11 @@
-export declare const useAuditLogsData: ({ canReadAuditLogs, canReadUsers, }: {
+export declare const useAuditLogsData: ({ canReadAuditLogs, usersPageSize, }: {
     canReadAuditLogs: boolean;
-    canReadUsers: boolean;
+    usersPageSize: number;
 }) => {
     auditLogs: import("../../../../../../../../shared/contracts/audit-logs").GetAll.Response | undefined;
-    users: import("../../../../../../../../admin/src").SanitizedAdminUser[];
+    users: Pick<import("../../../../../../../../shared/contracts/audit-logs").SanitizedAdminUserForAuditLogs, "displayName" | "id" | "email">[];
+    usersPagination: import("../../../../../../../../shared/contracts/shared").Pagination | undefined;
+    isLoadingUsers: boolean;
     isLoading: boolean;
     hasError: boolean;
 };

package/dist/ee/admin/src/pages/SettingsPage/pages/AuditLogs/utils/getDisplayedFilters.d.ts

@@ -1,8 +1,12 @@
 import { IntlShape } from 'react-intl';
 import { Filters } from '../../../../../../../../admin/src/components/Filters';
-import { SanitizedAdminUser } from '../../../../../../../../shared/contracts/shared';
-export declare const getDisplayedFilters: ({ formatMessage, users, canReadUsers, }: {
+import { GetUsers } from '../../../../../../../../shared/contracts/audit-logs';
+import { ComboboxFilterProps } from '../components/ComboboxFilter';
+type UsersFilterProps = Pick<ComboboxFilterProps, 'loading' | 'hasMoreItems' | 'onLoadMore'>;
+type AuditLogUser = NonNullable<GetUsers.Response['results']>[number];
+export declare const getDisplayedFilters: ({ formatMessage, users, usersFilter, }: {
     formatMessage: IntlShape["formatMessage"];
-    users: SanitizedAdminUser[];
-    canReadUsers: boolean;
+    users: AuditLogUser[];
+    usersFilter?: UsersFilterProps;
 }) => Filters.Filter[];
+export {};

package/dist/ee/admin/src/services/auditLogs.d.ts

@@ -1,3 +1,6 @@
 import * as AuditLogs from '../../../../shared/contracts/audit-logs';
-declare const useGetAuditLogsQuery: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseQuery<import("@reduxjs/toolkit/query").QueryDefinition<{}, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("../../../../admin/src").QueryArguments, unknown, import("../../../../admin/src").BaseQueryError | import("@reduxjs/toolkit").SerializedError>, "GuidedTourMeta" | "HomepageKeyStatistics" | "AiUsage" | "AiFeatureConfig", AuditLogs.GetAll.Response, "adminApi">>, useGetAuditLogQuery: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseQuery<import("@reduxjs/toolkit/query").QueryDefinition<import("@strapi/types/dist/data/constants.js").ID, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("../../../../admin/src").QueryArguments, unknown, import("../../../../admin/src").BaseQueryError | import("@reduxjs/toolkit").SerializedError>, "GuidedTourMeta" | "HomepageKeyStatistics" | "AiUsage" | "AiFeatureConfig", AuditLogs.Get.Response, "adminApi">>;
-export { useGetAuditLogsQuery, useGetAuditLogQuery };
+declare const useGetAuditLogsQuery: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseQuery<import("@reduxjs/toolkit/query").QueryDefinition<{}, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("../../../../admin/src").QueryArguments, unknown, import("../../../../admin/src").BaseQueryError | import("@reduxjs/toolkit").SerializedError>, "GuidedTourMeta" | "HomepageKeyStatistics" | "AiUsage" | "AiFeatureConfig", AuditLogs.GetAll.Response, "adminApi">>, useGetAuditLogQuery: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseQuery<import("@reduxjs/toolkit/query").QueryDefinition<import("@strapi/types/dist/data/constants.js").ID, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("../../../../admin/src").QueryArguments, unknown, import("../../../../admin/src").BaseQueryError | import("@reduxjs/toolkit").SerializedError>, "GuidedTourMeta" | "HomepageKeyStatistics" | "AiUsage" | "AiFeatureConfig", AuditLogs.Get.Response, "adminApi">>, useGetAuditLogUsersQuery: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseQuery<import("@reduxjs/toolkit/query").QueryDefinition<{
+    page?: number;
+    pageSize?: number;
+}, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("../../../../admin/src").QueryArguments, unknown, import("../../../../admin/src").BaseQueryError | import("@reduxjs/toolkit").SerializedError>, "GuidedTourMeta" | "HomepageKeyStatistics" | "AiUsage" | "AiFeatureConfig", AuditLogs.GetUsers.Response, "adminApi">>;
+export { useGetAuditLogsQuery, useGetAuditLogQuery, useGetAuditLogUsersQuery };

package/dist/ee/server/src/audit-logs/controllers/audit-logs.d.ts

@@ -1,6 +1,7 @@
 import type { Context } from 'koa';
 declare const _default: {
     findMany(ctx: Context): Promise<void>;
+    findManyUsers(ctx: Context): Promise<void>;
     findOne(ctx: Context): Promise<void>;
 };
 export default _default;

package/dist/ee/server/src/audit-logs/controllers/audit-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/controllers/audit-logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;;kBAKb,OAAO;iBAUR,OAAO;;AAX5B,wBAqBE"}
+{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/controllers/audit-logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;;kBAKb,OAAO;uBAUF,OAAO;iBAUb,OAAO;;AArB5B,wBA+BE"}

package/dist/ee/server/src/audit-logs/routes/audit-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/routes/audit-logs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,wBAsCE"}
+{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/routes/audit-logs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAeA,wBAsBE"}

package/dist/ee/server/src/audit-logs/services/audit-logs.d.ts

@@ -20,6 +20,22 @@ declare const createAuditLogsService: (strapi: Core.Strapi) => {
             total: number;
         };
     }>;
+    findManyUsers(query: {
+        page?: number | string;
+        pageSize?: number | string;
+    }): Promise<{
+        results: {
+            id: any;
+            email: any;
+            displayName: any;
+        }[];
+        pagination: {
+            page: number;
+            pageSize: number;
+            pageCount: number;
+            total: number;
+        };
+    }>;
     findOne(id: unknown): Promise<any>;
     deleteExpiredEvents(expirationDate: Date): Promise<import("@strapi/database/dist/types").CountResult>;
 };

package/dist/ee/server/src/audit-logs/services/audit-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAsBD;;;GAGG;AACH,QAAA,MAAM,sBAAsB,GAAI,QAAQ,IAAI,CAAC,MAAM;qBAExB,KAAK;oBAWN,OAAO;;;;;;;;;gBAqBX,OAAO;wCAkBW,IAAI;CAU3C,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/services/audit-logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAsBD;;;GAGG;AACH,QAAA,MAAM,sBAAsB,GAAI,QAAQ,IAAI,CAAC,MAAM;qBAExB,KAAK;oBAWN,OAAO;;;;;;;;;yBAqBF;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;;;;;;;;;;;;;gBAmC/D,OAAO;wCAkBW,IAAI;CAU3C,CAAC;AAEF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/ee/server/src/audit-logs/validation/audit-logs.d.ts

@@ -1,6 +1,8 @@
 export declare const validateFindMany: (body: unknown, errorMessage?: string) => Promise<any>;
+export declare const validateFindManyUsers: (body: unknown, errorMessage?: string) => Promise<any>;
 declare const _default: {
     validateFindMany: (body: unknown, errorMessage?: string) => Promise<any>;
+    validateFindManyUsers: (body: unknown, errorMessage?: string) => Promise<any>;
 };
 export default _default;
 //# sourceMappingURL=audit-logs.d.ts.map

package/dist/ee/server/src/audit-logs/validation/audit-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/validation/audit-logs.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,gBAAgB,wDAA+D,CAAC;;;;AAE7F,wBAEE"}
+{"version":3,"file":"audit-logs.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/audit-logs/validation/audit-logs.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,gBAAgB,wDAA+D,CAAC;AAC7F,eAAO,MAAM,qBAAqB,wDAEhC,CAAC;;;;;AAEH,wBAGE"}

package/dist/ee/server/src/controllers/admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../../../../ee/server/src/controllers/admin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,wBAoEE"}
+{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../../../../ee/server/src/controllers/admin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wBAoEE"}

package/dist/ee/server/src/controllers/authentication-utils/middlewares.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middlewares.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/controllers/authentication-utils/middlewares.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAc1C,eAAO,MAAM,YAAY,EAAE,IAAI,CAAC,iBA0B/B,CAAC;AA4DF,eAAO,MAAM,gBAAgB,EAAE,IAAI,CAAC,iBA0DnC,CAAC;;;;;AAEF,wBAGE"}
+{"version":3,"file":"middlewares.d.ts","sourceRoot":"","sources":["../../../../../../ee/server/src/controllers/authentication-utils/middlewares.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAiB1C,eAAO,MAAM,YAAY,EAAE,IAAI,CAAC,iBA0B/B,CAAC;AA4DF,eAAO,MAAM,gBAAgB,EAAE,IAAI,CAAC,iBAiEnC,CAAC;;;;;AAEF,wBAGE"}

package/dist/ee/server/src/index.d.ts

@@ -3,6 +3,7 @@ declare const getAdminEE: () => {
     controllers: {
         'audit-logs'?: {
             findMany(ctx: import("koa").Context): Promise<void>;
+            findManyUsers(ctx: import("koa").Context): Promise<void>;
             findOne(ctx: import("koa").Context): Promise<void>;
         } | undefined;
         authentication: {

package/dist/ee/server/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../ee/server/src/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA4Be;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;wBAcxB;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOpD,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../ee/server/src/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAE1C,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA4Be;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;wBAcxB;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOpD,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/ee/server/src/services/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../../ee/server/src/services/auth.ts"],"names":[],"mappings":";iCAayC,GAAG;uDAyCmB,GAAG;;AAelE,wBAGE"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../../ee/server/src/services/auth.ts"],"names":[],"mappings":";iCAiByC,GAAG;uDAwCmB,GAAG;;AAkBlE,wBAGE"}

package/dist/ee/server/src/services/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../ee/server/src/services/user.ts"],"names":[],"mappings":";oCAmB6C,MAAM,SAAS,GAAG;yCAwBb,OAAO;;uBA8HzB,GAAG;qBAzCL,OAAO;qBAzDP,GAAG,cAAc,GAAG;;AA4KlD,wBAOE"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../ee/server/src/services/user.ts"],"names":[],"mappings":";oCAmB6C,MAAM,SAAS,GAAG;yCAwBb,OAAO;;uBA8HzB,GAAG;qBAzCL,OAAO;qBAzDP,GAAG,cAAc,GAAG;;AAkLlD,wBAOE"}

package/dist/server/ee/server/src/audit-logs/controllers/audit-logs.js

@@ -10,6 +10,16 @@ var auditLogsController = {
         const body = await auditLogs$1.findMany(query);
         ctx.body = body;
     },
+    async findManyUsers (ctx) {
+        const { query } = ctx.request;
+        const { page, pageSize } = await auditLogs.validateFindManyUsers(query);
+        const auditLogs$1 = strapi.get('audit-logs');
+        const body = await auditLogs$1.findManyUsers({
+            page,
+            pageSize
+        });
+        ctx.body = body;
+    },
     async findOne (ctx) {
         const { id } = ctx.params;
         const auditLogs = strapi.get('audit-logs');

package/dist/server/ee/server/src/audit-logs/controllers/audit-logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.js","sources":["../../../../../../../ee/server/src/audit-logs/controllers/audit-logs.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { validateFindMany } from '../validation/audit-logs';\n\nexport default {\n  async findMany(ctx: Context) {\n    const { query } = ctx.request;\n    await validateFindMany(query);\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findMany(query);\n\n    ctx.body = body;\n  },\n\n  async findOne(ctx: Context) {\n    const { id } = ctx.params;\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findOne(id);\n\n    ctx.body = body;\n\n    strapi.telemetry.send('didWatchAnAuditLog');\n  },\n};\n"],"names":["findMany","ctx","query","request","validateFindMany","auditLogs","strapi","get","body","findOne","id","params","telemetry","send"],"mappings":";;;;AAIA,0BAAe;AACb,IAAA,MAAMA,UAASC,GAAY,EAAA;AACzB,QAAA,MAAM,EAAEC,KAAK,EAAE,GAAGD,IAAIE,OAAO;AAC7B,QAAA,MAAMC,0BAAAA,CAAiBF,KAAAA,CAAAA;QAEvB,MAAMG,WAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,WAAAA,CAAUL,QAAQ,CAACE,KAAAA,CAAAA;AAEtCD,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;AACb,IAAA,CAAA;AAEA,IAAA,MAAMC,SAAQR,GAAY,EAAA;AACxB,QAAA,MAAM,EAAES,EAAE,EAAE,GAAGT,IAAIU,MAAM;QAEzB,MAAMN,SAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,SAAAA,CAAUI,OAAO,CAACC,EAAAA,CAAAA;AAErCT,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;QAEXF,MAAAA,CAAOM,SAAS,CAACC,IAAI,CAAC,oBAAA,CAAA;AACxB,IAAA;AACF,CAAA;;;;"}
+{"version":3,"file":"audit-logs.js","sources":["../../../../../../../ee/server/src/audit-logs/controllers/audit-logs.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { validateFindMany, validateFindManyUsers } from '../validation/audit-logs';\n\nexport default {\n  async findMany(ctx: Context) {\n    const { query } = ctx.request;\n    await validateFindMany(query);\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findMany(query);\n\n    ctx.body = body;\n  },\n\n  async findManyUsers(ctx: Context) {\n    const { query } = ctx.request;\n    const { page, pageSize } = await validateFindManyUsers(query);\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findManyUsers({ page, pageSize });\n\n    ctx.body = body;\n  },\n\n  async findOne(ctx: Context) {\n    const { id } = ctx.params;\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findOne(id);\n\n    ctx.body = body;\n\n    strapi.telemetry.send('didWatchAnAuditLog');\n  },\n};\n"],"names":["findMany","ctx","query","request","validateFindMany","auditLogs","strapi","get","body","findManyUsers","page","pageSize","validateFindManyUsers","findOne","id","params","telemetry","send"],"mappings":";;;;AAIA,0BAAe;AACb,IAAA,MAAMA,UAASC,GAAY,EAAA;AACzB,QAAA,MAAM,EAAEC,KAAK,EAAE,GAAGD,IAAIE,OAAO;AAC7B,QAAA,MAAMC,0BAAAA,CAAiBF,KAAAA,CAAAA;QAEvB,MAAMG,WAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,WAAAA,CAAUL,QAAQ,CAACE,KAAAA,CAAAA;AAEtCD,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;AACb,IAAA,CAAA;AAEA,IAAA,MAAMC,eAAcR,GAAY,EAAA;AAC9B,QAAA,MAAM,EAAEC,KAAK,EAAE,GAAGD,IAAIE,OAAO;AAC7B,QAAA,MAAM,EAAEO,IAAI,EAAEC,QAAQ,EAAE,GAAG,MAAMC,+BAAAA,CAAsBV,KAAAA,CAAAA;QAEvD,MAAMG,WAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,WAAAA,CAAUI,aAAa,CAAC;AAAEC,YAAAA,IAAAA;AAAMC,YAAAA;AAAS,SAAA,CAAA;AAE5DV,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;AACb,IAAA,CAAA;AAEA,IAAA,MAAMK,SAAQZ,GAAY,EAAA;AACxB,QAAA,MAAM,EAAEa,EAAE,EAAE,GAAGb,IAAIc,MAAM;QAEzB,MAAMV,SAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,SAAAA,CAAUQ,OAAO,CAACC,EAAAA,CAAAA;AAErCb,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;QAEXF,MAAAA,CAAOU,SAAS,CAACC,IAAI,CAAC,oBAAA,CAAA;AACxB,IAAA;AACF,CAAA;;;;"}

package/dist/server/ee/server/src/audit-logs/controllers/audit-logs.mjs

@@ -1,4 +1,4 @@
-import { validateFindMany } from '../validation/audit-logs.mjs';
+import { validateFindManyUsers, validateFindMany } from '../validation/audit-logs.mjs';
 
 var auditLogsController = {
     async findMany (ctx) {
@@ -8,6 +8,16 @@ var auditLogsController = {
         const body = await auditLogs.findMany(query);
         ctx.body = body;
     },
+    async findManyUsers (ctx) {
+        const { query } = ctx.request;
+        const { page, pageSize } = await validateFindManyUsers(query);
+        const auditLogs = strapi.get('audit-logs');
+        const body = await auditLogs.findManyUsers({
+            page,
+            pageSize
+        });
+        ctx.body = body;
+    },
     async findOne (ctx) {
         const { id } = ctx.params;
         const auditLogs = strapi.get('audit-logs');

package/dist/server/ee/server/src/audit-logs/controllers/audit-logs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.mjs","sources":["../../../../../../../ee/server/src/audit-logs/controllers/audit-logs.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { validateFindMany } from '../validation/audit-logs';\n\nexport default {\n  async findMany(ctx: Context) {\n    const { query } = ctx.request;\n    await validateFindMany(query);\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findMany(query);\n\n    ctx.body = body;\n  },\n\n  async findOne(ctx: Context) {\n    const { id } = ctx.params;\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findOne(id);\n\n    ctx.body = body;\n\n    strapi.telemetry.send('didWatchAnAuditLog');\n  },\n};\n"],"names":["findMany","ctx","query","request","validateFindMany","auditLogs","strapi","get","body","findOne","id","params","telemetry","send"],"mappings":";;AAIA,0BAAe;AACb,IAAA,MAAMA,UAASC,GAAY,EAAA;AACzB,QAAA,MAAM,EAAEC,KAAK,EAAE,GAAGD,IAAIE,OAAO;AAC7B,QAAA,MAAMC,gBAAAA,CAAiBF,KAAAA,CAAAA;QAEvB,MAAMG,SAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,SAAAA,CAAUL,QAAQ,CAACE,KAAAA,CAAAA;AAEtCD,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;AACb,IAAA,CAAA;AAEA,IAAA,MAAMC,SAAQR,GAAY,EAAA;AACxB,QAAA,MAAM,EAAES,EAAE,EAAE,GAAGT,IAAIU,MAAM;QAEzB,MAAMN,SAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,SAAAA,CAAUI,OAAO,CAACC,EAAAA,CAAAA;AAErCT,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;QAEXF,MAAAA,CAAOM,SAAS,CAACC,IAAI,CAAC,oBAAA,CAAA;AACxB,IAAA;AACF,CAAA;;;;"}
+{"version":3,"file":"audit-logs.mjs","sources":["../../../../../../../ee/server/src/audit-logs/controllers/audit-logs.ts"],"sourcesContent":["import type { Context } from 'koa';\n\nimport { validateFindMany, validateFindManyUsers } from '../validation/audit-logs';\n\nexport default {\n  async findMany(ctx: Context) {\n    const { query } = ctx.request;\n    await validateFindMany(query);\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findMany(query);\n\n    ctx.body = body;\n  },\n\n  async findManyUsers(ctx: Context) {\n    const { query } = ctx.request;\n    const { page, pageSize } = await validateFindManyUsers(query);\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findManyUsers({ page, pageSize });\n\n    ctx.body = body;\n  },\n\n  async findOne(ctx: Context) {\n    const { id } = ctx.params;\n\n    const auditLogs = strapi.get('audit-logs');\n    const body = await auditLogs.findOne(id);\n\n    ctx.body = body;\n\n    strapi.telemetry.send('didWatchAnAuditLog');\n  },\n};\n"],"names":["findMany","ctx","query","request","validateFindMany","auditLogs","strapi","get","body","findManyUsers","page","pageSize","validateFindManyUsers","findOne","id","params","telemetry","send"],"mappings":";;AAIA,0BAAe;AACb,IAAA,MAAMA,UAASC,GAAY,EAAA;AACzB,QAAA,MAAM,EAAEC,KAAK,EAAE,GAAGD,IAAIE,OAAO;AAC7B,QAAA,MAAMC,gBAAAA,CAAiBF,KAAAA,CAAAA;QAEvB,MAAMG,SAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,SAAAA,CAAUL,QAAQ,CAACE,KAAAA,CAAAA;AAEtCD,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;AACb,IAAA,CAAA;AAEA,IAAA,MAAMC,eAAcR,GAAY,EAAA;AAC9B,QAAA,MAAM,EAAEC,KAAK,EAAE,GAAGD,IAAIE,OAAO;AAC7B,QAAA,MAAM,EAAEO,IAAI,EAAEC,QAAQ,EAAE,GAAG,MAAMC,qBAAAA,CAAsBV,KAAAA,CAAAA;QAEvD,MAAMG,SAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,SAAAA,CAAUI,aAAa,CAAC;AAAEC,YAAAA,IAAAA;AAAMC,YAAAA;AAAS,SAAA,CAAA;AAE5DV,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;AACb,IAAA,CAAA;AAEA,IAAA,MAAMK,SAAQZ,GAAY,EAAA;AACxB,QAAA,MAAM,EAAEa,EAAE,EAAE,GAAGb,IAAIc,MAAM;QAEzB,MAAMV,SAAAA,GAAYC,MAAAA,CAAOC,GAAG,CAAC,YAAA,CAAA;AAC7B,QAAA,MAAMC,IAAAA,GAAO,MAAMH,SAAAA,CAAUQ,OAAO,CAACC,EAAAA,CAAAA;AAErCb,QAAAA,GAAAA,CAAIO,IAAI,GAAGA,IAAAA;QAEXF,MAAAA,CAAOU,SAAS,CAACC,IAAI,CAAC,oBAAA,CAAA;AACxB,IAAA;AACF,CAAA;;;;"}

package/dist/server/ee/server/src/audit-logs/routes/audit-logs.js

@@ -2,6 +2,22 @@
 
 var utils = require('../../routes/utils.js');
 
+const getRouteConfig = ()=>({
+        middlewares: [
+            utils.enableFeatureMiddleware('audit-logs')
+        ],
+        policies: [
+            'admin::isAuthenticatedAdmin',
+            {
+                name: 'admin::hasPermissions',
+                config: {
+                    actions: [
+                        'admin::audit-logs.read'
+                    ]
+                }
+            }
+        ]
+    });
 var auditLogsRoutes = {
     type: 'admin',
     routes: [
@@ -9,43 +25,19 @@ var auditLogsRoutes = {
             method: 'GET',
             path: '/audit-logs',
             handler: 'audit-logs.findMany',
-            config: {
-                middlewares: [
-                    utils.enableFeatureMiddleware('audit-logs')
-                ],
-                policies: [
-                    'admin::isAuthenticatedAdmin',
-                    {
-                        name: 'admin::hasPermissions',
-                        config: {
-                            actions: [
-                                'admin::audit-logs.read'
-                            ]
-                        }
-                    }
-                ]
-            }
+            config: getRouteConfig()
+        },
+        {
+            method: 'GET',
+            path: '/audit-logs/users',
+            handler: 'audit-logs.findManyUsers',
+            config: getRouteConfig()
         },
         {
             method: 'GET',
             path: '/audit-logs/:id',
             handler: 'audit-logs.findOne',
-            config: {
-                middlewares: [
-                    utils.enableFeatureMiddleware('audit-logs')
-                ],
-                policies: [
-                    'admin::isAuthenticatedAdmin',
-                    {
-                        name: 'admin::hasPermissions',
-                        config: {
-                            actions: [
-                                'admin::audit-logs.read'
-                            ]
-                        }
-                    }
-                ]
-            }
+            config: getRouteConfig()
         }
     ]
 };

package/dist/server/ee/server/src/audit-logs/routes/audit-logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.js","sources":["../../../../../../../ee/server/src/audit-logs/routes/audit-logs.ts"],"sourcesContent":["import { enableFeatureMiddleware } from '../../routes/utils';\n\nexport default {\n  type: 'admin',\n  routes: [\n    {\n      method: 'GET',\n      path: '/audit-logs',\n      handler: 'audit-logs.findMany',\n      config: {\n        middlewares: [enableFeatureMiddleware('audit-logs')],\n        policies: [\n          'admin::isAuthenticatedAdmin',\n          {\n            name: 'admin::hasPermissions',\n            config: {\n              actions: ['admin::audit-logs.read'],\n            },\n          },\n        ],\n      },\n    },\n    {\n      method: 'GET',\n      path: '/audit-logs/:id',\n      handler: 'audit-logs.findOne',\n      config: {\n        middlewares: [enableFeatureMiddleware('audit-logs')],\n        policies: [\n          'admin::isAuthenticatedAdmin',\n          {\n            name: 'admin::hasPermissions',\n            config: {\n              actions: ['admin::audit-logs.read'],\n            },\n          },\n        ],\n      },\n    },\n  ],\n};\n"],"names":["type","routes","method","path","handler","config","middlewares","enableFeatureMiddleware","policies","name","actions"],"mappings":";;;;AAEA,sBAAe;IACbA,IAAAA,EAAM,OAAA;IACNC,MAAAA,EAAQ;AACN,QAAA;YACEC,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,aAAA;YACNC,OAAAA,EAAS,qBAAA;YACTC,MAAAA,EAAQ;gBACNC,WAAAA,EAAa;oBAACC,6BAAAA,CAAwB,YAAA;AAAc,iBAAA;gBACpDC,QAAAA,EAAU;AACR,oBAAA,6BAAA;AACA,oBAAA;wBACEC,IAAAA,EAAM,uBAAA;wBACNJ,MAAAA,EAAQ;4BACNK,OAAAA,EAAS;AAAC,gCAAA;AAAyB;AACrC;AACF;AACD;AACH;AACF,SAAA;AACA,QAAA;YACER,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,iBAAA;YACNC,OAAAA,EAAS,oBAAA;YACTC,MAAAA,EAAQ;gBACNC,WAAAA,EAAa;oBAACC,6BAAAA,CAAwB,YAAA;AAAc,iBAAA;gBACpDC,QAAAA,EAAU;AACR,oBAAA,6BAAA;AACA,oBAAA;wBACEC,IAAAA,EAAM,uBAAA;wBACNJ,MAAAA,EAAQ;4BACNK,OAAAA,EAAS;AAAC,gCAAA;AAAyB;AACrC;AACF;AACD;AACH;AACF;AACD;AACH,CAAA;;;;"}
+{"version":3,"file":"audit-logs.js","sources":["../../../../../../../ee/server/src/audit-logs/routes/audit-logs.ts"],"sourcesContent":["import { enableFeatureMiddleware } from '../../routes/utils';\n\nconst getRouteConfig = () => ({\n  middlewares: [enableFeatureMiddleware('audit-logs')],\n  policies: [\n    'admin::isAuthenticatedAdmin',\n    {\n      name: 'admin::hasPermissions',\n      config: {\n        actions: ['admin::audit-logs.read'],\n      },\n    },\n  ],\n});\n\nexport default {\n  type: 'admin',\n  routes: [\n    {\n      method: 'GET',\n      path: '/audit-logs',\n      handler: 'audit-logs.findMany',\n      config: getRouteConfig(),\n    },\n    {\n      method: 'GET',\n      path: '/audit-logs/users',\n      handler: 'audit-logs.findManyUsers',\n      config: getRouteConfig(),\n    },\n    {\n      method: 'GET',\n      path: '/audit-logs/:id',\n      handler: 'audit-logs.findOne',\n      config: getRouteConfig(),\n    },\n  ],\n};\n"],"names":["getRouteConfig","middlewares","enableFeatureMiddleware","policies","name","config","actions","type","routes","method","path","handler"],"mappings":";;;;AAEA,MAAMA,cAAAA,GAAiB,KAAO;QAC5BC,WAAAA,EAAa;YAACC,6BAAAA,CAAwB,YAAA;AAAc,SAAA;QACpDC,QAAAA,EAAU;AACR,YAAA,6BAAA;AACA,YAAA;gBACEC,IAAAA,EAAM,uBAAA;gBACNC,MAAAA,EAAQ;oBACNC,OAAAA,EAAS;AAAC,wBAAA;AAAyB;AACrC;AACF;AACD;KACH,CAAA;AAEA,sBAAe;IACbC,IAAAA,EAAM,OAAA;IACNC,MAAAA,EAAQ;AACN,QAAA;YACEC,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,aAAA;YACNC,OAAAA,EAAS,qBAAA;YACTN,MAAAA,EAAQL,cAAAA;AACV,SAAA;AACA,QAAA;YACES,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,mBAAA;YACNC,OAAAA,EAAS,0BAAA;YACTN,MAAAA,EAAQL,cAAAA;AACV,SAAA;AACA,QAAA;YACES,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,iBAAA;YACNC,OAAAA,EAAS,oBAAA;YACTN,MAAAA,EAAQL,cAAAA;AACV;AACD;AACH,CAAA;;;;"}

package/dist/server/ee/server/src/audit-logs/routes/audit-logs.mjs

@@ -1,5 +1,21 @@
 import { enableFeatureMiddleware } from '../../routes/utils.mjs';
 
+const getRouteConfig = ()=>({
+        middlewares: [
+            enableFeatureMiddleware('audit-logs')
+        ],
+        policies: [
+            'admin::isAuthenticatedAdmin',
+            {
+                name: 'admin::hasPermissions',
+                config: {
+                    actions: [
+                        'admin::audit-logs.read'
+                    ]
+                }
+            }
+        ]
+    });
 var auditLogsRoutes = {
     type: 'admin',
     routes: [
@@ -7,43 +23,19 @@ var auditLogsRoutes = {
             method: 'GET',
             path: '/audit-logs',
             handler: 'audit-logs.findMany',
-            config: {
-                middlewares: [
-                    enableFeatureMiddleware('audit-logs')
-                ],
-                policies: [
-                    'admin::isAuthenticatedAdmin',
-                    {
-                        name: 'admin::hasPermissions',
-                        config: {
-                            actions: [
-                                'admin::audit-logs.read'
-                            ]
-                        }
-                    }
-                ]
-            }
+            config: getRouteConfig()
+        },
+        {
+            method: 'GET',
+            path: '/audit-logs/users',
+            handler: 'audit-logs.findManyUsers',
+            config: getRouteConfig()
         },
         {
             method: 'GET',
             path: '/audit-logs/:id',
             handler: 'audit-logs.findOne',
-            config: {
-                middlewares: [
-                    enableFeatureMiddleware('audit-logs')
-                ],
-                policies: [
-                    'admin::isAuthenticatedAdmin',
-                    {
-                        name: 'admin::hasPermissions',
-                        config: {
-                            actions: [
-                                'admin::audit-logs.read'
-                            ]
-                        }
-                    }
-                ]
-            }
+            config: getRouteConfig()
         }
     ]
 };

package/dist/server/ee/server/src/audit-logs/routes/audit-logs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"audit-logs.mjs","sources":["../../../../../../../ee/server/src/audit-logs/routes/audit-logs.ts"],"sourcesContent":["import { enableFeatureMiddleware } from '../../routes/utils';\n\nexport default {\n  type: 'admin',\n  routes: [\n    {\n      method: 'GET',\n      path: '/audit-logs',\n      handler: 'audit-logs.findMany',\n      config: {\n        middlewares: [enableFeatureMiddleware('audit-logs')],\n        policies: [\n          'admin::isAuthenticatedAdmin',\n          {\n            name: 'admin::hasPermissions',\n            config: {\n              actions: ['admin::audit-logs.read'],\n            },\n          },\n        ],\n      },\n    },\n    {\n      method: 'GET',\n      path: '/audit-logs/:id',\n      handler: 'audit-logs.findOne',\n      config: {\n        middlewares: [enableFeatureMiddleware('audit-logs')],\n        policies: [\n          'admin::isAuthenticatedAdmin',\n          {\n            name: 'admin::hasPermissions',\n            config: {\n              actions: ['admin::audit-logs.read'],\n            },\n          },\n        ],\n      },\n    },\n  ],\n};\n"],"names":["type","routes","method","path","handler","config","middlewares","enableFeatureMiddleware","policies","name","actions"],"mappings":";;AAEA,sBAAe;IACbA,IAAAA,EAAM,OAAA;IACNC,MAAAA,EAAQ;AACN,QAAA;YACEC,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,aAAA;YACNC,OAAAA,EAAS,qBAAA;YACTC,MAAAA,EAAQ;gBACNC,WAAAA,EAAa;oBAACC,uBAAAA,CAAwB,YAAA;AAAc,iBAAA;gBACpDC,QAAAA,EAAU;AACR,oBAAA,6BAAA;AACA,oBAAA;wBACEC,IAAAA,EAAM,uBAAA;wBACNJ,MAAAA,EAAQ;4BACNK,OAAAA,EAAS;AAAC,gCAAA;AAAyB;AACrC;AACF;AACD;AACH;AACF,SAAA;AACA,QAAA;YACER,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,iBAAA;YACNC,OAAAA,EAAS,oBAAA;YACTC,MAAAA,EAAQ;gBACNC,WAAAA,EAAa;oBAACC,uBAAAA,CAAwB,YAAA;AAAc,iBAAA;gBACpDC,QAAAA,EAAU;AACR,oBAAA,6BAAA;AACA,oBAAA;wBACEC,IAAAA,EAAM,uBAAA;wBACNJ,MAAAA,EAAQ;4BACNK,OAAAA,EAAS;AAAC,gCAAA;AAAyB;AACrC;AACF;AACD;AACH;AACF;AACD;AACH,CAAA;;;;"}
+{"version":3,"file":"audit-logs.mjs","sources":["../../../../../../../ee/server/src/audit-logs/routes/audit-logs.ts"],"sourcesContent":["import { enableFeatureMiddleware } from '../../routes/utils';\n\nconst getRouteConfig = () => ({\n  middlewares: [enableFeatureMiddleware('audit-logs')],\n  policies: [\n    'admin::isAuthenticatedAdmin',\n    {\n      name: 'admin::hasPermissions',\n      config: {\n        actions: ['admin::audit-logs.read'],\n      },\n    },\n  ],\n});\n\nexport default {\n  type: 'admin',\n  routes: [\n    {\n      method: 'GET',\n      path: '/audit-logs',\n      handler: 'audit-logs.findMany',\n      config: getRouteConfig(),\n    },\n    {\n      method: 'GET',\n      path: '/audit-logs/users',\n      handler: 'audit-logs.findManyUsers',\n      config: getRouteConfig(),\n    },\n    {\n      method: 'GET',\n      path: '/audit-logs/:id',\n      handler: 'audit-logs.findOne',\n      config: getRouteConfig(),\n    },\n  ],\n};\n"],"names":["getRouteConfig","middlewares","enableFeatureMiddleware","policies","name","config","actions","type","routes","method","path","handler"],"mappings":";;AAEA,MAAMA,cAAAA,GAAiB,KAAO;QAC5BC,WAAAA,EAAa;YAACC,uBAAAA,CAAwB,YAAA;AAAc,SAAA;QACpDC,QAAAA,EAAU;AACR,YAAA,6BAAA;AACA,YAAA;gBACEC,IAAAA,EAAM,uBAAA;gBACNC,MAAAA,EAAQ;oBACNC,OAAAA,EAAS;AAAC,wBAAA;AAAyB;AACrC;AACF;AACD;KACH,CAAA;AAEA,sBAAe;IACbC,IAAAA,EAAM,OAAA;IACNC,MAAAA,EAAQ;AACN,QAAA;YACEC,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,aAAA;YACNC,OAAAA,EAAS,qBAAA;YACTN,MAAAA,EAAQL,cAAAA;AACV,SAAA;AACA,QAAA;YACES,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,mBAAA;YACNC,OAAAA,EAAS,0BAAA;YACTN,MAAAA,EAAQL,cAAAA;AACV,SAAA;AACA,QAAA;YACES,MAAAA,EAAQ,KAAA;YACRC,IAAAA,EAAM,iBAAA;YACNC,OAAAA,EAAS,oBAAA;YACTN,MAAAA,EAAQL,cAAAA;AACV;AACD;AACH,CAAA;;;;"}

package/dist/server/ee/server/src/audit-logs/services/audit-logs.js

@@ -31,7 +31,7 @@ const getSanitizedUser = (user)=>{
             return this;
         },
         async findMany (query) {
-            const { results, pagination } = await strapi.db?.query('admin::audit-log').findPage({
+            const { results, pagination } = await strapi.db.query('admin::audit-log').findPage({
                 populate: [
                     'user'
                 ],
@@ -54,6 +54,38 @@ const getSanitizedUser = (user)=>{
                 pagination
             };
         },
+        async findManyUsers (query) {
+            const { page = 1, pageSize = 10 } = query;
+            const userAttribute = strapi.db.metadata.get('admin::audit-log').attributes.user;
+            if (userAttribute?.type !== 'relation' || !('joinTable' in userAttribute) || !userAttribute.joinTable || !('inverseJoinColumn' in userAttribute.joinTable)) {
+                throw new Error('The audit log user relation is expected to use a join table');
+            }
+            const { joinTable } = userAttribute;
+            const authorIds = await strapi.db.connection(joinTable.name).distinct(joinTable.inverseJoinColumn.name).pluck(joinTable.inverseJoinColumn.name);
+            const { results, pagination } = await strapi.db.query('admin::user').findPage({
+                select: [
+                    'id',
+                    'email',
+                    'username',
+                    'firstname',
+                    'lastname'
+                ],
+                where: {
+                    id: {
+                        $in: authorIds
+                    }
+                },
+                orderBy: {
+                    id: 'asc'
+                },
+                page: Number(page),
+                pageSize: Number(pageSize)
+            });
+            return {
+                results: results.map(getSanitizedUser),
+                pagination
+            };
+        },
         async findOne (id) {
             const result = await strapi.db?.query('admin::audit-log').findOne({
                 where: {