From b3d15d09e8fcd51ebd3510f47bf94230fad3f771 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 16 Feb 2020 08:25:48 +0200 Subject: [PATCH] Added location response to storage resources --- app/app.php | 2 +- app/controllers/api/account.php | 1 + app/controllers/api/storage.php | 3 +++ composer.lock | 12 ++++++------ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/app.php b/app/app.php index 242035a543..51168aadbd 100644 --- a/app/app.php +++ b/app/app.php @@ -628,7 +628,7 @@ $utopia->get('/v1/open-api-2.json') ]; } - if ((!empty($scope) && 'public' != $scope)) { + if ((!empty($scope))) { // && 'public' != $scope $temp['security'][] = $route->getLabel('sdk.security', $security[$platform]); } diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 5d4258e099..a49a1b18c3 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -230,6 +230,7 @@ $utopia->get('/v1/account/sessions/oauth/:provider') ->label('sdk.description', '/docs/references/account/create-session-oauth.md') ->label('sdk.response.code', 301) ->label('sdk.response.type', 'text/html') + ->label('sdk.location', true) ->label('abuse-limit', 50) ->label('abuse-key', 'ip:{ip}') ->param('provider', '', function () use ($providers) { return new WhiteList(array_keys($providers)); }, 'OAuth Provider. Currently, supported providers are: ' . implode(', ', array_keys(array_filter($providers, function($node) {return (!$node['mock']);}))).'.') diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index a166a90761..c69e951a2f 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -311,6 +311,7 @@ $utopia->get('/v1/storage/files/:fileId/preview') ->label('sdk.method', 'getFilePreview') ->label('sdk.description', '/docs/references/storage/get-file-preview.md') ->label('sdk.response.type', 'image/*') + ->label('sdk.location', true) ->param('fileId', '', function () { return new UID(); }, 'File unique ID') ->param('width', 0, function () { return new Range(0, 4000); }, 'Resize preview image width, Pass an integer between 0 to 4000.', true) ->param('height', 0, function () { return new Range(0, 4000); }, 'Resize preview image height, Pass an integer between 0 to 4000.', true) @@ -424,6 +425,7 @@ $utopia->get('/v1/storage/files/:fileId/download') ->label('sdk.method', 'getFileDownload') ->label('sdk.description', '/docs/references/storage/get-file-download.md') ->label('sdk.response.type', '*') + ->label('sdk.location', true) ->param('fileId', '', function () { return new UID(); }, 'File unique ID.') ->action( function ($fileId) use ($response, $request, $projectDB) { @@ -476,6 +478,7 @@ $utopia->get('/v1/storage/files/:fileId/view') ->label('sdk.method', 'getFileView') ->label('sdk.description', '/docs/references/storage/get-file-view.md') ->label('sdk.response.type', '*') + ->label('sdk.location', true) ->param('fileId', '', function () { return new UID(); }, 'File unique ID.') ->param('as', '', function () { return new WhiteList(['pdf', /*'html',*/ 'text']); }, 'Choose a file format to convert your file to. Currently you can only convert word and pdf files to pdf or txt. This option is currently experimental only, use at your own risk.', true) ->action( diff --git a/composer.lock b/composer.lock index 39accf6894..1c54ab5cd6 100644 --- a/composer.lock +++ b/composer.lock @@ -556,12 +556,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "63793536355a64085fe7a602c9e2ef8bf32eb811" + "reference": "89b1a76b7fda5853401297dc4b2a093cba1fda23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/63793536355a64085fe7a602c9e2ef8bf32eb811", - "reference": "63793536355a64085fe7a602c9e2ef8bf32eb811", + "url": "https://api.github.com/repos/guzzle/promises/zipball/89b1a76b7fda5853401297dc4b2a093cba1fda23", + "reference": "89b1a76b7fda5853401297dc4b2a093cba1fda23", "shasum": "" }, "require": { @@ -599,7 +599,7 @@ "keywords": [ "promise" ], - "time": "2020-02-12T18:05:15+00:00" + "time": "2020-02-15T23:33:03+00:00" }, { "name": "guzzlehttp/psr7", @@ -1526,7 +1526,7 @@ "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator", - "reference": "0f87e715e2e12a94e21889e34a174de1aa30dac3" + "reference": "51b433031debb0aa79afe5f165c47a13038b6712" }, "require": { "ext-curl": "*", @@ -1556,7 +1556,7 @@ } ], "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", - "time": "2020-02-15T18:06:37+00:00" + "time": "2020-02-16T06:24:39+00:00" }, { "name": "doctrine/instantiator",