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

Merge branch 'refs/heads/main' into chore-v11-merge-main

Browse Source 
# Conflicts:
#	api/package.json
#	api/src/cli/commands/bootstrap/index.ts
#	app/package.json
#	directus/package.json
#	packages/composables/package.json
#	packages/create-directus-extension/package.json
#	packages/env/package.json
#	packages/errors/package.json
#	packages/extensions-registry/package.json
#	packages/extensions-sdk/package.json
#	packages/extensions/package.json
#	packages/memory/package.json
#	packages/pressure/package.json
#	packages/storage-driver-azure/package.json
#	packages/storage-driver-cloudinary/package.json
#	packages/storage-driver-gcs/package.json
#	packages/storage-driver-s3/package.json
#	packages/storage-driver-supabase/package.json
#	packages/system-data/package.json
#	packages/system-data/src/relations/relations.yaml
#	packages/themes/package.json
#	packages/types/package.json
#	packages/utils/package.json
#	packages/validation/package.json
#	pnpm-lock.yaml
#	sdk/package.json
This commit is contained in:
Hannes Küttner
2024-07-05 13:20:57 +02:00
parent 176af5e612 779977e40d
commit ea098e0413
105 changed files with 4691 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/cli/commands/bootstrap/index.ts
View File

@@ -110,5 +110,7 @@ async function createDefaultAdmin(schema: SchemaOverview) {
logger.info(`No admin password provided. Defaulting to "${adminPassword}"`);
}
await usersService.createOne({ ...defaultAdminUser, email: adminEmail, password: adminPassword, role });
const token = env['ADMIN_TOKEN'] ?? null;
await usersService.createOne({ ...defaultAdminUser, email: adminEmail, password: adminPassword, token, role });
}