CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-01 17:58:02 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model

Browse source
This commit is contained in:
Torsten Dittmann 2022-04-26 13:15:00 +02:00
commit 840f7419dc
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
app/controllers/general.php
View file

@ -74,31 +74,42 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
} else { } else {
Authorization::disable(); Authorization::disable();
$domainDocument = $dbForConsole->findOne('domains', [ $mainDomain = null;
new Query('domain', QUERY::TYPE_EQUAL, [$domain->get()]) if(!empty(App::getEnv('_APP_DOMAIN', ''))) {
]); $mainDomain = App::getEnv('_APP_DOMAIN', '');
} else {
$domainDocument = $dbForConsole->findOne('domains', [], 0, ['_id'], ['ASC']);
$mainDomain = $domainDocument ? $domainDocument->getAttribute('domain') : $domain->get();
}
if (!$domainDocument) { if($mainDomain !== $domain->get()) {
$domainDocument = new Document([ Console::warning($domain->get() . ' is not a main domain. Skipping SSL certificate generation.');
'domain' => $domain->get(), } else {
'tld' => $domain->getSuffix(), $domainDocument = $dbForConsole->findOne('domains', [
'registerable' => $domain->getRegisterable(), new Query('domain', QUERY::TYPE_EQUAL, [$domain->get()])
'verification' => false,
'certificateId' => null,
]); ]);
$domainDocument = $dbForConsole->createDocument('domains', $domainDocument); if (!$domainDocument) {
$domainDocument = new Document([
'domain' => $domain->get(),
'tld' => $domain->getSuffix(),
'registerable' => $domain->getRegisterable(),
'verification' => false,
'certificateId' => null,
]);
Console::info('Issuing a TLS certificate for the master domain (' . $domain->get() . ') in a few seconds...'); $domainDocument = $dbForConsole->createDocument('domains', $domainDocument);
$event = new Certificate(); Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
$event
->setDomain($domainDocument) $event = new Certificate();
->trigger(); $event
->setDomain($domainDocument)
->trigger();
}
} }
$domains[$domain->get()] = true; $domains[$domain->get()] = true;
Authorization::reset(); // ensure authorization is re-enabled Authorization::reset(); // ensure authorization is re-enabled
} }
Config::setParam('domains', $domains); Config::setParam('domains', $domains);