Ignore localhost as main domain
This commit is contained in:
parent
c7c958c9ef
commit
d8db5e5839
2 changed files with 6 additions and 4 deletions
|
@ -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();
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue