1
0
Fork 0
mirror of synced 2024-06-29 11:40:45 +12:00

Ignore localhost as main domain

This commit is contained in:
Matej Bačo 2022-05-18 08:31:54 +00:00
parent c7c958c9ef
commit d8db5e5839
2 changed files with 6 additions and 4 deletions

View file

@ -80,9 +80,10 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
} else { } else {
Authorization::disable(); Authorization::disable();
$envDomain = App::getEnv('_APP_DOMAIN', '');
$mainDomain = null; $mainDomain = null;
if(!empty(App::getEnv('_APP_DOMAIN', ''))) { if(!empty($envDomain) && $envDomain !== 'localhost') {
$mainDomain = App::getEnv('_APP_DOMAIN', ''); $mainDomain = $envDomain;
} else { } else {
$domainDocument = $dbForConsole->findOne('domains', [], 0, ['_id'], ['ASC']); $domainDocument = $dbForConsole->findOne('domains', [], 0, ['_id'], ['ASC']);
$mainDomain = $domainDocument ? $domainDocument->getAttribute('domain') : $domain->get(); $mainDomain = $domainDocument ? $domainDocument->getAttribute('domain') : $domain->get();

View file

@ -175,8 +175,9 @@ class CertificatesV1 extends Worker
*/ */
private function getMainDomain(): ?string private function getMainDomain(): ?string
{ {
if (!empty(App::getEnv('_APP_DOMAIN', ''))) { $envDomain = App::getEnv('_APP_DOMAIN', '');
return App::getEnv('_APP_DOMAIN', ''); if (!empty($envDomain) && $envDomain !== 'localhost') {
return $envDomain;
} else { } else {
$domainDocument = $this->dbForConsole->findOne('domains', [], 0, ['_id'], ['ASC']); $domainDocument = $this->dbForConsole->findOne('domains', [], 0, ['_id'], ['ASC']);
if ($domainDocument) { if ($domainDocument) {