From 95f354746d9cf0aff512cfac4303cbf38b323dd6 Mon Sep 17 00:00:00 2001 From: Hubert FONGARNAND Date: Mon, 25 Nov 2019 09:13:33 +0100 Subject: [PATCH 1/2] Make the api endpoint /server/projects works with docker environments variables DIRECTUS_USE_ENV=1 --- src/endpoints/Server.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/endpoints/Server.php b/src/endpoints/Server.php index 564880066b..ab2985e916 100644 --- a/src/endpoints/Server.php +++ b/src/endpoints/Server.php @@ -34,20 +34,24 @@ public function __invoke(Application $app) */ public function projects(Request $request, Response $response) { - $scannedDirectory = \Directus\scan_config_folder(); + if (getenv("DIRECTUS_USE_ENV") === "1") { + $projectNames[]="api"; + } + else { + $scannedDirectory = \Directus\scan_config_folder(); - $projectNames = []; - if(empty($scannedDirectory)){ - throw new NotInstalledException('This Directus instance has not been configured. Install via the Directus App (eg: /admin) or read more about configuration at: https://docs.directus.io/getting-started/installation.html#configure'); - }else{ - foreach($scannedDirectory as $fileName){ - if(!StringUtils::startsWith($fileName, 'private.')){ - $fileObject = explode(".",$fileName); - $projectNames[] = $fileObject[0]; + $projectNames = []; + if(empty($scannedDirectory)){ + throw new NotInstalledException('This Directus instance has not been configured. Install via the Directus App (eg: /admin) or read more about configuration at: https://docs.directus.io/getting-started/installation.html#configure'); + }else{ + foreach($scannedDirectory as $fileName){ + if(!StringUtils::startsWith($fileName, 'private.')){ + $fileObject = explode(".",$fileName); + $projectNames[] = $fileObject[0]; + } } } } - $responseData['data'] = $projectNames; return $this->responseWithData($request, $response, $responseData); } From b100ff847bbea4968271a6415c3230db042e6e85 Mon Sep 17 00:00:00 2001 From: Hubert FONGARNAND Date: Mon, 25 Nov 2019 11:14:56 +0100 Subject: [PATCH 2/2] Change default project name to _ --- src/endpoints/Server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/endpoints/Server.php b/src/endpoints/Server.php index ab2985e916..6ca5bcdfea 100644 --- a/src/endpoints/Server.php +++ b/src/endpoints/Server.php @@ -35,7 +35,7 @@ public function __invoke(Application $app) public function projects(Request $request, Response $response) { if (getenv("DIRECTUS_USE_ENV") === "1") { - $projectNames[]="api"; + $projectNames[]="_"; } else { $scannedDirectory = \Directus\scan_config_folder();