Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-storage-buckets' into feat-sb-delete

Browse Source
This commit is contained in:
Damodar Lohani
2021-11-04 15:29:39 +05:45
parent 25b4d887d2 78f7164c30
commit 9a673798f9
6 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/specs/0.12.x.client.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/config/specs/0.12.x.console.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/config/specs/0.12.x.server.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/controllers/api/storage.php
+3 -3
View File
@@ -809,7 +809,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
$fileLogos = Config::getParam('storage-logos');
$date = \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)).' GMT'; // 45 days cache
$key = \md5($fileId.$width.$height.$quality.$borderWidth.$borderColor.$borderRadius.$opacity.$rotation.$background.$storage.$output);
$key = \md5($fileId.$width.$height.$gravity.$quality.$borderWidth.$borderColor.$borderRadius.$opacity.$rotation.$background.$storage.$output);
$file = $dbForInternal->getDocument('bucket_' . $bucketId, $fileId);
@@ -829,7 +829,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
$cipher = null;
$background = (empty($background)) ? 'eceff1' : $background;
$type = \strtolower(\pathinfo($path, PATHINFO_EXTENSION));
$key = \md5($path.$width.$height.$quality.$borderWidth.$borderColor.$borderRadius.$opacity.$rotation.$background.$storage.$output);
$key = \md5($path.$width.$height.$gravity.$quality.$borderWidth.$borderColor.$borderRadius.$opacity.$rotation.$background.$storage.$output);
}
$compressor = new GZIP();
@@ -1106,7 +1106,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
$file = $dbForInternal->getDocument('bucket_' . $bucketId, $fileId);
if ($file->isEmpty() || $file->getAttribute('bucketId') != $bucketId) {
if ($file->isEmpty() || $file->getAttribute('bucketId') !== $bucketId) {
throw new Exception('File not found', 404);
}
src/Appwrite/Specification/Format/Swagger2.php
+7 -15
View File
@@ -31,7 +31,7 @@ class Swagger2 extends Format
* @return void
*/
protected function getUsedModels($model, array &$usedModels)
{
{
if (is_string($model) && !in_array($model, ['string', 'integer', 'boolean', 'json', 'float', 'double'])) {
$usedModels[] = $model;
return;
@@ -225,14 +225,10 @@ class Swagger2 extends Format
}
$temp['responses'][(string)$route->getLabel('sdk.response.code', '500')] = [
'description' => $modelDescription,
'content' => [
$produces => [
'schema' => [
'oneOf' => \array_map(function($m) {
return ['$ref' => '#/definitions/'.$m->getType()];
}, $model)
],
],
'schema' => [
'oneOf' => \array_map(function($m) {
return ['$ref' => '#/definitions/'.$m->getType()];
}, $model)
],
];
} else {
@@ -240,12 +236,8 @@ class Swagger2 extends Format
$usedModels[] = $model->getType();
$temp['responses'][(string)$route->getLabel('sdk.response.code', '500')] = [
'description' => $model->getName(),
'content' => [
$produces => [
'schema' => [
'$ref' => '#/definitions/'.$model->getType(),
],
],
'schema' => [
'$ref' => '#/definitions/'.$model->getType(),
],
];
}
src/Appwrite/Utopia/Response/Model/Bucket.php
+6
View File
@@ -31,6 +31,12 @@ class Bucket extends Model
'example' => ['user:608f9da25e7e1'],
'array' => true,
])
->addRule('permission', [
'type' => self::TYPE_STRING,
'description' => 'Bucket permission model. Possible values: `bucket` or `file`',
'default' => '',
'example' => 'file',
])
->addRule('dateCreated', [
'type' => self::TYPE_INTEGER,
'description' => 'Bucket creation date in Unix timestamp.',