@directus/api 35.0.2 → 35.1.0

package/dist/services/graphql/resolvers/system.js

@@ -47,98 +47,90 @@ function injectSystemResolvers(gql, schemaComposer, { CreateCollectionTypes, Rea
 			}
 		}) } }
 	});
-	if (gql.accountability?.user) {
-		ServerInfo.addFields({
-			rateLimit: env["RATE_LIMITER_ENABLED"] ? { type: new GraphQLObjectType({
-				name: "server_info_rate_limit",
-				fields: {
-					points: { type: GraphQLInt },
-					duration: { type: GraphQLInt }
-				}
-			}) } : GraphQLBoolean,
-			rateLimitGlobal: env["RATE_LIMITER_GLOBAL_ENABLED"] ? { type: new GraphQLObjectType({
-				name: "server_info_rate_limit_global",
-				fields: {
-					points: { type: GraphQLInt },
-					duration: { type: GraphQLInt }
-				}
-			}) } : GraphQLBoolean,
-			websocket: toBoolean(env["WEBSOCKETS_ENABLED"]) ? { type: new GraphQLObjectType({
-				name: "server_info_websocket",
-				fields: {
-					rest: { type: toBoolean(env["WEBSOCKETS_REST_ENABLED"]) ? new GraphQLObjectType({
-						name: "server_info_websocket_rest",
-						fields: {
-							authentication: { type: new GraphQLEnumType({
-								name: "server_info_websocket_rest_authentication",
-								values: {
-									public: { value: "public" },
-									handshake: { value: "handshake" },
-									strict: { value: "strict" }
-								}
-							}) },
-							path: { type: GraphQLString }
-						}
-					}) : GraphQLBoolean },
-					graphql: { type: toBoolean(env["WEBSOCKETS_GRAPHQL_ENABLED"]) ? new GraphQLObjectType({
-						name: "server_info_websocket_graphql",
-						fields: {
-							authentication: { type: new GraphQLEnumType({
-								name: "server_info_websocket_graphql_authentication",
-								values: {
-									public: { value: "public" },
-									handshake: { value: "handshake" },
-									strict: { value: "strict" }
-								}
-							}) },
-							path: { type: GraphQLString }
-						}
-					}) : GraphQLBoolean },
-					heartbeat: { type: toBoolean(env["WEBSOCKETS_HEARTBEAT_ENABLED"]) ? GraphQLInt : GraphQLBoolean }
-				}
-			}) } : GraphQLBoolean,
-			queryLimit: { type: new GraphQLObjectType({
-				name: "server_info_query_limit",
-				fields: {
-					default: { type: GraphQLInt },
-					max: { type: GraphQLInt }
-				}
-			}) }
-		});
-	}
-	if (env["OPENAPI_ENABLED"] !== false) {
-		schemaComposer.Query.addFields({ server_specs_oas: {
-			type: GraphQLJSON,
-			resolve: dedupeResolver(async () => {
-				const service = new SpecificationService({
-					schema: gql.schema,
-					accountability: gql.accountability
-				});
-				return await service.oas.generate();
-			}, "server_specs_oas")
-		} });
-	}
+	if (gql.accountability?.user) ServerInfo.addFields({
+		rateLimit: env["RATE_LIMITER_ENABLED"] ? { type: new GraphQLObjectType({
+			name: "server_info_rate_limit",
+			fields: {
+				points: { type: GraphQLInt },
+				duration: { type: GraphQLInt }
+			}
+		}) } : GraphQLBoolean,
+		rateLimitGlobal: env["RATE_LIMITER_GLOBAL_ENABLED"] ? { type: new GraphQLObjectType({
+			name: "server_info_rate_limit_global",
+			fields: {
+				points: { type: GraphQLInt },
+				duration: { type: GraphQLInt }
+			}
+		}) } : GraphQLBoolean,
+		websocket: toBoolean(env["WEBSOCKETS_ENABLED"]) ? { type: new GraphQLObjectType({
+			name: "server_info_websocket",
+			fields: {
+				rest: { type: toBoolean(env["WEBSOCKETS_REST_ENABLED"]) ? new GraphQLObjectType({
+					name: "server_info_websocket_rest",
+					fields: {
+						authentication: { type: new GraphQLEnumType({
+							name: "server_info_websocket_rest_authentication",
+							values: {
+								public: { value: "public" },
+								handshake: { value: "handshake" },
+								strict: { value: "strict" }
+							}
+						}) },
+						path: { type: GraphQLString }
+					}
+				}) : GraphQLBoolean },
+				graphql: { type: toBoolean(env["WEBSOCKETS_GRAPHQL_ENABLED"]) ? new GraphQLObjectType({
+					name: "server_info_websocket_graphql",
+					fields: {
+						authentication: { type: new GraphQLEnumType({
+							name: "server_info_websocket_graphql_authentication",
+							values: {
+								public: { value: "public" },
+								handshake: { value: "handshake" },
+								strict: { value: "strict" }
+							}
+						}) },
+						path: { type: GraphQLString }
+					}
+				}) : GraphQLBoolean },
+				heartbeat: { type: toBoolean(env["WEBSOCKETS_HEARTBEAT_ENABLED"]) ? GraphQLInt : GraphQLBoolean }
+			}
+		}) } : GraphQLBoolean,
+		queryLimit: { type: new GraphQLObjectType({
+			name: "server_info_query_limit",
+			fields: {
+				default: { type: GraphQLInt },
+				max: { type: GraphQLInt }
+			}
+		}) }
+	});
+	if (env["OPENAPI_ENABLED"] !== false) schemaComposer.Query.addFields({ server_specs_oas: {
+		type: GraphQLJSON,
+		resolve: dedupeResolver(async () => {
+			return await new SpecificationService({
+				schema: gql.schema,
+				accountability: gql.accountability
+			}).oas.generate();
+		}, "server_specs_oas")
+	} });
 	/** Globally available query */
-	if (env["GRAPHQL_INTROSPECTION"] !== false) {
-		schemaComposer.Query.addFields({ server_specs_graphql: {
-			type: GraphQLString,
-			args: { scope: new GraphQLEnumType({
-				name: "graphql_sdl_scope",
-				values: {
-					items: { value: "items" },
-					system: { value: "system" }
-				}
-			}) },
-			resolve: dedupeResolver(async (_, args) => {
-				const service = new GraphQLService({
-					schema: gql.schema,
-					accountability: gql.accountability,
-					scope: args["scope"] ?? "items"
-				});
-				return await generateSchema(service, "sdl");
-			})
-		} });
-	}
+	if (env["GRAPHQL_INTROSPECTION"] !== false) schemaComposer.Query.addFields({ server_specs_graphql: {
+		type: GraphQLString,
+		args: { scope: new GraphQLEnumType({
+			name: "graphql_sdl_scope",
+			values: {
+				items: { value: "items" },
+				system: { value: "system" }
+			}
+		}) },
+		resolve: dedupeResolver(async (_, args) => {
+			return await generateSchema(new GraphQLService({
+				schema: gql.schema,
+				accountability: gql.accountability,
+				scope: args["scope"] ?? "items"
+			}), "sdl");
+		})
+	} });
 	schemaComposer.Query.addFields({
 		server_ping: {
 			type: GraphQLString,
@@ -147,21 +139,19 @@ function injectSystemResolvers(gql, schemaComposer, { CreateCollectionTypes, Rea
 		server_info: {
 			type: ServerInfo,
 			resolve: dedupeResolver(async () => {
-				const service = new ServerService({
+				return await new ServerService({
 					accountability: gql.accountability,
 					schema: gql.schema
-				});
-				return await service.serverInfo();
+				}).serverInfo();
 			}, "server_info")
 		},
 		server_health: {
 			type: GraphQLJSON,
 			resolve: dedupeResolver(async () => {
-				const service = new ServerService({
+				return await new ServerService({
 					accountability: gql.accountability,
 					schema: gql.schema
-				});
-				return await service.health();
+				}).health();
 			}, "server_health")
 		}
 	});
@@ -171,22 +161,20 @@ function injectSystemResolvers(gql, schemaComposer, { CreateCollectionTypes, Rea
 			collections: {
 				type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(Collection.getType()))),
 				resolve: dedupeResolver(async () => {
-					const collectionsService = new CollectionsService({
+					return await new CollectionsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await collectionsService.readByQuery();
+					}).readByQuery();
 				}, "directus_collections")
 			},
 			collections_by_name: {
 				type: Collection,
 				args: { name: new GraphQLNonNull(GraphQLString) },
 				resolve: dedupeResolver(async (_, args) => {
-					const collectionsService = new CollectionsService({
+					return await new CollectionsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await collectionsService.readOne(args["name"]);
+					}).readOne(args["name"]);
 				})
 			}
 		});
@@ -197,22 +185,20 @@ function injectSystemResolvers(gql, schemaComposer, { CreateCollectionTypes, Rea
 			fields: {
 				type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(Field.getType()))),
 				resolve: dedupeResolver(async () => {
-					const service = new FieldsService({
+					return await new FieldsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await service.readAll();
+					}).readAll();
 				}, "directus_fields")
 			},
 			fields_in_collection: {
 				type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(Field.getType()))),
 				args: { collection: new GraphQLNonNull(GraphQLString) },
 				resolve: dedupeResolver(async (_, args) => {
-					const service = new FieldsService({
+					return await new FieldsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await service.readAll(args["collection"]);
+					}).readAll(args["collection"]);
 				})
 			},
 			fields_by_name: {
@@ -222,11 +208,10 @@ function injectSystemResolvers(gql, schemaComposer, { CreateCollectionTypes, Rea
 					field: new GraphQLNonNull(GraphQLString)
 				},
 				resolve: dedupeResolver(async (_, args) => {
-					const service = new FieldsService({
+					return await new FieldsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await service.readOne(args["collection"], args["field"]);
+					}).readOne(args["collection"], args["field"]);
 				})
 			}
 		});
@@ -237,22 +222,20 @@ function injectSystemResolvers(gql, schemaComposer, { CreateCollectionTypes, Rea
 			relations: {
 				type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(Relation.getType()))),
 				resolve: dedupeResolver(async () => {
-					const service = new RelationsService({
+					return await new RelationsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await service.readAll();
+					}).readAll();
 				}, "directus_relations")
 			},
 			relations_in_collection: {
 				type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(Relation.getType()))),
 				args: { collection: new GraphQLNonNull(GraphQLString) },
 				resolve: dedupeResolver(async (_, args) => {
-					const service = new RelationsService({
+					return await new RelationsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await service.readAll(args["collection"]);
+					}).readAll(args["collection"]);
 				})
 			},
 			relations_by_name: {
@@ -262,145 +245,126 @@ function injectSystemResolvers(gql, schemaComposer, { CreateCollectionTypes, Rea
 					field: new GraphQLNonNull(GraphQLString)
 				},
 				resolve: dedupeResolver(async (_, args) => {
-					const service = new RelationsService({
+					return await new RelationsService({
 						accountability: gql.accountability,
 						schema: gql.schema
-					});
-					return await service.readOne(args["collection"], args["field"]);
+					}).readOne(args["collection"], args["field"]);
 				})
 			}
 		});
 	}
 	resolveSystemAdmin(gql, schema, schemaComposer);
-	if ("directus_users" in schema.read.collections) {
-		schemaComposer.Query.addFields({ users_me: {
-			type: ReadCollectionTypes["directus_users"],
-			resolve: dedupeResolver(async (_, args, __, info) => {
-				if (!gql.accountability?.user) return null;
-				const service = new UsersService({
-					schema: gql.schema,
-					accountability: gql.accountability
-				});
+	if ("directus_users" in schema.read.collections) schemaComposer.Query.addFields({ users_me: {
+		type: ReadCollectionTypes["directus_users"],
+		resolve: dedupeResolver(async (_, args, __, info) => {
+			if (!gql.accountability?.user) return null;
+			const service = new UsersService({
+				schema: gql.schema,
+				accountability: gql.accountability
+			});
+			const selections = replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
+			const query = await getQuery(args, gql.schema, selections || [], info.variableValues, gql.accountability, "directus_users");
+			return await service.readOne(gql.accountability.user, query);
+		})
+	} });
+	if ("directus_permissions" in schema.read.collections) schemaComposer.Query.addFields({ permissions_me: {
+		type: schemaComposer.createScalarTC({
+			name: "permissions_me_type",
+			parseValue: (value) => value,
+			serialize: (value) => value
+		}),
+		resolve: dedupeResolver(async (_, _args, __, _info) => {
+			if (!gql.accountability?.user && !gql.accountability?.role) return null;
+			return await fetchAccountabilityCollectionAccess(gql.accountability, {
+				schema: gql.schema,
+				knex: database_default()
+			});
+		})
+	} });
+	if ("directus_roles" in schema.read.collections) schemaComposer.Query.addFields({ roles_me: {
+		type: ReadCollectionTypes["directus_roles"].List,
+		resolve: dedupeResolver(async (_, args, __, info) => {
+			if (!gql.accountability?.user && !gql.accountability?.role) return null;
+			const service = new RolesService({
+				accountability: gql.accountability,
+				schema: gql.schema
+			});
+			const selections = replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
+			const query = await getQuery(args, gql.schema, selections || [], info.variableValues, gql.accountability, "directus_roles");
+			query.limit = -1;
+			return await service.readMany(gql.accountability.roles, query);
+		})
+	} });
+	if ("directus_policies" in schema.read.collections) schemaComposer.Query.addFields({ policies_me_globals: {
+		type: schemaComposer.createObjectTC({
+			name: "policy_me_globals_type",
+			fields: {
+				enforce_tfa: "Boolean",
+				app_access: "Boolean",
+				admin_access: "Boolean"
+			}
+		}),
+		resolve: dedupeResolver(async (_, _args, __, _info) => {
+			if (!gql.accountability?.user && !gql.accountability?.role) return null;
+			return await fetchAccountabilityPolicyGlobals(gql.accountability, {
+				schema: gql.schema,
+				knex: database_default()
+			});
+		})
+	} });
+	if ("directus_users" in schema.update.collections && gql.accountability?.user) schemaComposer.Mutation.addFields({ update_users_me: {
+		type: ReadCollectionTypes["directus_users"],
+		args: { data: toInputObjectType(UpdateCollectionTypes["directus_users"]) },
+		resolve: async (_, args, __, info) => {
+			if (!gql.accountability?.user) return null;
+			const service = new UsersService({
+				schema: gql.schema,
+				accountability: gql.accountability
+			});
+			await service.updateOne(gql.accountability.user, args["data"]);
+			if ("directus_users" in ReadCollectionTypes) {
 				const selections = replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
 				const query = await getQuery(args, gql.schema, selections || [], info.variableValues, gql.accountability, "directus_users");
 				return await service.readOne(gql.accountability.user, query);
-			})
-		} });
-	}
-	if ("directus_permissions" in schema.read.collections) {
-		schemaComposer.Query.addFields({ permissions_me: {
-			type: schemaComposer.createScalarTC({
-				name: "permissions_me_type",
-				parseValue: (value) => value,
-				serialize: (value) => value
-			}),
-			resolve: dedupeResolver(async (_, _args, __, _info) => {
-				if (!gql.accountability?.user && !gql.accountability?.role) return null;
-				const result = await fetchAccountabilityCollectionAccess(gql.accountability, {
-					schema: gql.schema,
-					knex: database_default()
-				});
-				return result;
-			})
-		} });
-	}
-	if ("directus_roles" in schema.read.collections) {
-		schemaComposer.Query.addFields({ roles_me: {
-			type: ReadCollectionTypes["directus_roles"].List,
-			resolve: dedupeResolver(async (_, args, __, info) => {
-				if (!gql.accountability?.user && !gql.accountability?.role) return null;
-				const service = new RolesService({
-					accountability: gql.accountability,
-					schema: gql.schema
-				});
-				const selections = replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
-				const query = await getQuery(args, gql.schema, selections || [], info.variableValues, gql.accountability, "directus_roles");
-				query.limit = -1;
-				const roles = await service.readMany(gql.accountability.roles, query);
-				return roles;
-			})
-		} });
-	}
-	if ("directus_policies" in schema.read.collections) {
-		schemaComposer.Query.addFields({ policies_me_globals: {
-			type: schemaComposer.createObjectTC({
-				name: "policy_me_globals_type",
-				fields: {
-					enforce_tfa: "Boolean",
-					app_access: "Boolean",
-					admin_access: "Boolean"
-				}
-			}),
-			resolve: dedupeResolver(async (_, _args, __, _info) => {
-				if (!gql.accountability?.user && !gql.accountability?.role) return null;
-				const result = await fetchAccountabilityPolicyGlobals(gql.accountability, {
-					schema: gql.schema,
-					knex: database_default()
-				});
-				return result;
-			})
-		} });
-	}
-	if ("directus_users" in schema.update.collections && gql.accountability?.user) {
-		schemaComposer.Mutation.addFields({ update_users_me: {
-			type: ReadCollectionTypes["directus_users"],
-			args: { data: toInputObjectType(UpdateCollectionTypes["directus_users"]) },
-			resolve: async (_, args, __, info) => {
-				if (!gql.accountability?.user) return null;
-				const service = new UsersService({
-					schema: gql.schema,
-					accountability: gql.accountability
-				});
-				await service.updateOne(gql.accountability.user, args["data"]);
-				if ("directus_users" in ReadCollectionTypes) {
-					const selections = replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
-					const query = await getQuery(args, gql.schema, selections || [], info.variableValues, gql.accountability, "directus_users");
-					return await service.readOne(gql.accountability.user, query);
-				}
-				return true;
 			}
-		} });
-	}
-	if ("directus_files" in schema.create.collections) {
-		schemaComposer.Mutation.addFields({ import_file: {
-			type: ReadCollectionTypes["directus_files"] ?? GraphQLBoolean,
-			args: {
-				url: new GraphQLNonNull(GraphQLString),
-				data: toInputObjectType(CreateCollectionTypes["directus_files"]).setTypeName("create_directus_files_input")
-			},
-			resolve: async (_, args, __, info) => {
-				const service = new FilesService({
-					accountability: gql.accountability,
-					schema: gql.schema
-				});
-				const primaryKey = await service.importOne(args["url"], args["data"]);
-				if ("directus_files" in ReadCollectionTypes) {
-					const selections = replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
-					const query = await getQuery(args, gql.schema, selections || [], info.variableValues, gql.accountability, "directus_files");
-					return await service.readOne(primaryKey, query);
-				}
-				return true;
-			}
-		} });
-	}
-	if ("directus_users" in schema.create.collections) {
-		schemaComposer.Mutation.addFields({ users_invite: {
-			type: GraphQLBoolean,
-			args: {
-				email: new GraphQLNonNull(GraphQLString),
-				role: new GraphQLNonNull(GraphQLString),
-				invite_url: GraphQLString
-			},
-			resolve: async (_, args) => {
-				const service = new UsersService({
-					accountability: gql.accountability,
-					schema: gql.schema
-				});
-				await service.inviteUser(args["email"], args["role"], args["invite_url"] || null);
-				return true;
+			return true;
+		}
+	} });
+	if ("directus_files" in schema.create.collections) schemaComposer.Mutation.addFields({ import_file: {
+		type: ReadCollectionTypes["directus_files"] ?? GraphQLBoolean,
+		args: {
+			url: new GraphQLNonNull(GraphQLString),
+			data: toInputObjectType(CreateCollectionTypes["directus_files"]).setTypeName("create_directus_files_input")
+		},
+		resolve: async (_, args, __, info) => {
+			const service = new FilesService({
+				accountability: gql.accountability,
+				schema: gql.schema
+			});
+			const primaryKey = await service.importOne(args["url"], args["data"]);
+			if ("directus_files" in ReadCollectionTypes) {
+				const selections = replaceFragmentsInSelections(info.fieldNodes[0]?.selectionSet?.selections, info.fragments);
+				const query = await getQuery(args, gql.schema, selections || [], info.variableValues, gql.accountability, "directus_files");
+				return await service.readOne(primaryKey, query);
 			}
-		} });
-	}
+			return true;
+		}
+	} });
+	if ("directus_users" in schema.create.collections) schemaComposer.Mutation.addFields({ users_invite: {
+		type: GraphQLBoolean,
+		args: {
+			email: new GraphQLNonNull(GraphQLString),
+			role: new GraphQLNonNull(GraphQLString),
+			invite_url: GraphQLString
+		},
+		resolve: async (_, args) => {
+			await new UsersService({
+				accountability: gql.accountability,
+				schema: gql.schema
+			}).inviteUser(args["email"], args["role"], args["invite_url"] || null);
+			return true;
+		}
+	} });
 	return schemaComposer;
 }