Merge pull request #7087 from appwrite/fix-4960-disabled-usage
Ensure usage endpoints don't throw 500 when usage is disabled
This commit is contained in:
commit
cb512710f2
2 changed files with 11 additions and 3 deletions
|
@ -3632,7 +3632,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
|
||||||
|
|
||||||
App::get('/v1/databases/usage')
|
App::get('/v1/databases/usage')
|
||||||
->desc('Get usage stats for the database')
|
->desc('Get usage stats for the database')
|
||||||
->groups(['api', 'database'])
|
->groups(['api', 'database', 'usage'])
|
||||||
->label('scope', 'collections.read')
|
->label('scope', 'collections.read')
|
||||||
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
|
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
|
||||||
->label('sdk.namespace', 'databases')
|
->label('sdk.namespace', 'databases')
|
||||||
|
@ -3750,7 +3750,7 @@ App::get('/v1/databases/usage')
|
||||||
|
|
||||||
App::get('/v1/databases/:databaseId/usage')
|
App::get('/v1/databases/:databaseId/usage')
|
||||||
->desc('Get usage stats for the database')
|
->desc('Get usage stats for the database')
|
||||||
->groups(['api', 'database'])
|
->groups(['api', 'database', 'usage'])
|
||||||
->label('scope', 'collections.read')
|
->label('scope', 'collections.read')
|
||||||
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
|
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
|
||||||
->label('sdk.namespace', 'databases')
|
->label('sdk.namespace', 'databases')
|
||||||
|
@ -3860,7 +3860,7 @@ App::get('/v1/databases/:databaseId/usage')
|
||||||
App::get('/v1/databases/:databaseId/collections/:collectionId/usage')
|
App::get('/v1/databases/:databaseId/collections/:collectionId/usage')
|
||||||
->alias('/v1/database/:collectionId/usage', ['databaseId' => 'default'])
|
->alias('/v1/database/:collectionId/usage', ['databaseId' => 'default'])
|
||||||
->desc('Get usage stats for a collection')
|
->desc('Get usage stats for a collection')
|
||||||
->groups(['api', 'database'])
|
->groups(['api', 'database', 'usage'])
|
||||||
->label('scope', 'collections.read')
|
->label('scope', 'collections.read')
|
||||||
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
|
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
|
||||||
->label('sdk.namespace', 'databases')
|
->label('sdk.namespace', 'databases')
|
||||||
|
|
|
@ -554,3 +554,11 @@ App::shutdown()
|
||||||
->submit();
|
->submit();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
App::init()
|
||||||
|
->groups(['usage'])
|
||||||
|
->action(function () {
|
||||||
|
if (App::getEnv('_APP_USAGE_STATS', 'enabled') !== 'enabled') {
|
||||||
|
throw new Exception(Exception::GENERAL_USAGE_DISABLED);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in a new issue