diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 22aeb72fd6..8d92e1d662 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -247,7 +247,7 @@ $utopia->get('/v1/account/sessions/oauth2/:provider') ->label('sdk.description', '/docs/references/account/create-session-oauth2.md') ->label('sdk.response.code', 301) ->label('sdk.response.type', 'text/html') - ->label('sdk.location', true) + ->label('sdk.methodType', 'webAuth') ->label('abuse-limit', 50) ->label('abuse-key', 'ip:{ip}') ->param('provider', '', function () { return new WhiteList(array_keys(Config::getParam('providers'))); }, 'OAuth2 Provider. Currently, supported providers are: ' . implode(', ', array_keys(array_filter(Config::getParam('providers'), function($node) {return (!$node['mock']);}))).'.') diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 4a84dbf8dd..f8f8221f65 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -142,6 +142,7 @@ $utopia->post('/v1/storage/files') ->label('sdk.method', 'createFile') ->label('sdk.description', '/docs/references/storage/create-file.md') ->label('sdk.consumes', 'multipart/form-data') + ->label('sdk.methodType', 'upload') ->param('file', [], function () { return new File(); }, 'Binary File.', false) ->param('read', [], function () { return new ArrayList(new Text(64)); }, 'An array of strings with read permissions. By default no user is granted with any read permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.') ->param('write', [], function () { return new ArrayList(new Text(64)); }, 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.') @@ -328,7 +329,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) + ->label('sdk.methodType', 'location') ->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) @@ -452,7 +453,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) + ->label('sdk.methodType', 'location') ->param('fileId', '', function () { return new UID(); }, 'File unique ID.') ->action( function ($fileId) use ($response, $request, $projectDB) { @@ -505,7 +506,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) + ->label('sdk.methodType', 'location') ->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/app/sdks/flutter-dart/.dart_tool/package_config.json b/app/sdks/flutter-dart/.dart_tool/package_config.json index 89964f528b..79f1f8fa5a 100644 --- a/app/sdks/flutter-dart/.dart_tool/package_config.json +++ b/app/sdks/flutter-dart/.dart_tool/package_config.json @@ -1,66 +1,24 @@ { "configVersion": 2, "packages": [ - { - "name": "archive", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/archive-2.0.11", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "args", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/args-1.5.2", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "async", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/async-2.4.0", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "boolean_selector", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.5", - "packageUri": "lib/", - "languageVersion": "2.0" - }, { "name": "charcode", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2", + "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3", "packageUri": "lib/", - "languageVersion": "1.0" + "languageVersion": "2.0" }, { "name": "collection", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11", + "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12", "packageUri": "lib/", "languageVersion": "2.0" }, - { - "name": "convert", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1", - "packageUri": "lib/", - "languageVersion": "1.17" - }, { "name": "cookie_jar", "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/cookie_jar-1.0.1", "packageUri": "lib/", "languageVersion": "1.20" }, - { - "name": "crypto", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.3", - "packageUri": "lib/", - "languageVersion": "2.1" - }, - { - "name": "cupertino_icons", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", - "packageUri": "lib/", - "languageVersion": "2.0" - }, { "name": "dio", "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/dio-3.0.9", @@ -73,131 +31,29 @@ "packageUri": "lib/", "languageVersion": "2.4" }, - { - "name": "flutter", - "rootUri": "file:///Users/eldadfux/Desktop/github/flutter/packages/flutter", - "packageUri": "lib/", - "languageVersion": "2.2" - }, - { - "name": "flutter_test", - "rootUri": "file:///Users/eldadfux/Desktop/github/flutter/packages/flutter_test", - "packageUri": "lib/", - "languageVersion": "2.2" - }, - { - "name": "flutter_web_auth", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/flutter_web_auth-0.1.3", - "packageUri": "lib/", - "languageVersion": "2.1" - }, { "name": "http_parser", "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4", "packageUri": "lib/", "languageVersion": "2.3" }, - { - "name": "image", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/image-2.1.4", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "matcher", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6", - "packageUri": "lib/", - "languageVersion": "2.2" - }, { "name": "meta", "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8", "packageUri": "lib/", "languageVersion": "1.12" }, - { - "name": "package_info", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.0+16", - "packageUri": "lib/", - "languageVersion": "2.0" - }, { "name": "path", "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path-1.6.4", "packageUri": "lib/", "languageVersion": "2.0" }, - { - "name": "path_provider", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.5", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "path_provider_macos", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4", - "packageUri": "lib/", - "languageVersion": "2.1" - }, - { - "name": "path_provider_platform_interface", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-1.0.1", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "pedantic", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/pedantic-1.8.0+1", - "packageUri": "lib/", - "languageVersion": "2.1" - }, - { - "name": "petitparser", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0", - "packageUri": "lib/", - "languageVersion": "2.4" - }, - { - "name": "platform", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/platform-2.2.1", - "packageUri": "lib/", - "languageVersion": "1.24" - }, - { - "name": "plugin_platform_interface", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/plugin_platform_interface-1.0.2", - "packageUri": "lib/", - "languageVersion": "2.1" - }, - { - "name": "quiver", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.5", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "sky_engine", - "rootUri": "file:///Users/eldadfux/Desktop/github/flutter/bin/cache/pkg/sky_engine", - "packageUri": "lib/", - "languageVersion": "1.11" - }, { "name": "source_span", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5", + "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0", "packageUri": "lib/", - "languageVersion": "1.8" - }, - { - "name": "stack_trace", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3", - "packageUri": "lib/", - "languageVersion": "1.23" - }, - { - "name": "stream_channel", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0", - "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.6" }, { "name": "string_scanner", @@ -211,30 +67,12 @@ "packageUri": "lib/", "languageVersion": "1.8" }, - { - "name": "test_api", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.11", - "packageUri": "lib/", - "languageVersion": "2.2" - }, { "name": "typed_data", "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6", "packageUri": "lib/", "languageVersion": "2.0" }, - { - "name": "vector_math", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8", - "packageUri": "lib/", - "languageVersion": "2.0" - }, - { - "name": "xml", - "rootUri": "file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/xml-3.5.0", - "packageUri": "lib/", - "languageVersion": "2.3" - }, { "name": "appwrite", "rootUri": "../", @@ -242,7 +80,7 @@ "languageVersion": "2.6" } ], - "generated": "2020-04-11T09:32:46.431074Z", + "generated": "2020-04-10T18:56:11.631386Z", "generator": "pub", "generatorVersion": "2.7.2" } diff --git a/app/sdks/flutter-dart/.packages b/app/sdks/flutter-dart/.packages index b747ae5d6b..7b07f11699 100644 --- a/app/sdks/flutter-dart/.packages +++ b/app/sdks/flutter-dart/.packages @@ -1,41 +1,14 @@ -# Generated by pub on 2020-04-11 12:32:46.410814. -archive:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/archive-2.0.11/lib/ -args:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/args-1.5.2/lib/ -async:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/async-2.4.0/lib/ -boolean_selector:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.5/lib/ -charcode:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib/ -collection:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib/ -convert:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib/ +# Generated by pub on 2020-04-10 21:56:11.618646. +charcode:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.3/lib/ +collection:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/collection-1.14.12/lib/ cookie_jar:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/cookie_jar-1.0.1/lib/ -crypto:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.3/lib/ -cupertino_icons:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/ dio:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/dio-3.0.9/lib/ dio_cookie_manager:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/dio_cookie_manager-1.0.0/lib/ -flutter:file:///Users/eldadfux/Desktop/github/flutter/packages/flutter/lib/ -flutter_test:file:///Users/eldadfux/Desktop/github/flutter/packages/flutter_test/lib/ -flutter_web_auth:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/flutter_web_auth-0.1.3/lib/ http_parser:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/lib/ -image:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/image-2.1.4/lib/ -matcher:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6/lib/ meta:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/lib/ -package_info:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.0+16/lib/ path:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/lib/ -path_provider:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.5/lib/ -path_provider_macos:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4/lib/ -path_provider_platform_interface:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-1.0.1/lib/ -pedantic:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/pedantic-1.8.0+1/lib/ -petitparser:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0/lib/ -platform:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/platform-2.2.1/lib/ -plugin_platform_interface:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/plugin_platform_interface-1.0.2/lib/ -quiver:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.5/lib/ -sky_engine:file:///Users/eldadfux/Desktop/github/flutter/bin/cache/pkg/sky_engine/lib/ -source_span:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5/lib/ -stack_trace:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib/ -stream_channel:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0/lib/ +source_span:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/source_span-1.7.0/lib/ string_scanner:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/lib/ term_glyph:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib/ -test_api:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.11/lib/ typed_data:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/ -vector_math:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib/ -xml:file:///Users/eldadfux/.pub-cache/hosted/pub.dartlang.org/xml-3.5.0/lib/ appwrite:lib/ diff --git a/app/sdks/flutter-dart/pubspec.lock b/app/sdks/flutter-dart/pubspec.lock index 95ab20ca65..a1648b1374 100644 --- a/app/sdks/flutter-dart/pubspec.lock +++ b/app/sdks/flutter-dart/pubspec.lock @@ -1,55 +1,20 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.11" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.5" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.1.3" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" + version: "1.14.12" cookie_jar: dependency: "direct main" description: @@ -57,20 +22,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.3" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3" dio: dependency: "direct main" description: @@ -85,23 +36,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_auth: - dependency: "direct main" - description: - name: flutter_web_auth - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3" http_parser: dependency: transitive description: @@ -109,20 +43,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.4" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.6" meta: dependency: "direct main" description: @@ -130,13 +50,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.8" - package_info: - dependency: "direct main" - description: - name: package_info - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.0+16" path: dependency: transitive description: @@ -144,88 +57,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.6.4" - path_provider: - dependency: "direct main" - description: - name: path_provider - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.5" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.4" - path_provider_platform_interface: - dependency: transitive - description: - name: path_provider_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - platform: - dependency: transitive - description: - name: platform - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.1" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.9.3" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" + version: "1.7.0" string_scanner: dependency: transitive description: @@ -240,13 +78,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.11" typed_data: dependency: transitive description: @@ -254,20 +85,5 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.6" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" sdks: dart: ">=2.6.0 <3.0.0" - flutter: ">=1.10.0 <2.0.0"