From d8db5e5839aca37c62d8d4f92a14414b80961e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 18 May 2022 08:31:54 +0000
Subject: [PATCH] Ignore localhost as main domain

---
 app/controllers/general.php  | 5 +++--
 app/workers/certificates.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 1c49e3cb7a..8cd4553e33 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -80,9 +80,10 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
         } else {
             Authorization::disable();
 
+            $envDomain = App::getEnv('_APP_DOMAIN', '');
             $mainDomain = null;
-            if(!empty(App::getEnv('_APP_DOMAIN', ''))) {
-                $mainDomain = App::getEnv('_APP_DOMAIN', '');
+            if(!empty($envDomain) && $envDomain !== 'localhost') {
+                $mainDomain = $envDomain;
             } else {
                 $domainDocument = $dbForConsole->findOne('domains', [], 0, ['_id'], ['ASC']);
                 $mainDomain = $domainDocument ? $domainDocument->getAttribute('domain') : $domain->get();
diff --git a/app/workers/certificates.php b/app/workers/certificates.php
index f5bf5824e3..39a02d6fdb 100644
--- a/app/workers/certificates.php
+++ b/app/workers/certificates.php
@@ -175,8 +175,9 @@ class CertificatesV1 extends Worker
      */
     private function getMainDomain(): ?string
     {
-        if (!empty(App::getEnv('_APP_DOMAIN', ''))) {
-            return App::getEnv('_APP_DOMAIN', '');
+        $envDomain = App::getEnv('_APP_DOMAIN', '');
+        if (!empty($envDomain) && $envDomain !== 'localhost') {
+            return $envDomain;
         } else {
             $domainDocument = $this->dbForConsole->findOne('domains', [], 0, ['_id'], ['ASC']);
             if ($domainDocument) {