Merge branch '1.5.x' of https://github.com/appwrite/appwrite into prepare-1.5.7
This commit is contained in:
commit
c76dbaaadb
9 changed files with 48 additions and 18 deletions
|
@ -863,20 +863,50 @@ App::get('/robots.txt')
|
||||||
->desc('Robots.txt File')
|
->desc('Robots.txt File')
|
||||||
->label('scope', 'public')
|
->label('scope', 'public')
|
||||||
->label('docs', false)
|
->label('docs', false)
|
||||||
|
->inject('utopia')
|
||||||
|
->inject('swooleRequest')
|
||||||
|
->inject('request')
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->action(function (Response $response) {
|
->inject('dbForConsole')
|
||||||
$template = new View(__DIR__ . '/../views/general/robots.phtml');
|
->inject('getProjectDB')
|
||||||
$response->text($template->render(false));
|
->inject('queueForEvents')
|
||||||
|
->inject('queueForUsage')
|
||||||
|
->inject('geodb')
|
||||||
|
->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
|
||||||
|
$host = $request->getHostname() ?? '';
|
||||||
|
$mainDomain = System::getEnv('_APP_DOMAIN', '');
|
||||||
|
|
||||||
|
if ($host === $mainDomain) {
|
||||||
|
$template = new View(__DIR__ . '/../views/general/robots.phtml');
|
||||||
|
$response->text($template->render(false));
|
||||||
|
} else {
|
||||||
|
router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
App::get('/humans.txt')
|
App::get('/humans.txt')
|
||||||
->desc('Humans.txt File')
|
->desc('Humans.txt File')
|
||||||
->label('scope', 'public')
|
->label('scope', 'public')
|
||||||
->label('docs', false)
|
->label('docs', false)
|
||||||
|
->inject('utopia')
|
||||||
|
->inject('swooleRequest')
|
||||||
|
->inject('request')
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->action(function (Response $response) {
|
->inject('dbForConsole')
|
||||||
$template = new View(__DIR__ . '/../views/general/humans.phtml');
|
->inject('getProjectDB')
|
||||||
$response->text($template->render(false));
|
->inject('queueForEvents')
|
||||||
|
->inject('queueForUsage')
|
||||||
|
->inject('geodb')
|
||||||
|
->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
|
||||||
|
$host = $request->getHostname() ?? '';
|
||||||
|
$mainDomain = System::getEnv('_APP_DOMAIN', '');
|
||||||
|
|
||||||
|
if ($host === $mainDomain) {
|
||||||
|
$template = new View(__DIR__ . '/../views/general/humans.phtml');
|
||||||
|
$response->text($template->render(false));
|
||||||
|
} else {
|
||||||
|
router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
App::get('/.well-known/acme-challenge/*')
|
App::get('/.well-known/acme-challenge/*')
|
||||||
|
|
|
@ -96,15 +96,15 @@ class OpenAPI3 extends Format
|
||||||
];
|
];
|
||||||
|
|
||||||
if (isset($output['components']['securitySchemes']['Project'])) {
|
if (isset($output['components']['securitySchemes']['Project'])) {
|
||||||
$output['components']['securitySchemes']['Project']['x-appwrite'] = ['demo' => '5df5acd0d48c2'];
|
$output['components']['securitySchemes']['Project']['x-appwrite'] = ['demo' => '<YOUR_PROJECT_ID>'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($output['components']['securitySchemes']['Key'])) {
|
if (isset($output['components']['securitySchemes']['Key'])) {
|
||||||
$output['components']['securitySchemes']['Key']['x-appwrite'] = ['demo' => '919c2d18fb5d4...a2ae413da83346ad2'];
|
$output['components']['securitySchemes']['Key']['x-appwrite'] = ['demo' => '<YOUR_API_KEY>'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($output['securityDefinitions']['JWT'])) {
|
if (isset($output['securityDefinitions']['JWT'])) {
|
||||||
$output['securityDefinitions']['JWT']['x-appwrite'] = ['demo' => 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...'];
|
$output['securityDefinitions']['JWT']['x-appwrite'] = ['demo' => '<YOUR_JWT>'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($output['components']['securitySchemes']['Locale'])) {
|
if (isset($output['components']['securitySchemes']['Locale'])) {
|
||||||
|
|
|
@ -93,15 +93,15 @@ class Swagger2 extends Format
|
||||||
];
|
];
|
||||||
|
|
||||||
if (isset($output['securityDefinitions']['Project'])) {
|
if (isset($output['securityDefinitions']['Project'])) {
|
||||||
$output['securityDefinitions']['Project']['x-appwrite'] = ['demo' => '5df5acd0d48c2'];
|
$output['securityDefinitions']['Project']['x-appwrite'] = ['demo' => '<YOUR_PROJECT_ID>'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($output['securityDefinitions']['Key'])) {
|
if (isset($output['securityDefinitions']['Key'])) {
|
||||||
$output['securityDefinitions']['Key']['x-appwrite'] = ['demo' => '919c2d18fb5d4...a2ae413da83346ad2'];
|
$output['securityDefinitions']['Key']['x-appwrite'] = ['demo' => '<YOUR_API_KEY>'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($output['securityDefinitions']['JWT'])) {
|
if (isset($output['securityDefinitions']['JWT'])) {
|
||||||
$output['securityDefinitions']['JWT']['x-appwrite'] = ['demo' => 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...'];
|
$output['securityDefinitions']['JWT']['x-appwrite'] = ['demo' => '<YOUR_JWT>'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($output['securityDefinitions']['Locale'])) {
|
if (isset($output['securityDefinitions']['Locale'])) {
|
||||||
|
|
Loading…
Reference in a new issue