fix(api-headless-cms): dates and identity in entry input (#3718)

webiny · Nov 23, 2023 · b63c1f8 · b63c1f8
1 parent d6385e3
commit b63c1f8
Show file tree

Hide file tree

Showing 42 changed files with 890 additions and 115 deletions.
diff --git a/packages/api-aco/__tests__/snapshots/customAppsSchema.ts b/packages/api-aco/__tests__/snapshots/customAppsSchema.ts
@@ -199,6 +199,13 @@ export const createCustomAppsSchemaSnapshot = () => {
           savedOn_lte: DateTime
           savedOn_between: [DateTime!]
           savedOn_not_between: [DateTime!]
+          publishedOn: DateTime
+          publishedOn_gt: DateTime
+          publishedOn_gte: DateTime
+          publishedOn_lt: DateTime
+          publishedOn_lte: DateTime
+          publishedOn_between: [DateTime!]
+          publishedOn_not_between: [DateTime!]
           createdBy: String
           createdBy_not: String
           createdBy_in: [String!]

diff --git a/packages/api-aco/__tests__/snapshots/defaultAppsSchema.ts b/packages/api-aco/__tests__/snapshots/defaultAppsSchema.ts
@@ -173,6 +173,13 @@ export const createDefaultAppsSchemaSnapshot = () => {
           savedOn_lte: DateTime
           savedOn_between: [DateTime!]
           savedOn_not_between: [DateTime!]
+          publishedOn: DateTime
+          publishedOn_gt: DateTime
+          publishedOn_gte: DateTime
+          publishedOn_lt: DateTime
+          publishedOn_lte: DateTime
+          publishedOn_between: [DateTime!]
+          publishedOn_not_between: [DateTime!]
           createdBy: String
           createdBy_not: String
           createdBy_in: [String!]

diff --git a/packages/api-apw/src/storageOperations/changeRequestStorageOperations.ts b/packages/api-apw/src/storageOperations/changeRequestStorageOperations.ts
@@ -100,7 +100,8 @@ export const createChangeRequestStorageOperations = (
             const entry = await security.withoutAuthorization(async () => {
                 return cms.updateEntry(model, params.id, {
                     ...existingEntry,
-                    ...params.data
+                    ...params.data,
+                    savedOn: new Date()
                 });
             });
             return getFieldValues({

diff --git a/packages/api-apw/src/storageOperations/commentStorageOperations.ts b/packages/api-apw/src/storageOperations/commentStorageOperations.ts
@@ -104,7 +104,8 @@ export const createCommentStorageOperations = ({
             const entry = await security.withoutAuthorization(async () => {
                 return cms.updateEntry(model, params.id, {
                     ...existingEntry,
-                    ...params.data
+                    ...params.data,
+                    savedOn: new Date()
                 });
             });
 

diff --git a/packages/api-apw/src/storageOperations/contentReviewStorageOperations.ts b/packages/api-apw/src/storageOperations/contentReviewStorageOperations.ts
@@ -68,7 +68,8 @@ export const createContentReviewStorageOperations = ({
             const entry = await security.withoutAuthorization(async () => {
                 return cms.updateEntry(model, params.id, {
                     ...existingEntry,
-                    ...params.data
+                    ...params.data,
+                    savedOn: new Date()
                 });
             });
             return getFieldValues(entry, baseFields);

diff --git a/packages/api-apw/src/storageOperations/reviewerStorageOperations.ts b/packages/api-apw/src/storageOperations/reviewerStorageOperations.ts
@@ -64,7 +64,8 @@ export const createReviewerStorageOperations = ({
             const entry = await security.withoutAuthorization(async () => {
                 return cms.updateEntry(model, params.id, {
                     ...existingEntry,
-                    ...params.data
+                    ...params.data,
+                    savedOn: new Date()
                 });
             });
             return getFieldValues(entry, baseFields);

diff --git a/packages/api-apw/src/storageOperations/workflowStorageOperations.ts b/packages/api-apw/src/storageOperations/workflowStorageOperations.ts
@@ -87,7 +87,8 @@ export const createWorkflowStorageOperations = (
             const existingEntry = await getWorkflow({ id: params.id });
             const input = {
                 ...existingEntry,
-                ...params.data
+                ...params.data,
+                savedOn: new Date()
             };
             const data = formatReviewersForRefInput(
                 input as CreateApwWorkflowParams,

diff --git a/packages/api-file-manager/__tests__/file.customDates.test.ts b/packages/api-file-manager/__tests__/file.customDates.test.ts
@@ -0,0 +1,58 @@
+import useGqlHandler from "./utils/useGqlHandler";
+import { fileAData, ids } from "./mocks/files";
+
+describe("file custom dates", () => {
+    const { createFile, updateFile } = useGqlHandler();
+
+    it("should create and update file with custom dates", async () => {
+        const [createResponse] = await createFile(
+            {
+                data: {
+                    ...fileAData,
+                    createdOn: "1995-01-01T00:00:00.000Z",
+                    savedOn: "1995-01-01T00:00:00.000Z"
+                }
+            },
+            ["createdOn", "savedOn"]
+        );
+        expect(createResponse).toEqual({
+            data: {
+                fileManager: {
+                    createFile: {
+                        data: {
+                            ...fileAData,
+                            createdOn: "1995-01-01T00:00:00.000Z",
+                            savedOn: "1995-01-01T00:00:00.000Z"
+                        },
+                        error: null
+                    }
+                }
+            }
+        });
+
+        const [updateResponse] = await updateFile(
+            {
+                id: ids.A,
+                data: {
+                    createdOn: "2005-01-01T00:00:00.000Z",
+                    savedOn: "2005-01-01T00:00:00.000Z"
+                }
+            },
+            ["createdOn", "savedOn"]
+        );
+        expect(updateResponse).toEqual({
+            data: {
+                fileManager: {
+                    updateFile: {
+                        data: {
+                            ...fileAData,
+                            createdOn: "2005-01-01T00:00:00.000Z",
+                            savedOn: "2005-01-01T00:00:00.000Z"
+                        },
+                        error: null
+                    }
+                }
+            }
+        });
+    });
+});
diff --git a/packages/api-file-manager/__tests__/file.customIdentities.test.ts b/packages/api-file-manager/__tests__/file.customIdentities.test.ts
@@ -0,0 +1,107 @@
+import useGqlHandler from "./utils/useGqlHandler";
+import { fileAData } from "./mocks/files";
+import { SecurityIdentity } from "@webiny/api-security/types";
+
+const extraFields = ["createdBy {id displayName type}", "modifiedBy {id displayName type}"];
+describe("file custom identities", () => {
+    const { createFile, updateFile, identity: defaultIdentity } = useGqlHandler();
+
+    const mockIdentityOne: SecurityIdentity = {
+        id: "mock-identity-one",
+        displayName: "Mock Identity One",
+        type: "mockOne"
+    };
+    const mockIdentityTwo: SecurityIdentity = {
+        id: "mock-identity-two",
+        displayName: "Mock Identity Two",
+        type: "mockTwo"
+    };
+
+    it("should create a file with custom identity", async () => {
+        const [createRegularResponse] = await createFile(
+            {
+                data: {
+                    ...fileAData
+                }
+            },
+            extraFields
+        );
+        expect(createRegularResponse).toEqual({
+            data: {
+                fileManager: {
+                    createFile: {
+                        data: {
+                            ...fileAData,
+                            createdBy: defaultIdentity,
+                            modifiedBy: null
+                        },
+                        error: null
+                    }
+                }
+            }
+        });
+
+        const [createCustomIdentityResponse] = await createFile(
+            {
+                data: {
+                    ...fileAData,
+                    createdBy: mockIdentityOne,
+                    modifiedBy: mockIdentityTwo
+                }
+            },
+            extraFields
+        );
+        expect(createCustomIdentityResponse).toEqual({
+            data: {
+                fileManager: {
+                    createFile: {
+                        data: {
+                            ...fileAData,
+                            createdBy: mockIdentityOne,
+                            modifiedBy: mockIdentityTwo
+                        },
+                        error: null
+                    }
+                }
+            }
+        });
+    });
+
+    it("should update a file with custom identity", async () => {
+        const [createResponse] = await createFile(
+            {
+                data: {
+                    ...fileAData
+                }
+            },
+            extraFields
+        );
+
+        const id = createResponse.data.fileManager.createFile.data.id;
+
+        const [updateResponse] = await updateFile(
+            {
+                id,
+                data: {
+                    createdBy: mockIdentityOne,
+                    modifiedBy: mockIdentityTwo
+                }
+            },
+            extraFields
+        );
+        expect(updateResponse).toEqual({
+            data: {
+                fileManager: {
+                    updateFile: {
+                        data: {
+                            ...fileAData,
+                            createdBy: mockIdentityOne,
+                            modifiedBy: mockIdentityTwo
+                        },
+                        error: null
+                    }
+                }
+            }
+        });
+    });
+});
diff --git a/packages/api-file-manager/__tests__/file.lifecycle.test.ts b/packages/api-file-manager/__tests__/file.lifecycle.test.ts
@@ -77,7 +77,7 @@ describe("File lifecycle events", () => {
          * Parameters that were received in the lifecycle hooks must be valid as well.
          */
         const beforeCreate = tracker.getLast("file:beforeCreate");
-        expect(beforeCreate && beforeCreate.params[0]).toEqual({
+        expect(beforeCreate && beforeCreate.params[0]).toMatchObject({
             file: {
                 ...fileData,
                 ...hookParamsExpected,
@@ -88,7 +88,7 @@ describe("File lifecycle events", () => {
             }
         });
         const afterCreate = tracker.getLast("file:beforeCreate");
-        expect(afterCreate && afterCreate.params[0]).toEqual({
+        expect(afterCreate && afterCreate.params[0]).toMatchObject({
             file: {
                 ...fileData,
                 ...hookParamsExpected,
@@ -138,7 +138,7 @@ describe("File lifecycle events", () => {
          * Parameters that were received in the lifecycle hooks must be valid as well.
          */
         const beforeUpdate = tracker.getLast("file:beforeUpdate");
-        expect(beforeUpdate && beforeUpdate.params[0]).toEqual({
+        expect(beforeUpdate && beforeUpdate.params[0]).toMatchObject({
             input: { tags: [...fileData.tags, TAG] },
             original: {
                 ...fileData,
@@ -160,7 +160,7 @@ describe("File lifecycle events", () => {
             }
         });
         const afterUpdate = tracker.getLast("file:afterUpdate");
-        expect(afterUpdate && afterUpdate.params[0]).toEqual({
+        expect(afterUpdate && afterUpdate.params[0]).toMatchObject({
             input: { tags: [...fileData.tags, TAG] },
             original: {
                 ...fileData,
@@ -219,6 +219,7 @@ describe("File lifecycle events", () => {
             file: {
                 ...fileData,
                 ...hookParamsExpected,
+                modifiedBy: null,
                 location: {
                     folderId: ROOT_FOLDER
                 },
@@ -230,6 +231,7 @@ describe("File lifecycle events", () => {
             file: {
                 ...fileData,
                 ...hookParamsExpected,
+                modifiedBy: null,
                 location: {
                     folderId: ROOT_FOLDER
                 },

diff --git a/packages/api-file-manager/__tests__/mocks/file.sdl.ts b/packages/api-file-manager/__tests__/mocks/file.sdl.ts
@@ -98,6 +98,7 @@ export default /* GraphQL */ `
         savedOn: DateTime!
         createdOn: DateTime!
         createdBy: FmCreatedBy!
+        modifiedBy: FmCreatedBy
         src: String
         location: FmFile_Location
         name: String
@@ -127,8 +128,18 @@ export default /* GraphQL */ `
         article: RefFieldInput
     }
 
+    input FmCreatedByInput {
+        id: ID!
+        displayName: String!
+        type: String!
+    }
+
     input FmFileCreateInput {
         id: ID!
+        createdOn: DateTime
+        savedOn: DateTime
+        createdBy: FmCreatedByInput
+        modifiedBy: FmCreatedByInput
         location: FmFile_LocationInput
         name: String
         key: String
@@ -141,6 +152,10 @@ export default /* GraphQL */ `
     }
 
     input FmFileUpdateInput {
+        createdOn: DateTime
+        savedOn: DateTime
+        createdBy: FmCreatedByInput
+        modifiedBy: FmCreatedByInput
         location: FmFile_LocationInput
         name: String
         key: String
@@ -176,6 +191,13 @@ export default /* GraphQL */ `
         savedOn_lte: DateTime
         savedOn_between: [DateTime!]
         savedOn_not_between: [DateTime!]
+        publishedOn: DateTime
+        publishedOn_gt: DateTime
+        publishedOn_gte: DateTime
+        publishedOn_lt: DateTime
+        publishedOn_lte: DateTime
+        publishedOn_between: [DateTime!]
+        publishedOn_not_between: [DateTime!]
         createdBy: String
         createdBy_not: String
         createdBy_in: [String!]

diff --git a/packages/api-file-manager/__tests__/utils/tenancySecurity.ts b/packages/api-file-manager/__tests__/utils/tenancySecurity.ts
@@ -16,6 +16,12 @@ interface Config {
     identity?: SecurityIdentity | null;
 }
 
+export const defaultIdentity: SecurityIdentity = {
+    id: "12345678",
+    type: "admin",
+    displayName: "John Doe"
+};
+
 export const createTenancyAndSecurity = ({ permissions, identity }: Config) => {
     const securityStorage = getStorageOps<SecurityStorageOperations>("security");
     const tenancyStorage = getStorageOps<TenancyStorageOperations>("tenancy");
@@ -41,13 +47,7 @@ export const createTenancyAndSecurity = ({ permissions, identity }: Config) => {
             });
 
             context.security.addAuthenticator(async () => {
-                return (
-                    identity || {
-                        id: "12345678",
-                        type: "admin",
-                        displayName: "John Doe"
-                    }
-                );
+                return identity || defaultIdentity;
             });
 
             context.security.addAuthorizer(async () => {