From 77bb7dbd48da2de6a9714e8f9f08af73c8a2ee1f Mon Sep 17 00:00:00 2001 From: Nikolas Rimikis Date: Fri, 1 Sep 2023 17:35:10 +0200 Subject: [PATCH] refactor(app,dynamite,dynamite_runtime,neon,nextcloud): use Uri to represent the serverUrl Signed-off-by: Nikolas Rimikis Signed-off-by: Nikolas Rimikis --- .../app/integration_test/screenshot_test.dart | 2 +- .../dynamite/lib/src/openapi_builder.dart | 2 +- .../dynamite_runtime/lib/src/http_client.dart | 11 ++- .../lib/src/blocs/login_check_account.dart | 2 +- .../src/blocs/login_check_server_status.dart | 2 +- .../neon/neon/lib/src/blocs/login_flow.dart | 2 +- .../neon/neon/lib/src/models/account.dart | 21 +++-- .../neon/neon/lib/src/models/account.g.dart | 4 +- packages/neon/neon/lib/src/pages/login.dart | 4 +- .../lib/src/pages/login_check_account.dart | 2 +- .../src/pages/login_check_server_status.dart | 2 +- .../neon/neon/lib/src/pages/login_flow.dart | 4 +- packages/neon/neon/lib/src/router.dart | 12 +-- packages/neon/neon/lib/src/router.g.dart | 24 ++--- .../neon/neon/lib/src/utils/validators.dart | 8 +- .../neon/lib/src/widgets/cached_image.dart | 7 +- packages/neon/neon/test/account_test.dart | 22 ++--- .../lib/src/api/comments.openapi.dart | 2 +- .../nextcloud/lib/src/api/core.openapi.dart | 88 +++++++++---------- .../lib/src/api/dashboard.openapi.dart | 6 +- .../nextcloud/lib/src/api/dav.openapi.dart | 2 +- .../nextcloud/lib/src/api/files.openapi.dart | 28 +++--- .../lib/src/api/files_external.openapi.dart | 2 +- .../lib/src/api/files_reminders.openapi.dart | 6 +- .../lib/src/api/files_sharing.openapi.dart | 42 ++++----- .../lib/src/api/files_trashbin.openapi.dart | 2 +- .../lib/src/api/files_versions.openapi.dart | 2 +- .../nextcloud/lib/src/api/news.openapi.dart | 36 ++++---- .../nextcloud/lib/src/api/notes.openapi.dart | 14 +-- .../lib/src/api/notifications.openapi.dart | 14 +-- .../lib/src/api/provisioning_api.openapi.dart | 86 +++++++++--------- .../lib/src/api/settings.openapi.dart | 2 +- .../lib/src/api/theming.openapi.dart | 22 ++--- .../src/api/updatenotification.openapi.dart | 2 +- .../nextcloud/lib/src/api/uppush.openapi.dart | 22 ++--- .../lib/src/api/user_status.openapi.dart | 20 ++--- .../lib/src/api/weather_status.openapi.dart | 14 +-- packages/nextcloud/lib/src/client.dart | 3 +- packages/nextcloud/test/helper.dart | 6 +- 39 files changed, 282 insertions(+), 270 deletions(-) diff --git a/packages/app/integration_test/screenshot_test.dart b/packages/app/integration_test/screenshot_test.dart index 5c093a2a..946eaff5 100644 --- a/packages/app/integration_test/screenshot_test.dart +++ b/packages/app/integration_test/screenshot_test.dart @@ -47,7 +47,7 @@ Future prepareScreenshot(final WidgetTester tester, final IntegrationTestWidgets } Future getAccount(final String username) async { - const host = 'http://10.0.2.2'; + final host = Uri(scheme: 'http', host: '10.0.2.2'); final appPassword = (await NextcloudClient( host, loginName: username, diff --git a/packages/dynamite/dynamite/lib/src/openapi_builder.dart b/packages/dynamite/dynamite/lib/src/openapi_builder.dart index b559f72b..d4648b2c 100644 --- a/packages/dynamite/dynamite/lib/src/openapi_builder.dart +++ b/packages/dynamite/dynamite/lib/src/openapi_builder.dart @@ -554,7 +554,7 @@ class OpenAPIBuilder implements Builder { ''' final _response = await ${isRootClient ? 'this' : '_rootClient'}.doRequest( '$httpMethod', - Uri(path: _path, queryParameters: _queryParameters.isNotEmpty ? _queryParameters : null).toString(), + Uri(path: _path, queryParameters: _queryParameters.isNotEmpty ? _queryParameters : null), _headers, _body, ); diff --git a/packages/dynamite/dynamite_runtime/lib/src/http_client.dart b/packages/dynamite/dynamite_runtime/lib/src/http_client.dart index d52aeafb..52366962 100644 --- a/packages/dynamite/dynamite_runtime/lib/src/http_client.dart +++ b/packages/dynamite/dynamite_runtime/lib/src/http_client.dart @@ -132,11 +132,18 @@ class DynamiteClient { Future doRequest( final String method, - final String path, + final Uri path, final Map headers, final Uint8List? body, ) async { - final uri = Uri.parse('$baseURL$path'); + final uri = baseURL.replace( + path: '${baseURL.path}${path.path}', + queryParameters: { + ...baseURL.queryParameters, + ...path.queryParameters, + }, + ); + final request = await httpClient.openUrl(method, uri); for (final header in {...?baseHeaders, ...headers}.entries) { request.headers.add(header.key, header.value); diff --git a/packages/neon/neon/lib/src/blocs/login_check_account.dart b/packages/neon/neon/lib/src/blocs/login_check_account.dart index 3fcc2be0..380ef064 100644 --- a/packages/neon/neon/lib/src/blocs/login_check_account.dart +++ b/packages/neon/neon/lib/src/blocs/login_check_account.dart @@ -25,7 +25,7 @@ class LoginCheckAccountBloc extends InteractiveBloc unawaited(refresh()); } - final String serverURL; + final Uri serverURL; final String loginName; final String password; diff --git a/packages/neon/neon/lib/src/blocs/login_check_server_status.dart b/packages/neon/neon/lib/src/blocs/login_check_server_status.dart index 81acbd08..65b8526e 100644 --- a/packages/neon/neon/lib/src/blocs/login_check_server_status.dart +++ b/packages/neon/neon/lib/src/blocs/login_check_server_status.dart @@ -20,7 +20,7 @@ class LoginCheckServerStatusBloc extends InteractiveBloc unawaited(refresh()); } - final String serverURL; + final Uri serverURL; @override void dispose() { diff --git a/packages/neon/neon/lib/src/blocs/login_flow.dart b/packages/neon/neon/lib/src/blocs/login_flow.dart index 374478af..3a25c087 100644 --- a/packages/neon/neon/lib/src/blocs/login_flow.dart +++ b/packages/neon/neon/lib/src/blocs/login_flow.dart @@ -20,7 +20,7 @@ class LoginFlowBloc extends InteractiveBloc implements LoginFlowBlocEvents, Logi unawaited(refresh()); } - final String serverURL; + final Uri serverURL; late final _client = NextcloudClient( serverURL, userAgentOverride: neonUserAgent, diff --git a/packages/neon/neon/lib/src/models/account.dart b/packages/neon/neon/lib/src/models/account.dart index 567b555a..4710796f 100644 --- a/packages/neon/neon/lib/src/models/account.dart +++ b/packages/neon/neon/lib/src/models/account.dart @@ -13,7 +13,7 @@ part 'account.g.dart'; @immutable abstract interface class Credentials { /// Url of the server - abstract final String serverURL; + abstract final Uri serverURL; /// Username abstract final String username; @@ -44,7 +44,7 @@ class Account implements Credentials { Map toJson() => _$AccountToJson(this); @override - final String serverURL; + final Uri serverURL; @override final String username; @override @@ -70,19 +70,18 @@ class Account implements Credentials { return _idCache[key] ??= sha1.convert(utf8.encode(key)).toString(); } + /// A human readable representation of [username] and [serverURL]. String get humanReadableID { - final uri = Uri.parse(serverURL); - // Maybe also show path if it is not '/' ? final buffer = StringBuffer() ..write(username) ..write('@') - ..write(uri.host); + ..write(serverURL.host); - if (uri.hasPort) { + if (serverURL.hasPort) { buffer ..write(':') - ..write(uri.port); + ..write(serverURL.port); } return buffer.toString(); @@ -96,7 +95,7 @@ class Account implements Credentials { /// The paths of the [serverURL] and the [uri] need to be join to get the full path, unless the [uri] path is already an absolute path. /// In that case an instance hosted at a sub folder will already contain the sub folder part in the [uri]. Uri completeUri(final Uri uri) { - final result = Uri.parse(serverURL).replace( + final result = serverURL.replace( queryParameters: uri.queryParameters, fragment: uri.fragment, ); @@ -108,7 +107,7 @@ class Account implements Credentials { /// Removes the [serverURL] part from the [uri]. /// /// Should be used when trying to push a [uri] from an API to the router as it might contain the scheme, host and sub path of the instance which will not work with the router. - Uri stripUri(final Uri uri) => Uri.parse(uri.toString().replaceFirst(serverURL, '')); + Uri stripUri(final Uri uri) => Uri.parse(uri.toString().replaceFirst(serverURL.toString(), '')); } Map _idCache = {}; @@ -134,7 +133,7 @@ class LoginQrcode implements Credentials { }); @override - final String serverURL; + final Uri serverURL; @override final String username; @override @@ -176,7 +175,7 @@ class LoginQrcode implements Credentials { } return LoginQrcode( - serverURL: match.group(3)!, + serverURL: Uri.parse(match.group(3)!), username: match.group(1)!, password: match.group(2)!, ); diff --git a/packages/neon/neon/lib/src/models/account.g.dart b/packages/neon/neon/lib/src/models/account.g.dart index ea607165..a961e85e 100644 --- a/packages/neon/neon/lib/src/models/account.g.dart +++ b/packages/neon/neon/lib/src/models/account.g.dart @@ -7,14 +7,14 @@ part of 'account.dart'; // ************************************************************************** Account _$AccountFromJson(Map json) => Account( - serverURL: json['serverURL'] as String, + serverURL: Uri.parse(json['serverURL'] as String), username: json['username'] as String, password: json['password'] as String?, userAgent: json['userAgent'] as String?, ); Map _$AccountToJson(Account instance) => { - 'serverURL': instance.serverURL, + 'serverURL': instance.serverURL.toString(), 'username': instance.username, 'password': instance.password, 'userAgent': instance.userAgent, diff --git a/packages/neon/neon/lib/src/pages/login.dart b/packages/neon/neon/lib/src/pages/login.dart index d0c9b9a7..e51291b7 100644 --- a/packages/neon/neon/lib/src/pages/login.dart +++ b/packages/neon/neon/lib/src/pages/login.dart @@ -30,7 +30,9 @@ class _LoginPageState extends State { void login(final String url) { if (_formKey.currentState!.validate()) { - LoginCheckServerStatusRoute(serverUrl: url).go(context); + final uri = Uri.parse(url); + + LoginCheckServerStatusRoute(serverUrl: uri).go(context); } else { _focusNode.requestFocus(); } diff --git a/packages/neon/neon/lib/src/pages/login_check_account.dart b/packages/neon/neon/lib/src/pages/login_check_account.dart index 47aad9c1..b117aa6e 100644 --- a/packages/neon/neon/lib/src/pages/login_check_account.dart +++ b/packages/neon/neon/lib/src/pages/login_check_account.dart @@ -22,7 +22,7 @@ class LoginCheckAccountPage extends StatefulWidget { super.key, }); - final String serverURL; + final Uri serverURL; final String loginName; final String password; diff --git a/packages/neon/neon/lib/src/pages/login_check_server_status.dart b/packages/neon/neon/lib/src/pages/login_check_server_status.dart index dd1b8579..7c777669 100644 --- a/packages/neon/neon/lib/src/pages/login_check_server_status.dart +++ b/packages/neon/neon/lib/src/pages/login_check_server_status.dart @@ -23,7 +23,7 @@ class LoginCheckServerStatusPage extends StatefulWidget { super.key, }); - final String serverURL; + final Uri serverURL; final String? loginName; final String? password; diff --git a/packages/neon/neon/lib/src/pages/login_flow.dart b/packages/neon/neon/lib/src/pages/login_flow.dart index f94eade6..ba631c48 100644 --- a/packages/neon/neon/lib/src/pages/login_flow.dart +++ b/packages/neon/neon/lib/src/pages/login_flow.dart @@ -13,7 +13,7 @@ class LoginFlowPage extends StatefulWidget { super.key, }); - final String serverURL; + final Uri serverURL; @override State createState() => _LoginFlowPageState(); @@ -39,7 +39,7 @@ class _LoginFlowPageState extends State { bloc.result.listen((final result) { LoginCheckAccountRoute( - serverUrl: result.server, + serverUrl: Uri.parse(result.server), loginName: result.loginName, password: result.appPassword, ).pushReplacement(context); diff --git a/packages/neon/neon/lib/src/router.dart b/packages/neon/neon/lib/src/router.dart index a0af9af9..19a5016a 100644 --- a/packages/neon/neon/lib/src/router.dart +++ b/packages/neon/neon/lib/src/router.dart @@ -183,7 +183,7 @@ class LoginFlowRoute extends GoRouteData { required this.serverUrl, }); - final String serverUrl; + final Uri serverUrl; @override Widget build(final BuildContext context, final GoRouterState state) => LoginFlowPage(serverURL: serverUrl); @@ -233,7 +233,7 @@ class LoginCheckServerStatusRoute extends GoRouteData { required String this.password, }) : assert(!kIsWeb, 'Might leak the password to the browser history'); - final String serverUrl; + final Uri serverUrl; final String? loginName; final String? password; @@ -282,7 +282,7 @@ class LoginCheckAccountRoute extends GoRouteData { required this.password, }) : assert(!kIsWeb, 'Might leak the password to the browser history'); - final String serverUrl; + final Uri serverUrl; final String loginName; final String password; @@ -321,7 +321,7 @@ class _AddAccountFlowRoute extends LoginFlowRoute { }); @override - String get serverUrl => super.serverUrl; + Uri get serverUrl => super.serverUrl; } @immutable @@ -342,7 +342,7 @@ class _AddAccountCheckServerStatusRoute extends LoginCheckServerStatusRoute { }) : super.withCredentials(); @override - String get serverUrl => super.serverUrl; + Uri get serverUrl => super.serverUrl; @override String? get loginName => super.loginName; @override @@ -358,7 +358,7 @@ class _AddAccountCheckAccountRoute extends LoginCheckAccountRoute { }); @override - String get serverUrl => super.serverUrl; + Uri get serverUrl => super.serverUrl; @override String get loginName => super.loginName; @override diff --git a/packages/neon/neon/lib/src/router.g.dart b/packages/neon/neon/lib/src/router.g.dart index a8d73571..b9fdc4da 100644 --- a/packages/neon/neon/lib/src/router.g.dart +++ b/packages/neon/neon/lib/src/router.g.dart @@ -144,13 +144,13 @@ extension $_AddAccountRouteExtension on _AddAccountRoute { extension $_AddAccountFlowRouteExtension on _AddAccountFlowRoute { static _AddAccountFlowRoute _fromState(GoRouterState state) => _AddAccountFlowRoute( - serverUrl: state.uri.queryParameters['server-url']!, + serverUrl: Uri.parse(state.uri.queryParameters['server-url']!), ); String get location => GoRouteData.$location( '/settings/account/add/flow', queryParams: { - 'server-url': serverUrl, + 'server-url': serverUrl.toString(), }, ); @@ -181,13 +181,13 @@ extension $_AddAccountQrcodeRouteExtension on _AddAccountQrcodeRoute { extension $_AddAccountCheckServerStatusRouteExtension on _AddAccountCheckServerStatusRoute { static _AddAccountCheckServerStatusRoute _fromState(GoRouterState state) => _AddAccountCheckServerStatusRoute( - serverUrl: state.uri.queryParameters['server-url']!, + serverUrl: Uri.parse(state.uri.queryParameters['server-url']!), ); String get location => GoRouteData.$location( '/settings/account/add/check/server', queryParams: { - 'server-url': serverUrl, + 'server-url': serverUrl.toString(), }, ); @@ -202,7 +202,7 @@ extension $_AddAccountCheckServerStatusRouteExtension on _AddAccountCheckServerS extension $_AddAccountCheckAccountRouteExtension on _AddAccountCheckAccountRoute { static _AddAccountCheckAccountRoute _fromState(GoRouterState state) => _AddAccountCheckAccountRoute( - serverUrl: state.uri.queryParameters['server-url']!, + serverUrl: Uri.parse(state.uri.queryParameters['server-url']!), loginName: state.uri.queryParameters['login-name']!, password: state.uri.queryParameters['password']!, ); @@ -210,7 +210,7 @@ extension $_AddAccountCheckAccountRouteExtension on _AddAccountCheckAccountRoute String get location => GoRouteData.$location( '/settings/account/add/check/account', queryParams: { - 'server-url': serverUrl, + 'server-url': serverUrl.toString(), 'login-name': loginName, 'password': password, }, @@ -298,13 +298,13 @@ extension $LoginRouteExtension on LoginRoute { extension $LoginFlowRouteExtension on LoginFlowRoute { static LoginFlowRoute _fromState(GoRouterState state) => LoginFlowRoute( - serverUrl: state.uri.queryParameters['server-url']!, + serverUrl: Uri.parse(state.uri.queryParameters['server-url']!), ); String get location => GoRouteData.$location( '/login/flow', queryParams: { - 'server-url': serverUrl, + 'server-url': serverUrl.toString(), }, ); @@ -335,7 +335,7 @@ extension $LoginQrcodeRouteExtension on LoginQrcodeRoute { extension $LoginCheckServerStatusRouteExtension on LoginCheckServerStatusRoute { static LoginCheckServerStatusRoute _fromState(GoRouterState state) => LoginCheckServerStatusRoute( - serverUrl: state.uri.queryParameters['server-url']!, + serverUrl: Uri.parse(state.uri.queryParameters['server-url']!), loginName: state.uri.queryParameters['login-name'], password: state.uri.queryParameters['password'], ); @@ -343,7 +343,7 @@ extension $LoginCheckServerStatusRouteExtension on LoginCheckServerStatusRoute { String get location => GoRouteData.$location( '/login/check/server', queryParams: { - 'server-url': serverUrl, + 'server-url': serverUrl.toString(), if (loginName != null) 'login-name': loginName, if (password != null) 'password': password, }, @@ -360,7 +360,7 @@ extension $LoginCheckServerStatusRouteExtension on LoginCheckServerStatusRoute { extension $LoginCheckAccountRouteExtension on LoginCheckAccountRoute { static LoginCheckAccountRoute _fromState(GoRouterState state) => LoginCheckAccountRoute( - serverUrl: state.uri.queryParameters['server-url']!, + serverUrl: Uri.parse(state.uri.queryParameters['server-url']!), loginName: state.uri.queryParameters['login-name']!, password: state.uri.queryParameters['password']!, ); @@ -368,7 +368,7 @@ extension $LoginCheckAccountRouteExtension on LoginCheckAccountRoute { String get location => GoRouteData.$location( '/login/check/account', queryParams: { - 'server-url': serverUrl, + 'server-url': serverUrl.toString(), 'login-name': loginName, 'password': password, }, diff --git a/packages/neon/neon/lib/src/utils/validators.dart b/packages/neon/neon/lib/src/utils/validators.dart index 757209d7..36e4ae0e 100644 --- a/packages/neon/neon/lib/src/utils/validators.dart +++ b/packages/neon/neon/lib/src/utils/validators.dart @@ -9,8 +9,9 @@ String? validateHttpUrl( if (input == null || input.isEmpty) { return AppLocalizations.of(context).errorInvalidURL; } - try { - final uri = Uri.parse(input); + final uri = Uri.tryParse(input); + + if (uri != null) { if (uri.isScheme('https')) { return null; } @@ -18,7 +19,8 @@ String? validateHttpUrl( // TODO: Maybe make a better error message for http URLs if only https is allowed return null; } - } catch (_) {} + } + return AppLocalizations.of(context).errorInvalidURL; } diff --git a/packages/neon/neon/lib/src/widgets/cached_image.dart b/packages/neon/neon/lib/src/widgets/cached_image.dart index dd865cea..68842406 100644 --- a/packages/neon/neon/lib/src/widgets/cached_image.dart +++ b/packages/neon/neon/lib/src/widgets/cached_image.dart @@ -76,10 +76,9 @@ class NeonCachedImage extends StatefulWidget { } final file = await _cacheManager.getSingleFile( uri.toString(), - headers: - account != null && uri.host == Uri.parse(account.serverURL).host && account.client.authentications.isNotEmpty - ? account.client.authentications.first.headers - : null, + headers: account != null && uri.host == account.serverURL.host && account.client.authentications.isNotEmpty + ? account.client.authentications.first.headers + : null, ); return file.readAsBytes(); } diff --git a/packages/neon/neon/test/account_test.dart b/packages/neon/neon/test/account_test.dart index 34e360f4..9c415e22 100644 --- a/packages/neon/neon/test/account_test.dart +++ b/packages/neon/neon/test/account_test.dart @@ -6,8 +6,8 @@ void main() { const qrCodePath = '/user:JohnDoe&password:super_secret&server:example.com'; const qrCode = 'nc://login$qrCodePath'; const invalidUrl = '::Not valid LoginQrcode::'; - const credentials = LoginQrcode( - serverURL: 'example.com', + final credentials = LoginQrcode( + serverURL: Uri.parse('example.com'), username: 'JohnDoe', password: 'super_secret', ); @@ -33,7 +33,7 @@ void main() { ]) { group(serverURL, () { final account = Account( - serverURL: serverURL, + serverURL: Uri.parse(serverURL), username: 'example', ); @@ -63,7 +63,7 @@ void main() { group('Account', () { final account = Account( - serverURL: 'http://example.com', + serverURL: Uri(scheme: 'http', host: 'example.com'), username: 'JohnDoe', password: 'super_secret', ); @@ -89,7 +89,7 @@ void main() { expect(account.humanReadableID, 'JohnDoe@example.com'); final accountWithDefaultPort = Account( - serverURL: 'http://example.com:80', + serverURL: Uri(scheme: 'http', host: 'example.com', port: 80), username: 'JohnDoe', password: 'super_secret', ); @@ -97,7 +97,7 @@ void main() { expect(accountWithDefaultPort.humanReadableID, 'JohnDoe@example.com'); final accountWithPort = Account( - serverURL: 'http://example.com:8080', + serverURL: Uri(scheme: 'http', host: 'example.com', port: 8080), username: 'JohnDoe', password: 'super_secret', ); @@ -108,27 +108,27 @@ void main() { test('AccountFind', () { final account1 = Account( - serverURL: 'http://example.com', + serverURL: Uri(scheme: 'http', host: 'example.com'), username: 'JohnDoe', password: 'super_secret', ); final account2 = Account( - serverURL: 'http://example.com', + serverURL: Uri(scheme: 'http', host: 'example.com'), username: 'JohnDoe2', password: 'super_secret', ); final account3 = Account( - serverURL: 'http://example.com', + serverURL: Uri(scheme: 'http', host: 'example.com'), username: 'JohnDoe3', password: 'super_secret', ); final account4 = Account( - serverURL: 'http://example.com', + serverURL: Uri(scheme: 'http', host: 'example.com'), username: 'JohnDoe4', password: 'super_secret', ); final account5 = Account( - serverURL: 'http://example.com', + serverURL: Uri(scheme: 'http', host: 'example.com'), username: 'JohnDoe5', password: 'super_secret', ); diff --git a/packages/nextcloud/lib/src/api/comments.openapi.dart b/packages/nextcloud/lib/src/api/comments.openapi.dart index 2a230428..5f29237b 100644 --- a/packages/nextcloud/lib/src/api/comments.openapi.dart +++ b/packages/nextcloud/lib/src/api/comments.openapi.dart @@ -96,7 +96,7 @@ class CommentsNotificationsClient { path = path.replaceAll('{id}', Uri.encodeQueryComponent(id)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/core.openapi.dart b/packages/nextcloud/lib/src/api/core.openapi.dart index ad0fe249..6e742e0f 100644 --- a/packages/nextcloud/lib/src/api/core.openapi.dart +++ b/packages/nextcloud/lib/src/api/core.openapi.dart @@ -99,7 +99,7 @@ class CoreClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -142,7 +142,7 @@ class CoreAppPasswordClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -181,7 +181,7 @@ class CoreAppPasswordClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -220,7 +220,7 @@ class CoreAppPasswordClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -287,7 +287,7 @@ class CoreAutoCompleteClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -333,7 +333,7 @@ class CoreAvatarClient { path = path.replaceAll('{size}', Uri.encodeQueryComponent(size.toString())); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -375,7 +375,7 @@ class CoreAvatarClient { path = path.replaceAll('{size}', Uri.encodeQueryComponent(size.toString())); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -419,7 +419,7 @@ class CoreClientFlowLoginV2Client { queryParameters['token'] = token; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -453,7 +453,7 @@ class CoreClientFlowLoginV2Client { // coverage:ignore-end final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -498,7 +498,7 @@ class CoreCollaborationResourcesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -539,7 +539,7 @@ class CoreCollaborationResourcesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -582,7 +582,7 @@ class CoreCollaborationResourcesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -627,7 +627,7 @@ class CoreCollaborationResourcesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -672,7 +672,7 @@ class CoreCollaborationResourcesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -715,7 +715,7 @@ class CoreCollaborationResourcesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -760,7 +760,7 @@ class CoreCollaborationResourcesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -806,7 +806,7 @@ class CoreGuestAvatarClient { path = path.replaceAll('{size}', Uri.encodeQueryComponent(size)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -848,7 +848,7 @@ class CoreGuestAvatarClient { } final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -892,7 +892,7 @@ class CoreHoverCardClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -941,7 +941,7 @@ class CoreNavigationClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -984,7 +984,7 @@ class CoreNavigationClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1027,7 +1027,7 @@ class CoreOcsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1098,7 +1098,7 @@ class CorePreviewClient { } final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1160,7 +1160,7 @@ class CorePreviewClient { } final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1208,7 +1208,7 @@ class CoreProfileApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1249,7 +1249,7 @@ class CoreReferenceClient { path = path.replaceAll('{referenceId}', Uri.encodeQueryComponent(referenceId)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1293,7 +1293,7 @@ class CoreReferenceApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1338,7 +1338,7 @@ class CoreReferenceApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1387,7 +1387,7 @@ class CoreReferenceApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1426,7 +1426,7 @@ class CoreReferenceApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1471,7 +1471,7 @@ class CoreReferenceApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1514,7 +1514,7 @@ class CoreTextProcessingApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1561,7 +1561,7 @@ class CoreTextProcessingApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1600,7 +1600,7 @@ class CoreTextProcessingApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1641,7 +1641,7 @@ class CoreTextProcessingApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1686,7 +1686,7 @@ class CoreTextProcessingApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1727,7 +1727,7 @@ class CoreTranslationApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1772,7 +1772,7 @@ class CoreTranslationApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1821,7 +1821,7 @@ class CoreUnifiedSearchClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1885,7 +1885,7 @@ class CoreUnifiedSearchClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1928,7 +1928,7 @@ class CoreWhatsNewClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1969,7 +1969,7 @@ class CoreWhatsNewClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -2010,7 +2010,7 @@ class CoreWipeClient { queryParameters['token'] = token; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -2045,7 +2045,7 @@ class CoreWipeClient { queryParameters['token'] = token; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/dashboard.openapi.dart b/packages/nextcloud/lib/src/api/dashboard.openapi.dart index a1ab26b4..7b2fb71d 100644 --- a/packages/nextcloud/lib/src/api/dashboard.openapi.dart +++ b/packages/nextcloud/lib/src/api/dashboard.openapi.dart @@ -103,7 +103,7 @@ class DashboardDashboardApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -159,7 +159,7 @@ class DashboardDashboardApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -215,7 +215,7 @@ class DashboardDashboardApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/dav.openapi.dart b/packages/nextcloud/lib/src/api/dav.openapi.dart index 9392872b..c6735dd3 100644 --- a/packages/nextcloud/lib/src/api/dav.openapi.dart +++ b/packages/nextcloud/lib/src/api/dav.openapi.dart @@ -108,7 +108,7 @@ class DavDirectClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/files.openapi.dart b/packages/nextcloud/lib/src/api/files.openapi.dart index ad99103c..82cca272 100644 --- a/packages/nextcloud/lib/src/api/files.openapi.dart +++ b/packages/nextcloud/lib/src/api/files.openapi.dart @@ -115,7 +115,7 @@ class FilesApiClient { path = path.replaceAll('{file}', Uri.encodeQueryComponent(file)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -146,7 +146,7 @@ class FilesApiClient { // coverage:ignore-end final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -192,7 +192,7 @@ class FilesDirectEditingClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -235,7 +235,7 @@ class FilesDirectEditingClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -284,7 +284,7 @@ class FilesDirectEditingClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -333,7 +333,7 @@ class FilesDirectEditingClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -380,7 +380,7 @@ class FilesOpenLocalEditorClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -423,7 +423,7 @@ class FilesOpenLocalEditorClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -466,7 +466,7 @@ class FilesTemplateClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -515,7 +515,7 @@ class FilesTemplateClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -562,7 +562,7 @@ class FilesTemplateClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -611,7 +611,7 @@ class FilesTransferOwnershipClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -652,7 +652,7 @@ class FilesTransferOwnershipClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -693,7 +693,7 @@ class FilesTransferOwnershipClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/files_external.openapi.dart b/packages/nextcloud/lib/src/api/files_external.openapi.dart index ca3f6d04..c5aa8469 100644 --- a/packages/nextcloud/lib/src/api/files_external.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_external.openapi.dart @@ -104,7 +104,7 @@ class FilesExternalApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/files_reminders.openapi.dart b/packages/nextcloud/lib/src/api/files_reminders.openapi.dart index d0f84635..57905bcd 100644 --- a/packages/nextcloud/lib/src/api/files_reminders.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_reminders.openapi.dart @@ -112,7 +112,7 @@ class FilesRemindersApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -162,7 +162,7 @@ class FilesRemindersApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -210,7 +210,7 @@ class FilesRemindersApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/files_sharing.openapi.dart b/packages/nextcloud/lib/src/api/files_sharing.openapi.dart index c71a6ad5..ed6f8a80 100644 --- a/packages/nextcloud/lib/src/api/files_sharing.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_sharing.openapi.dart @@ -107,7 +107,7 @@ class FilesSharingDeletedShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -148,7 +148,7 @@ class FilesSharingDeletedShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -193,7 +193,7 @@ class FilesSharingPublicPreviewClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -245,7 +245,7 @@ class FilesSharingPublicPreviewClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -285,7 +285,7 @@ class FilesSharingRemoteClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -324,7 +324,7 @@ class FilesSharingRemoteClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -365,7 +365,7 @@ class FilesSharingRemoteClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -406,7 +406,7 @@ class FilesSharingRemoteClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -447,7 +447,7 @@ class FilesSharingRemoteClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -488,7 +488,7 @@ class FilesSharingRemoteClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -543,7 +543,7 @@ class FilesSharingShareInfoClient { } final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -608,7 +608,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -691,7 +691,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -732,7 +732,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -771,7 +771,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -816,7 +816,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -893,7 +893,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -934,7 +934,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -975,7 +975,7 @@ class FilesSharingShareapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1049,7 +1049,7 @@ class FilesSharingShareesapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1104,7 +1104,7 @@ class FilesSharingShareesapiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart b/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart index 682d9e8b..fbbd1bb0 100644 --- a/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart @@ -116,7 +116,7 @@ class FilesTrashbinPreviewClient { } final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/files_versions.openapi.dart b/packages/nextcloud/lib/src/api/files_versions.openapi.dart index 8a97a307..82bdcaee 100644 --- a/packages/nextcloud/lib/src/api/files_versions.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_versions.openapi.dart @@ -116,7 +116,7 @@ class FilesVersionsPreviewClient { } final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/news.openapi.dart b/packages/nextcloud/lib/src/api/news.openapi.dart index 5e990249..ea2f8f2d 100644 --- a/packages/nextcloud/lib/src/api/news.openapi.dart +++ b/packages/nextcloud/lib/src/api/news.openapi.dart @@ -86,7 +86,7 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -115,7 +115,7 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -143,7 +143,7 @@ class NewsClient extends DynamiteClient { queryParameters['name'] = name; final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -173,7 +173,7 @@ class NewsClient extends DynamiteClient { queryParameters['name'] = name; final response = await doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -198,7 +198,7 @@ class NewsClient extends DynamiteClient { path = path.replaceAll('{folderId}', Uri.encodeQueryComponent(folderId.toString())); final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -227,7 +227,7 @@ class NewsClient extends DynamiteClient { queryParameters['newestItemId'] = newestItemId.toString(); final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -253,7 +253,7 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -287,7 +287,7 @@ class NewsClient extends DynamiteClient { } final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -313,7 +313,7 @@ class NewsClient extends DynamiteClient { path = path.replaceAll('{feedId}', Uri.encodeQueryComponent(feedId.toString())); final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -344,7 +344,7 @@ class NewsClient extends DynamiteClient { } final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -373,7 +373,7 @@ class NewsClient extends DynamiteClient { queryParameters['feedTitle'] = feedTitle; final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -402,7 +402,7 @@ class NewsClient extends DynamiteClient { queryParameters['newestItemId'] = newestItemId.toString(); final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -453,7 +453,7 @@ class NewsClient extends DynamiteClient { } final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -493,7 +493,7 @@ class NewsClient extends DynamiteClient { } final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -519,7 +519,7 @@ class NewsClient extends DynamiteClient { path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -544,7 +544,7 @@ class NewsClient extends DynamiteClient { path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -569,7 +569,7 @@ class NewsClient extends DynamiteClient { path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -594,7 +594,7 @@ class NewsClient extends DynamiteClient { path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/notes.openapi.dart b/packages/nextcloud/lib/src/api/notes.openapi.dart index c9af34eb..966d4796 100644 --- a/packages/nextcloud/lib/src/api/notes.openapi.dart +++ b/packages/nextcloud/lib/src/api/notes.openapi.dart @@ -112,7 +112,7 @@ class NotesClient extends DynamiteClient { } final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -162,7 +162,7 @@ class NotesClient extends DynamiteClient { } final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -200,7 +200,7 @@ class NotesClient extends DynamiteClient { } final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -254,7 +254,7 @@ class NotesClient extends DynamiteClient { } final response = await doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -282,7 +282,7 @@ class NotesClient extends DynamiteClient { path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -308,7 +308,7 @@ class NotesClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -338,7 +338,7 @@ class NotesClient extends DynamiteClient { as Uint8List; final response = await doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/notifications.openapi.dart b/packages/nextcloud/lib/src/api/notifications.openapi.dart index be8cbc3c..1021d3ce 100644 --- a/packages/nextcloud/lib/src/api/notifications.openapi.dart +++ b/packages/nextcloud/lib/src/api/notifications.openapi.dart @@ -88,7 +88,7 @@ class NotificationsClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -117,7 +117,7 @@ class NotificationsClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -146,7 +146,7 @@ class NotificationsClient extends DynamiteClient { path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -176,7 +176,7 @@ class NotificationsClient extends DynamiteClient { path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -212,7 +212,7 @@ class NotificationsClient extends DynamiteClient { queryParameters['proxyServer'] = proxyServer; final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -241,7 +241,7 @@ class NotificationsClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -276,7 +276,7 @@ class NotificationsClient extends DynamiteClient { } final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart b/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart index 0778324e..e1188c13 100644 --- a/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart +++ b/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart @@ -110,7 +110,7 @@ class ProvisioningApiAppConfigClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -153,7 +153,7 @@ class ProvisioningApiAppConfigClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -202,7 +202,7 @@ class ProvisioningApiAppConfigClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -247,7 +247,7 @@ class ProvisioningApiAppConfigClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -292,7 +292,7 @@ class ProvisioningApiAppConfigClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -343,7 +343,7 @@ class ProvisioningApiAppsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -386,7 +386,7 @@ class ProvisioningApiAppsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -429,7 +429,7 @@ class ProvisioningApiAppsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -472,7 +472,7 @@ class ProvisioningApiAppsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -529,7 +529,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -576,7 +576,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -627,7 +627,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -673,7 +673,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -731,7 +731,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -779,7 +779,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -826,7 +826,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -878,7 +878,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -926,7 +926,7 @@ class ProvisioningApiGroupsClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -977,7 +977,7 @@ class ProvisioningApiPreferencesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1020,7 +1020,7 @@ class ProvisioningApiPreferencesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1068,7 +1068,7 @@ class ProvisioningApiPreferencesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1111,7 +1111,7 @@ class ProvisioningApiPreferencesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1168,7 +1168,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1241,7 +1241,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1292,7 +1292,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1343,7 +1343,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1384,7 +1384,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1429,7 +1429,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1470,7 +1470,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1509,7 +1509,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1548,7 +1548,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1589,7 +1589,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1641,7 +1641,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1682,7 +1682,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1723,7 +1723,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1764,7 +1764,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1805,7 +1805,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1850,7 +1850,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1893,7 +1893,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1936,7 +1936,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -1981,7 +1981,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -2026,7 +2026,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -2067,7 +2067,7 @@ class ProvisioningApiUsersClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/settings.openapi.dart b/packages/nextcloud/lib/src/api/settings.openapi.dart index 51e46cce..12f6e358 100644 --- a/packages/nextcloud/lib/src/api/settings.openapi.dart +++ b/packages/nextcloud/lib/src/api/settings.openapi.dart @@ -101,7 +101,7 @@ class SettingsLogSettingsClient { // coverage:ignore-end final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/theming.openapi.dart b/packages/nextcloud/lib/src/api/theming.openapi.dart index b4ded87e..911eb88e 100644 --- a/packages/nextcloud/lib/src/api/theming.openapi.dart +++ b/packages/nextcloud/lib/src/api/theming.openapi.dart @@ -102,7 +102,7 @@ class ThemingIconClient { path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -134,7 +134,7 @@ class ThemingIconClient { path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -173,7 +173,7 @@ class ThemingIconClient { path = path.replaceAll('{image}', Uri.encodeQueryComponent(image)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -223,7 +223,7 @@ class ThemingThemingClient { } final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -261,7 +261,7 @@ class ThemingThemingClient { } final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -293,7 +293,7 @@ class ThemingThemingClient { path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -336,7 +336,7 @@ class ThemingUserThemeClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -382,7 +382,7 @@ class ThemingUserThemeClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -417,7 +417,7 @@ class ThemingUserThemeClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -456,7 +456,7 @@ class ThemingUserThemeClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -497,7 +497,7 @@ class ThemingUserThemeClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/updatenotification.openapi.dart b/packages/nextcloud/lib/src/api/updatenotification.openapi.dart index 87dffa50..26544080 100644 --- a/packages/nextcloud/lib/src/api/updatenotification.openapi.dart +++ b/packages/nextcloud/lib/src/api/updatenotification.openapi.dart @@ -109,7 +109,7 @@ class UpdatenotificationApiClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/uppush.openapi.dart b/packages/nextcloud/lib/src/api/uppush.openapi.dart index e52587e7..b2d82712 100644 --- a/packages/nextcloud/lib/src/api/uppush.openapi.dart +++ b/packages/nextcloud/lib/src/api/uppush.openapi.dart @@ -86,7 +86,7 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -119,7 +119,7 @@ class UppushClient extends DynamiteClient { queryParameters['keepalive'] = keepalive.toString(); final response = await doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -150,7 +150,7 @@ class UppushClient extends DynamiteClient { queryParameters['deviceName'] = deviceName; final response = await doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -183,7 +183,7 @@ class UppushClient extends DynamiteClient { path = path.replaceAll('{deviceId}', Uri.encodeQueryComponent(deviceId)); final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -214,7 +214,7 @@ class UppushClient extends DynamiteClient { path = path.replaceAll('{deviceId}', Uri.encodeQueryComponent(deviceId)); final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -249,7 +249,7 @@ class UppushClient extends DynamiteClient { queryParameters['appName'] = appName; final response = await doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -280,7 +280,7 @@ class UppushClient extends DynamiteClient { path = path.replaceAll('{token}', Uri.encodeQueryComponent(token)); final response = await doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -313,7 +313,7 @@ class UppushClient extends DynamiteClient { path = path.replaceAll('{token}', Uri.encodeQueryComponent(token)); final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -344,7 +344,7 @@ class UppushClient extends DynamiteClient { path = path.replaceAll('{token}', Uri.encodeQueryComponent(token)); final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -374,7 +374,7 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -404,7 +404,7 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end final response = await doRequest( 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/user_status.openapi.dart b/packages/nextcloud/lib/src/api/user_status.openapi.dart index b52a6b83..64db19dc 100644 --- a/packages/nextcloud/lib/src/api/user_status.openapi.dart +++ b/packages/nextcloud/lib/src/api/user_status.openapi.dart @@ -109,7 +109,7 @@ class UserStatusHeartbeatClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -154,7 +154,7 @@ class UserStatusPredefinedStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -207,7 +207,7 @@ class UserStatusStatusesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -248,7 +248,7 @@ class UserStatusStatusesClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -293,7 +293,7 @@ class UserStatusUserStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -334,7 +334,7 @@ class UserStatusUserStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -379,7 +379,7 @@ class UserStatusUserStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -430,7 +430,7 @@ class UserStatusUserStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -469,7 +469,7 @@ class UserStatusUserStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -510,7 +510,7 @@ class UserStatusUserStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/api/weather_status.openapi.dart b/packages/nextcloud/lib/src/api/weather_status.openapi.dart index 0e59ff9e..8288133d 100644 --- a/packages/nextcloud/lib/src/api/weather_status.openapi.dart +++ b/packages/nextcloud/lib/src/api/weather_status.openapi.dart @@ -105,7 +105,7 @@ class WeatherStatusWeatherStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -144,7 +144,7 @@ class WeatherStatusWeatherStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -183,7 +183,7 @@ class WeatherStatusWeatherStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -234,7 +234,7 @@ class WeatherStatusWeatherStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -273,7 +273,7 @@ class WeatherStatusWeatherStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -312,7 +312,7 @@ class WeatherStatusWeatherStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); @@ -353,7 +353,7 @@ class WeatherStatusWeatherStatusClient { headers['OCS-APIRequest'] = oCSAPIRequest; final response = await _rootClient.doRequest( 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null).toString(), + Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), headers, body, ); diff --git a/packages/nextcloud/lib/src/client.dart b/packages/nextcloud/lib/src/client.dart index fa4d6f51..be794ace 100644 --- a/packages/nextcloud/lib/src/client.dart +++ b/packages/nextcloud/lib/src/client.dart @@ -7,7 +7,7 @@ import 'package:nextcloud/nextcloud.dart'; class NextcloudClient extends DynamiteClient { // ignore: public_member_api_docs NextcloudClient( - final String baseURL, { + super.baseURL, { this.loginName, final String? password, final String? appPassword, @@ -16,7 +16,6 @@ class NextcloudClient extends DynamiteClient { final String? userAgentOverride, super.cookieJar, }) : super( - Uri.parse(baseURL), baseHeaders: language != null ? {'Accept-Language': language} : null, userAgent: userAgentOverride ?? appType.userAgent, authentications: [ diff --git a/packages/nextcloud/test/helper.dart b/packages/nextcloud/test/helper.dart index 03ccd9cf..9f796768 100644 --- a/packages/nextcloud/test/helper.dart +++ b/packages/nextcloud/test/helper.dart @@ -118,7 +118,11 @@ Future getTestClient( } final client = TestNextcloudClient( - 'http://localhost:${container.port}', + Uri( + scheme: 'http', + host: 'localhost', + port: container.port, + ), loginName: username, password: username, appPassword: appPassword,