Merge branch '5.x' into 6.x

Author: rsill-neo4j

modules/ROOT/content-nav.adoc

@@ -6,35 +6,30 @@
 * xref:getting-started/toolbox.adoc[]
 
 * *Reference*
-
-* xref:authentication-and-authorization/index.adoc[]
-** xref:authentication-and-authorization/configuration.adoc[]
-** xref:authentication-and-authorization/authentication.adoc[]
-** xref:authentication-and-authorization/authorization.adoc[]
-** xref:authentication-and-authorization/impersonation-and-user-switching.adoc[]
-** xref:authentication-and-authorization/operations.adoc[]
-
-* Type definitions
-** xref:type-definitions/types/index.adoc[]
-*** xref:type-definitions/types/scalar.adoc[Scalar]
-*** xref:type-definitions/types/temporal.adoc[Temporal]
-*** xref:type-definitions/types/spatial.adoc[Spatial]
-*** xref:type-definitions/types/interfaces.adoc[Interfaces]
-*** xref:type-definitions/types/unions.adoc[Union]
-*** xref:type-definitions/types/relationships.adoc[]
-** xref:type-definitions/directives/index.adoc[]
-*** xref:type-definitions/directives/basics.adoc[]
-*** xref:type-definitions/directives/autogeneration.adoc[]
-*** xref:type-definitions/directives/custom-directives.adoc[]
-*** xref:type-definitions/directives/cypher.adoc[]
-*** xref:type-definitions/directives/default-values.adoc[]
-*** xref:type-definitions/directives/database-mapping.adoc[]
-*** xref:type-definitions/directives/indexes-and-constraints.adoc[]
-
-* xref:schema-configuration/index.adoc[Schema configuration]
-** xref:schema-configuration/type-configuration.adoc[]
-** xref:schema-configuration/global-configuration.adoc[]
-** xref:schema-configuration/field-configuration.adoc[]
+* xref:security/index.adoc[]
+** xref:security/configuration.adoc[]
+** xref:security/authentication.adoc[]
+** xref:security/authorization.adoc[]
+** xref:security/impersonation-and-user-switching.adoc[]
+** xref:security/operations.adoc[]
+* xref:types/index.adoc[]
+** xref:types/scalar.adoc[Scalar]
+** xref:types/temporal.adoc[Temporal]
+** xref:types/spatial.adoc[Spatial]
+** xref:types/interfaces.adoc[Interfaces]
+** xref:types/unions.adoc[Union]
+** xref:types/relationships.adoc[]
+* xref:directives/index.adoc[]
+** xref:directives/database-mapping.adoc[]
+
+** xref:directives/autogeneration.adoc[]
+** xref:directives/schema-configuration/index.adoc[]
+*** xref:directives/schema-configuration/global-configuration.adoc[]
+*** xref:directives/schema-configuration/type-configuration.adoc[]
+*** xref:directives/schema-configuration/field-configuration.adoc[]
+** xref:directives/indexes-and-constraints.adoc[]
+** xref:directives/custom-logic.adoc[]
+** xref:directives/custom-directives.adoc[]
 
 * xref:queries-aggregations/index.adoc[Queries and aggregations]
 ** xref:queries-aggregations/queries.adoc[]
@@ -59,7 +54,6 @@
 
 * *How-To*
 
-* xref:custom-resolvers.adoc[]
 * xref:driver-configuration.adoc[]
 
 * *Products*

modules/ROOT/pages/authentication-and-authorization/index.adoc

@@ -0,0 +1,95 @@
+[[type-definitions-autogeneration]]
+= Autogeneration
+:page-aliases: type-definitions/autogeneration.adoc, type-definitions/directives/autogeneration.adoc
+:description: This page describes directives used for autogeneration.
+
+
+This page describes directives used for autogeneration:
+
+[[type-definitions-autogeneration-id]]
+== `@id`
+
+This directive marks a field as an identifier for an object type.
+This enables autogeneration of IDs for the field.
+
+The format of each generated ID is a UUID generated by https://neo4j.com/docs/cypher-manual/current/functions/scalar/#functions-randomuuid[randomUUID() function].
+The field will not be present in input types for mutations.
+
+It is recommended to use xref::/directives/indexes-and-constraints.adoc#type-definitions-constraints-unique[`@unique`] in conjunction with this to add a unique node property constraint.
+
+=== Definition
+
+[source, graphql, indent=0]
+----
+"""Indicates that the field is an identifier for the object type."""
+directive @id on FIELD_DEFINITION
+----
+
+=== Usage
+
+The following type definition specifies the `id` field as an autogenerated value:
+
+[source, graphql, indent=0]
+----
+type User {
+    id: ID! @id
+    username: String!
+}
+----
+
+[[type-definitions-autogeneration-timestamp]]
+== `@timestamp`
+
+This directive marks a field as a timestamp field, which can be used to store timestamps of when particular events happen through the GraphQL API.
+
+[NOTE]
+====
+These events are triggered and stored at the GraphQL API layer. 
+Events happening in your database through other routes do not trigger updates of these timestamps.
+====
+
+=== Definition
+
+[source, graphql, indent=0]
+----
+enum TimestampOperation {
+    CREATE
+    UPDATE
+}
+
+"""Instructs @neo4j/graphql to generate timestamps on particular events, which will be available as the value of the specified field."""
+directive @timestamp(
+    """Which events to generate timestamps on. Defaults to both create and update."""
+    operations: [TimestampOperation!]! = [CREATE, UPDATE]
+) on FIELD_DEFINITION
+----
+
+=== Usage
+
+The following type definition has two individual fields to store the timestamps of create and update events:
+
+[source, graphql, indent=0]
+----
+type User {
+    createdAt: DateTime! @timestamp(operations: [CREATE])
+    updatedAt: DateTime! @timestamp(operations: [UPDATE])
+}
+----
+
+The following two equivalent type definitions have a single field storing the event timestamp of the last `create` or `update`:
+
+[source, graphql, indent=0]
+----
+type User {
+    lastModified: DateTime! @timestamp
+}
+----
+
+[source, graphql, indent=0]
+----
+type User {
+    lastModified: DateTime! @timestamp(operations: [CREATE, UPDATE])
+}
+----
+
+[[type-definitions-autogeneration-populated-by]]

modules/ROOT/pages/custom-resolvers.adoc

@@ -1,7 +1,7 @@
 [[type-definitions-custom-directives]]
-:description: This page describes how to use custom directives in the Neo4j GraphQL Library.
 = Custom directives
-:page-aliases: type-definitions/custom-directives.adoc
+:page-aliases: type-definitions/custom-directives.adoc, type-definitions/directives/custom-directives.adoc
+:description: This page describes how to use custom directives in the Neo4j GraphQL Library.
 
 As of https://www.graphql-tools.com/docs/schema-directives[`@graphql-tools`] version 8, the mechanism for defining and applying custom directives has changed significantly, and this is reflected in the Neo4j GraphQL Library.