github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing type info

Browse Source
This commit is contained in:
rijkvanzanten
2021-02-11 18:14:55 -05:00
parent 1464e690cd
commit 510cbe4ed4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/middleware/schema.ts
View File

@@ -3,7 +3,7 @@ import asyncHandler from '../utils/async-handler';
import { getSchema } from '../utils/get-schema';
const schema: RequestHandler = asyncHandler(async (req, res, next) => {
req.schema = await getSchema(req.accountability);
req.schema = await getSchema({ accountability: req.accountability });
return next();
});

8
api/src/utils/get-schema.ts
View File

@@ -5,12 +5,12 @@ import { mergePermissions } from './merge-permissions';
import Knex from 'knex';
import SchemaInspector from '@directus/schema';
export async function getSchema(options: {
export async function getSchema(options?: {
accountability?: Accountability;
database?: Knex;
}): Promise<SchemaOverview> {
// Allows for use in the CLI
const database = options.database || (require('../database').default as Knex);
const database = options?.database || (require('../database').default as Knex);
const schemaInspector = SchemaInspector(database);
const schemaOverview = await schemaInspector.overview();
@@ -35,7 +35,7 @@ export async function getSchema(options: {
let permissions: Permission[] = [];
if (options.accountability && options.accountability.admin !== true) {
if (options?.accountability && options.accountability.admin !== true) {
const permissionsForRole = await database
.select('*')
.from('directus_permissions')
@@ -60,7 +60,7 @@ export async function getSchema(options: {
if (options.accountability.app === true) {
permissions = mergePermissions(
permissions,
appAccessMinimalPermissions.map((perm) => ({ ...perm, role: options.accountability.role }))
appAccessMinimalPermissions.map((perm) => ({ ...perm, role: options.accountability!.role }))
);
}
}