Merge branch 'main' of https://github.com/directus/directus into main

Author: tylerforesthauser

.github/CODEOWNERS

@@ -0,0 +1,6 @@
+* @rijkvanzanten
+/docs/*.md @benhaynes
+
+/packages/cli @WoLfulus
+/packages/sdk @WoLfulus
+/packages/gatsby-source-directus @WoLfulus

.github/workflows/e2e-tests.yml

@@ -13,10 +13,14 @@ jobs:
       fail-fast: false
       matrix:
         db: ['mssql', 'mysql', 'postgres', 'maria', 'sqlite3']
-        node-version: [ '12-alpine', '14-alpine', '15-alpine' ]
+        node-version: ['12-alpine', '14-alpine', '15-alpine']
     env:
       CACHED_IMAGE: ghcr.io/directus/directus-e2e-test-cache:${{ matrix.node-version }}
     steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.9.0
+        with:
+          access_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:

.github/workflows/lint.yml

@@ -13,6 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.9.0
+        with:
+          access_token: ${{ secrets.GITHUB_TOKEN }}
+
       - uses: actions/checkout@v2
 
       - uses: actions/setup-node@v2

api/example.env

@@ -145,3 +145,7 @@ EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
 # EMAIL_SMTP_SECURE=false # Use TLS
 # EMAIL_SMTP_USER="username"
 # EMAIL_SMTP_PASSWORD="password"
+
+## Email (Mailgun Transport)
+# EMAIL_MAILGUN_API_KEY="key-1234123412341234"
+# EMAIL_MAILGUN_DOMAIN="a domain name from https://app.mailgun.com/app/sending/domains"

api/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.0.0-rc.62",
+	"version": "9.0.0-rc.66",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -65,28 +65,31 @@
 		"example.env"
 	],
 	"dependencies": {
-		"@directus/app": "9.0.0-rc.62",
-		"@directus/drive": "9.0.0-rc.62",
-		"@directus/drive-azure": "9.0.0-rc.62",
-		"@directus/drive-gcs": "9.0.0-rc.62",
-		"@directus/drive-s3": "9.0.0-rc.62",
-		"@directus/format-title": "9.0.0-rc.62",
-		"@directus/schema": "9.0.0-rc.62",
-		"@directus/specs": "9.0.0-rc.62",
-		"@godaddy/terminus": "^4.4.1",
+		"@directus/app": "9.0.0-rc.66",
+		"@directus/drive": "9.0.0-rc.66",
+		"@directus/drive-azure": "9.0.0-rc.66",
+		"@directus/drive-gcs": "9.0.0-rc.66",
+		"@directus/drive-s3": "9.0.0-rc.66",
+		"@directus/format-title": "9.0.0-rc.66",
+		"@directus/schema": "9.0.0-rc.66",
+		"@directus/specs": "9.0.0-rc.66",
+		"@godaddy/terminus": "^4.7.2",
 		"argon2": "^0.27.0",
+		"async": "^3.2.0",
 		"atob": "^2.1.2",
 		"axios": "^0.21.0",
 		"body-parser": "^1.19.0",
 		"busboy": "^0.3.1",
 		"camelcase": "^6.2.0",
 		"chalk": "^4.1.1",
-		"commander": "^6.2.0",
+		"commander": "^7.2.0",
 		"cookie-parser": "^1.4.5",
 		"cors": "^2.8.5",
+		"csv-parser": "^3.0.0",
 		"date-fns": "^2.21.1",
 		"deep-map": "^2.0.0",
-		"dotenv": "^8.2.0",
+		"destroy": "^1.0.4",
+		"dotenv": "^9.0.2",
 		"eventemitter2": "^6.4.3",
 		"execa": "^4.1.0",
 		"exif-reader": "^1.0.3",
@@ -96,11 +99,12 @@
 		"fs-extra": "^9.1.0",
 		"grant": "^5.4.5",
 		"graphql": "^15.5.0",
-		"graphql-compose": "^7.25.1",
+		"graphql-compose": "^8.1.0",
 		"icc": "^2.0.0",
-		"inquirer": "^7.3.3",
+		"inquirer": "^8.0.0",
 		"joi": "^17.3.0",
 		"js-yaml": "^4.1.0",
+		"js2xmlparser": "^4.0.1",
 		"json2csv": "^5.0.3",
 		"jsonwebtoken": "^8.5.1",
 		"keyv": "^4.0.3",
@@ -113,16 +117,17 @@
 		"ms": "^2.1.2",
 		"nanoid": "^3.1.16",
 		"node-machine-id": "^1.1.12",
-		"nodemailer": "^6.4.14",
+		"nodemailer": "^6.6.0",
 		"openapi3-ts": "^2.0.0",
-		"ora": "^5.1.0",
+		"ora": "^5.4.0",
 		"otplib": "^12.0.1",
 		"pino": "^6.7.0",
 		"pino-colada": "^2.1.0",
 		"qs": "^6.9.4",
-		"rate-limiter-flexible": "^2.1.13",
+		"rate-limiter-flexible": "^2.2.2",
 		"resolve-cwd": "^3.0.0",
 		"sharp": "^0.27.1",
+		"stream-json": "^1.7.1",
 		"uuid": "^8.3.2",
 		"uuid-validate": "0.0.3"
 	},
@@ -135,39 +140,43 @@
 		"keyv-memcache": "^1.0.1",
 		"memcached": "^2.2.2",
 		"mysql": "^2.18.1",
+		"nodemailer-mailgun-transport": "^2.1.3",
 		"oracledb": "^5.0.0",
-		"pg": "^8.4.2",
+		"pg": "^8.6.0",
 		"sqlite3": "^5.0.2",
-		"tedious": "^11.0.5"
+		"tedious": "^11.0.8"
 	},
-	"gitHead": "71bf628955b5da15ce3070dc09478bc558f243a4",
+	"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
 	"devDependencies": {
+		"@types/async": "^3.2.6",
 		"@types/atob": "^2.1.2",
 		"@types/body-parser": "^1.19.0",
 		"@types/busboy": "^0.2.3",
 		"@types/cookie-parser": "^1.4.2",
 		"@types/cors": "^2.8.10",
+		"@types/destroy": "^1.0.0",
 		"@types/express": "^4.17.11",
 		"@types/express-pino-logger": "^4.0.2",
 		"@types/express-session": "^1.17.3",
 		"@types/fs-extra": "^9.0.11",
 		"@types/inquirer": "^7.3.1",
 		"@types/js-yaml": "^4.0.1",
-		"@types/json2csv": "^5.0.1",
+		"@types/json2csv": "^5.0.2",
 		"@types/jsonwebtoken": "^8.5.1",
 		"@types/keyv": "^3.1.1",
 		"@types/lodash": "^4.14.168",
 		"@types/mime-types": "^2.1.0",
 		"@types/ms": "^0.7.31",
-		"@types/node": "^15.0.1",
+		"@types/node": "^15.0.2",
 		"@types/nodemailer": "^6.4.1",
 		"@types/qs": "^6.9.6",
 		"@types/sharp": "^0.28.0",
+		"@types/stream-json": "^1.7.0",
 		"@types/uuid": "^8.3.0",
 		"@types/uuid-validate": "^0.0.1",
 		"copyfiles": "^2.4.0",
 		"cross-env": "^7.0.2",
 		"ts-node-dev": "^1.0.0",
 		"typescript": "^4.0.5"
 	}
-}
+}

api/src/cli/commands/roles/create.ts

@@ -1,6 +1,6 @@
 import { getSchema } from '../../../utils/get-schema';
 
-export default async function rolesCreate({ name, admin }: { name: string; admin: boolean }): Promise<void> {
+export default async function rolesCreate({ role: name, admin }: { role: string; admin: boolean }): Promise<void> {
 	const { default: database } = require('../../../database/index');
 	const { RolesService } = require('../../../services/roles');
 

api/src/cli/index.ts

@@ -35,13 +35,15 @@ dbCommand
 	.action(() => dbMigrate('down'));
 
 const usersCommand = program.command('users');
+
 usersCommand
 	.command('create')
 	.description('Create a new user')
 	.option('--email <value>', `user's email`)
 	.option('--password <value>', `user's password`)
 	.option('--role <value>', `user's role`)
 	.action(usersCreate);
+
 usersCommand
 	.command('passwd')
 	.description('Set user password')
@@ -52,10 +54,8 @@ usersCommand
 const rolesCommand = program.command('roles');
 rolesCommand
 	.command('create')
-	.storeOptionsAsProperties(false)
-	.passCommandToAction(false)
 	.description('Create a new role')
-	.option('--name <value>', `name for the role`)
+	.option('--role <value>', `name for the role`)
 	.option('--admin', `whether or not the role has admin access`)
 	.action(rolesCreate);
 

api/src/controllers/auth.ts

@@ -146,7 +146,10 @@ router.post(
 
 		if (req.cookies.directus_refresh_token) {
 			res.clearCookie('directus_refresh_token', {
+				httpOnly: true,
 				domain: env.REFRESH_TOKEN_COOKIE_DOMAIN,
+				secure: env.REFRESH_TOKEN_COOKIE_SECURE ?? false,
+				sameSite: (env.REFRESH_TOKEN_COOKIE_SAME_SITE as 'lax' | 'strict' | 'none') || 'strict',
 			});
 		}
 

api/src/controllers/not-found.ts

@@ -15,8 +15,8 @@ import { RouteNotFoundException } from '../exceptions';
  */
 const notFound: RequestHandler = async (req, res, next) => {
 	try {
-		const ret = await emitter.emitAsync('request.not_found', req, res);
-		if (ret.reduce((prev, current) => current || prev, false)) {
+		const hooksResult = await emitter.emitAsync('request.not_found', req, res);
+		if (hooksResult.reduce((prev, current) => current || prev, false)) {
 			return next();
 		}
 		next(new RouteNotFoundException(req.path));

api/src/controllers/utils.ts

@@ -5,8 +5,9 @@ import { nanoid } from 'nanoid';
 import { InvalidPayloadException, InvalidQueryException } from '../exceptions';
 import collectionExists from '../middleware/collection-exists';
 import { respond } from '../middleware/respond';
-import { RevisionsService, UtilsService } from '../services';
+import { RevisionsService, UtilsService, ImportService } from '../services';
 import asyncHandler from '../utils/async-handler';
+import Busboy from 'busboy';
 
 const router = Router();
 
@@ -87,4 +88,31 @@ router.post(
 	respond
 );
 
+router.post(
+	'/import/:collection',
+	collectionExists,
+	asyncHandler(async (req, res, next) => {
+		const service = new ImportService({
+			accountability: req.accountability,
+			schema: req.schema,
+		});
+
+		const busboy = new Busboy({ headers: req.headers });
+
+		busboy.on('file', async (fieldname, fileStream, filename, encoding, mimetype) => {
+			try {
+				await service.import(req.params.collection, mimetype, fileStream);
+			} catch (err) {
+				return next(err);
+			}
+
+			return res.status(200).end();
+		});
+
+		busboy.on('error', (err: Error) => next(err));
+
+		req.pipe(busboy);
+	})
+);
+
 export default router;