diff --git a/packages/dynamite/dynamite/lib/src/builder/client.dart b/packages/dynamite/dynamite/lib/src/builder/client.dart index ba62edac..d4f94276 100644 --- a/packages/dynamite/dynamite/lib/src/builder/client.dart +++ b/packages/dynamite/dynamite/lib/src/builder/client.dart @@ -1,6 +1,7 @@ import 'package:built_collection/built_collection.dart'; import 'package:code_builder/code_builder.dart'; import 'package:collection/collection.dart'; +import 'package:dynamite/src/builder/resolve_mime_type.dart'; import 'package:dynamite/src/builder/resolve_object.dart'; import 'package:dynamite/src/builder/resolve_type.dart'; import 'package:dynamite/src/builder/state.dart'; @@ -181,308 +182,245 @@ Iterable buildTags( for (final pathEntry in paths.entries) { for (final operationEntry in pathEntry.value.operations.entries) { - yield Method( - (final b) { - final httpMethod = operationEntry.key.name; - final operation = operationEntry.value; - final operationId = operation.operationId ?? toDartName('$httpMethod-${pathEntry.key}'); - final parameters = [ - ...?pathEntry.value.parameters, - ...?operation.parameters, - ]..sort(sortRequiredParameters); - b - ..name = toDartName(filterMethodName(operationId, tag ?? '')) - ..modifier = MethodModifier.async - ..docs.addAll(operation.formattedDescription); - if (operation.deprecated ?? false) { - b.annotations.add(refer('Deprecated').call([refer("''")])); - } - - var responses = >{}; - if (operation.responses != null) { - for (final responseEntry in operation.responses!.entries) { - final statusCode = int.parse(responseEntry.key); - final response = responseEntry.value; - - responses[response] ??= []; - responses[response]!.add(statusCode); - } - - if (responses.length > 1) { - print('$operationId uses more than one response schema but we only generate the first one'); - responses = Map.fromEntries([responses.entries.first]); - } - } + final httpMethod = operationEntry.key.name; + final operation = operationEntry.value; + final operationId = operation.operationId ?? toDartName('$httpMethod-${pathEntry.key}'); + final parameters = [ + ...?pathEntry.value.parameters, + ...?operation.parameters, + ]..sort(sortRequiredParameters); + final name = toDartName(filterMethodName(operationId, tag ?? '')); + + var responses = >{}; + if (operation.responses != null) { + for (final responseEntry in operation.responses!.entries) { + final statusCode = int.parse(responseEntry.key); + final response = responseEntry.value; + + responses[response] ??= []; + responses[response]!.add(statusCode); + } - final code = StringBuffer(); + if (responses.length > 1) { + print('$operationId uses more than one response schema but we only generate the first one'); + responses = Map.fromEntries([responses.entries.first]); + } + } - final acceptHeader = responses.keys - .map((final response) => response.content?.keys) - .whereNotNull() - .expand((final element) => element) - .toSet() - .join(','); + final code = StringBuffer(); + final acceptHeader = responses.keys + .map((final response) => response.content?.keys) + .whereNotNull() + .expand((final element) => element) + .toSet() + .join(','); - code.writeln(''' + code.writeln(''' var _path = '${pathEntry.key}'; final _queryParameters = {}; final _headers = {${acceptHeader.isNotEmpty ? "'Accept': '$acceptHeader'," : ''}}; Uint8List? _body; '''); - buildAuthCheck( - responses, - pathEntry, - operation, - spec, - client, - ).forEach(code.writeln); + buildAuthCheck( + responses, + pathEntry, + operation, + spec, + client, + ).forEach(code.writeln); + + final operationParameters = ListBuilder(); + final docs = operation.formattedDescription; + final annotations = operation.deprecated ?? false ? refer('Deprecated').call([refer("''")]) : null; + var returnDataType = 'void'; + var returnHeadersType = 'void'; + + for (final parameter in parameters) { + final dartParameterNullable = isDartParameterNullable( + parameter.required, + parameter.schema, + ); + + final result = resolveType( + spec, + state, + toDartName( + '$operationId-${parameter.name}', + uppercaseFirstCharacter: true, + ), + parameter.schema!, + nullable: dartParameterNullable, + ).dartType; + + buildPatternCheck(result, parameter).forEach(code.writeln); + + final defaultValueCode = parameter.schema?.$default != null + ? valueToEscapedValue(result, parameter.schema!.$default.toString()) + : null; + + operationParameters.add( + Parameter( + (final b) { + b + ..named = true + ..name = toDartName(parameter.name) + ..required = parameter.isDartRequired; + if (parameter.schema != null) { + b.type = refer(result.nullableName); + } + if (defaultValueCode != null) { + b.defaultTo = Code(defaultValueCode); + } + }, + ), + ); - for (final parameter in parameters) { - final dartParameterNullable = isDartParameterNullable( - parameter.required, - parameter.schema, + if (dartParameterNullable) { + code.writeln('if (${toDartName(parameter.name)} != null) {'); + } + final value = result.encode( + toDartName(parameter.name), + onlyChildren: result is TypeResultList && parameter.$in == 'query', + ); + if (defaultValueCode != null && parameter.$in == 'query') { + code.writeln('if (${toDartName(parameter.name)} != $defaultValueCode) {'); + } + switch (parameter.$in) { + case 'path': + code.writeln( + "_path = _path.replaceAll('{${parameter.name}}', Uri.encodeQueryComponent($value));", ); - - final result = resolveType( - spec, - state, - toDartName( - '$operationId-${parameter.name}', - uppercaseFirstCharacter: true, - ), - parameter.schema!, - nullable: dartParameterNullable, - ).dartType; - - buildPatternCheck(result, parameter).forEach(code.writeln); - - final defaultValueCode = parameter.schema?.$default != null - ? valueToEscapedValue(result, parameter.schema!.$default.toString()) - : null; - - b.optionalParameters.add( - Parameter( - (final b) { - b - ..named = true - ..name = toDartName(parameter.name) - ..required = parameter.isDartRequired; - if (parameter.schema != null) { - b.type = refer(result.nullableName); - } - if (defaultValueCode != null) { - b.defaultTo = Code(defaultValueCode); - } - }, - ), + case 'query': + code.writeln( + "_queryParameters['${parameter.name}'] = $value;", ); - - if (dartParameterNullable) { - code.write('if (${toDartName(parameter.name)} != null) {'); - } - final value = result.encode( - toDartName(parameter.name), - onlyChildren: result is TypeResultList && parameter.$in == 'query', + case 'header': + code.writeln( + "_headers['${parameter.name}'] = $value;", ); - if (defaultValueCode != null && parameter.$in == 'query') { - code.write('if (${toDartName(parameter.name)} != $defaultValueCode) {'); - } - switch (parameter.$in) { - case 'path': - code.write( - "_path = _path.replaceAll('{${parameter.name}}', Uri.encodeQueryComponent($value));", - ); - case 'query': - code.write( - "_queryParameters['${parameter.name}'] = $value;", - ); - case 'header': - code.write( - "_headers['${parameter.name}'] = $value;", - ); - default: - throw Exception('Can not work with parameter in "${parameter.$in}"'); - } - if (defaultValueCode != null && parameter.$in == 'query') { - code.write('}'); - } - if (dartParameterNullable) { - code.write('}'); - } - } + default: + throw Exception('Can not work with parameter in "${parameter.$in}"'); + } + if (defaultValueCode != null && parameter.$in == 'query') { + code.writeln('}'); + } + if (dartParameterNullable) { + code.writeln('}'); + } + } + resolveMimeTypeEncode(operation, spec, state, operationId, operationParameters).forEach(code.writeln); - if (operation.requestBody != null) { - if (operation.requestBody!.content!.length > 1) { - throw Exception('Can not work with multiple mime types right now'); - } - for (final content in operation.requestBody!.content!.entries) { - final mimeType = content.key; - final mediaType = content.value; - - code.write("_headers['Content-Type'] = '$mimeType';"); - - final dartParameterNullable = isDartParameterNullable( - operation.requestBody!.required, - mediaType.schema, - ); - - final result = resolveType( - spec, - state, - toDartName('$operationId-request-$mimeType', uppercaseFirstCharacter: true), - mediaType.schema!, - nullable: dartParameterNullable, - ); - final parameterName = toDartName(result.name.replaceFirst(state.classPrefix, '')); - switch (mimeType) { - case 'application/json': - case 'application/x-www-form-urlencoded': - final dartParameterRequired = isRequired( - operation.requestBody!.required, - mediaType.schema?.$default, - ); - b.optionalParameters.add( - Parameter( - (final b) => b - ..name = parameterName - ..type = refer(result.nullableName) - ..named = true - ..required = dartParameterRequired, - ), - ); - - if (dartParameterNullable) { - code.write('if ($parameterName != null) {'); - } - code.write( - '_body = utf8.encode(${result.encode(parameterName, mimeType: mimeType)}) as Uint8List;', - ); - if (dartParameterNullable) { - code.write('}'); - } - default: - throw Exception('Can not parse mime type "$mimeType"'); - } - } - } + for (final responseEntry in responses.entries) { + final response = responseEntry.key; + final statusCodes = responseEntry.value; - code.write( - ''' -final _response = await $client.doRequest( - '$httpMethod', - Uri(path: _path, queryParameters: _queryParameters.isNotEmpty ? _queryParameters : null), - _headers, - _body, -); -''', + TypeResult? headersType; + if (response.headers != null) { + final identifier = + '${tag != null ? toDartName(tag, uppercaseFirstCharacter: true) : null}${toDartName(operationId, uppercaseFirstCharacter: true)}Headers'; + headersType = resolveObject( + spec, + state, + identifier, + openapi.Schema( + (final b) => b + ..properties.replace( + response.headers!.map( + (final headerName, final value) => MapEntry( + headerName.toLowerCase(), + value.schema!, + ), + ), + ), + ), + isHeader: true, ); + } - for (final responseEntry in responses.entries) { - final response = responseEntry.key; - final statusCodes = responseEntry.value; - code.write( - 'if (${statusCodes.map((final statusCode) => '_response.statusCode == $statusCode').join(' || ')}) {', - ); + final dataType = resolveMimeTypeDecode( + response, + spec, + state, + toDartName( + '$operationId-response${responses.entries.length > 1 ? '-${responses.entries.toList().indexOf(responseEntry)}' : ''}', + uppercaseFirstCharacter: true, + ), + ); + + code.writeln( + 'final _uri = Uri(path: _path, queryParameters: _queryParameters.isNotEmpty ? _queryParameters : null);', + ); + + if (dataType != null) { + returnDataType = dataType.name; + } + if (headersType != null) { + returnHeadersType = headersType.name; + } - String? headersType; - String? headersValue; - if (response.headers != null) { - final identifier = - '${tag != null ? toDartName(tag, uppercaseFirstCharacter: true) : null}${toDartName(operationId, uppercaseFirstCharacter: true)}Headers'; - final result = resolveObject( - spec, - state, - identifier, - openapi.Schema( - (final b) => b - ..properties.replace( - response.headers!.map( - (final headerName, final value) => MapEntry( - headerName.toLowerCase(), - value.schema!, - ), - ), - ), - ), - isHeader: true, - ); - headersType = result.name; - headersValue = result.deserialize('_response.responseHeaders'); - } + code.writeln(''' + return DynamiteRawResponse<$returnDataType, $returnHeadersType>( + response: $client.doRequest( + '$httpMethod', + _uri, + _headers, + _body, +'''); + + if (responses.values.isNotEmpty) { + final codes = statusCodes.join(','); + code.writeln('const {$codes},'); + } - String? dataType; - String? dataValue; - bool? dataNeedsAwait; - if (response.content != null) { - if (response.content!.length > 1) { - throw Exception('Can not work with multiple mime types right now'); - } - for (final content in response.content!.entries) { - final mimeType = content.key; - final mediaType = content.value; - - final result = resolveType( - spec, - state, - toDartName( - '$operationId-response${responses.entries.length > 1 ? '-${responses.entries.toList().indexOf(responseEntry)}' : ''}-$mimeType', - uppercaseFirstCharacter: true, - ), - mediaType.schema!, - ); - - if (mimeType == '*/*' || mimeType == 'application/octet-stream' || mimeType.startsWith('image/')) { - dataType = 'Uint8List'; - dataValue = '_response.bodyBytes'; - dataNeedsAwait = true; - } else if (mimeType.startsWith('text/') || mimeType == 'application/javascript') { - dataType = 'String'; - dataValue = '_response.body'; - dataNeedsAwait = true; - } else if (mimeType == 'application/json') { - dataType = result.name; - if (result.name == 'dynamic') { - dataValue = ''; - } else if (result.name == 'String') { - dataValue = '_response.body'; - dataNeedsAwait = true; - } else if (result is TypeResultEnum || result is TypeResultBase) { - dataValue = result.deserialize(result.decode('await _response.body')); - dataNeedsAwait = false; - } else { - dataValue = result.deserialize('await _response.jsonBody'); - dataNeedsAwait = false; - } - } else { - throw Exception('Can not parse mime type "$mimeType"'); - } - } - } + code.writeln(''' + ), + bodyType: ${dataType?.fullType}, + headersType: ${headersType?.fullType}, + serializers: _jsonSerializers, + ); +'''); + } - if (headersType != null && dataType != null) { - b.returns = refer('Future>'); - code.write( - 'return DynamiteResponse<$dataType, $headersType>(${dataNeedsAwait ?? false ? 'await ' : ''}$dataValue, $headersValue,);', - ); - } else if (headersType != null) { - b.returns = refer('Future<$headersType>'); - code.write('return $headersValue;'); - } else if (dataType != null) { - b.returns = refer('Future<$dataType>'); - code.write('return $dataValue;'); - } else { - b.returns = refer('Future'); - code.write('return;'); - } + yield Method((final b) { + b + ..name = name + ..modifier = MethodModifier.async + ..docs.addAll(docs); + + if (annotations != null) { + b.annotations.add(annotations); + } - code.write('}'); + final parameters = operationParameters.build(); + final rawParameters = parameters.map((final p) => '${p.name}: ${p.name},').join('\n'); + + b + ..optionalParameters.addAll(parameters) + ..returns = refer('Future>') + ..body = Code(''' +final rawResponse = ${name}Raw( + $rawParameters +); + +return rawResponse.future; +'''); + }); + + yield Method( + (final b) { + b + ..name = '${name}Raw' + ..docs.addAll(docs); + + if (annotations != null) { + b.annotations.add(annotations); } - code.write( - 'throw await DynamiteApiException.fromResponse(_response); // coverage:ignore-line\n', - ); - b.body = Code(code.toString()); + b + ..optionalParameters.addAll(operationParameters.build()) + ..returns = refer('DynamiteRawResponse<$returnDataType, $returnHeadersType>') + ..body = Code(code.toString()); }, ); } diff --git a/packages/dynamite/dynamite/lib/src/builder/imports.dart b/packages/dynamite/dynamite/lib/src/builder/imports.dart index 97c25371..b30990f8 100644 --- a/packages/dynamite/dynamite/lib/src/builder/imports.dart +++ b/packages/dynamite/dynamite/lib/src/builder/imports.dart @@ -4,6 +4,7 @@ import 'package:path/path.dart' as p; List generateImports(final AssetId outputId) => [ const Code('// ignore_for_file: camel_case_types'), + const Code('// ignore_for_file: discarded_futures'), const Code('// ignore_for_file: public_member_api_docs'), const Code('// ignore_for_file: unreachable_switch_case'), Directive.import('dart:convert'), diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart b/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart new file mode 100644 index 00000000..36d38222 --- /dev/null +++ b/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart @@ -0,0 +1,129 @@ +import 'package:built_collection/built_collection.dart'; +import 'package:code_builder/code_builder.dart'; +import 'package:dynamite/src/builder/resolve_type.dart'; +import 'package:dynamite/src/builder/state.dart'; +import 'package:dynamite/src/helpers/dart_helpers.dart'; +import 'package:dynamite/src/helpers/dynamite.dart'; +import 'package:dynamite/src/models/openapi.dart' as openapi; +import 'package:dynamite/src/models/type_result.dart'; + +TypeResult? resolveMimeTypeDecode( + final openapi.Response response, + final openapi.OpenAPI spec, + final State state, + final String identifier, +) { + if (response.content != null) { + if (response.content!.length > 1) { + throw Exception('Can not work with multiple mime types right now'); + } + + for (final content in response.content!.entries) { + final mimeType = content.key; + final mediaType = content.value; + + final result = resolveType( + spec, + state, + toDartName('$identifier-$mimeType', uppercaseFirstCharacter: true), + mediaType.schema!, + ); + + if (mimeType == '*/*' || mimeType == 'application/octet-stream' || mimeType.startsWith('image/')) { + return TypeResultObject('Uint8List'); + } else if (mimeType.startsWith('text/') || mimeType == 'application/javascript') { + return TypeResultBase('String'); + } else if (mimeType == 'application/json') { + return result; + } else { + throw Exception('Can not parse mime type "$mimeType"'); + } + } + } + return null; +} + +Iterable resolveMimeTypeEncode( + final openapi.Operation operation, + final openapi.OpenAPI spec, + final State state, + final String identifier, + final ListBuilder b, +) sync* { + if (operation.requestBody != null) { + if (operation.requestBody!.content!.length > 1) { + throw Exception('Can not work with multiple mime types right now'); + } + for (final content in operation.requestBody!.content!.entries) { + final mimeType = content.key; + final mediaType = content.value; + + yield "_headers['Content-Type'] = '$mimeType';"; + + final dartParameterNullable = isDartParameterNullable( + operation.requestBody!.required, + mediaType.schema, + ); + + final result = resolveType( + spec, + state, + toDartName('$identifier-request-$mimeType', uppercaseFirstCharacter: true), + mediaType.schema!, + nullable: dartParameterNullable, + ); + final parameterName = toDartName(result.name.replaceFirst(state.classPrefix, '')); + switch (mimeType) { + case 'application/json': + case 'application/x-www-form-urlencoded': + final dartParameterRequired = isRequired( + operation.requestBody!.required, + mediaType.schema?.$default, + ); + b.add( + Parameter( + (final b) => b + ..name = parameterName + ..type = refer(result.nullableName) + ..named = true + ..required = dartParameterRequired, + ), + ); + + if (dartParameterNullable) { + yield 'if ($parameterName != null) {'; + } + yield '_body = utf8.encode(${result.encode(parameterName, mimeType: mimeType)}) as Uint8List;'; + if (dartParameterNullable) { + yield '}'; + } + return; + case 'application/octet-stream': + final dartParameterRequired = isRequired( + operation.requestBody!.required, + mediaType.schema?.$default, + ); + b.add( + Parameter( + (final b) => b + ..name = parameterName + ..type = refer(result.nullableName) + ..named = true + ..required = dartParameterRequired, + ), + ); + + if (dartParameterNullable) { + yield 'if ($parameterName != null) {'; + } + yield '_body = ${result.encode(parameterName, mimeType: mimeType)};'; + if (dartParameterNullable) { + yield '}'; + } + return; + default: + throw Exception('Can not parse mime type "$mimeType"'); + } + } + } +} diff --git a/packages/dynamite/dynamite/lib/src/builder/serializer.dart b/packages/dynamite/dynamite/lib/src/builder/serializer.dart index bbd4d7ed..97e8b49e 100644 --- a/packages/dynamite/dynamite/lib/src/builder/serializer.dart +++ b/packages/dynamite/dynamite/lib/src/builder/serializer.dart @@ -13,19 +13,9 @@ List buildSerializer(final State state) { .map(Code.new), const Code(').build();'), const Code(''), - Code('Serializers get ${state.variablePrefix}Serializers => _serializers;'), - const Code(''), const Code( 'final Serializers _jsonSerializers = (_serializers.toBuilder()..addPlugin(StandardJsonPlugin())..addPlugin(const ContentStringPlugin())).build();', ), - const Code(''), - Code( - 'T deserialize${state.classPrefix}(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T;', - ), - const Code(''), - Code( - 'Object? serialize${state.classPrefix}(final T data) => _serializers.serialize(data, specifiedType: FullType(T));', - ), const Code('// coverage:ignore-end'), ]; } diff --git a/packages/dynamite/dynamite_runtime/analysis_options.yaml b/packages/dynamite/dynamite_runtime/analysis_options.yaml index 80216cb3..447af2a6 100644 --- a/packages/dynamite/dynamite_runtime/analysis_options.yaml +++ b/packages/dynamite/dynamite_runtime/analysis_options.yaml @@ -1,9 +1,5 @@ include: package:neon_lints/dart.yaml -linter: - rules: - public_member_api_docs: false - analyzer: exclude: - '**.g.dart' diff --git a/packages/dynamite/dynamite_runtime/lib/http_client.dart b/packages/dynamite/dynamite_runtime/lib/http_client.dart index 1550b0eb..13962b5d 100644 --- a/packages/dynamite/dynamite_runtime/lib/http_client.dart +++ b/packages/dynamite/dynamite_runtime/lib/http_client.dart @@ -1 +1,3 @@ -export 'src/http_client.dart'; +export 'package:cookie_jar/cookie_jar.dart'; +export 'src/dynamite_client.dart'; +export 'src/http_extensions.dart'; diff --git a/packages/dynamite/dynamite_runtime/lib/src/dynamite_client.dart b/packages/dynamite/dynamite_runtime/lib/src/dynamite_client.dart new file mode 100644 index 00000000..b241426a --- /dev/null +++ b/packages/dynamite/dynamite_runtime/lib/src/dynamite_client.dart @@ -0,0 +1,445 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:built_value/serializer.dart'; +import 'package:cookie_jar/cookie_jar.dart'; +import 'package:dynamite_runtime/src/http_extensions.dart'; +import 'package:dynamite_runtime/src/uri.dart'; +import 'package:meta/meta.dart'; +import 'package:universal_io/io.dart'; + +/// Response returned by operations of a [DynamiteClient]. +/// +/// See: +/// * [DynamiteRawResponse] for an experimental implementation that can be serialized. +/// * [DynamiteApiException] as the exception that can be thrown in operations +/// * [DynamiteAuthentication] for providing authentication methods. +/// * [DynamiteClient] for the client providing operations. +@immutable +class DynamiteResponse { + /// Creates a new dynamite response. + const DynamiteResponse( + this.statusCode, + this._body, + this._headers, + ); + + /// The status code of the response. + final int statusCode; + + final B? _body; + + final H? _headers; + + /// The decoded body of the response. + B get body => _body!; + + /// The decoded headers of the response. + H get headers => _headers!; + + @override + String toString() => 'DynamiteResponse(data: $body, headers: $headers, statusCode: $statusCode)'; +} + +/// Raw response returned by operations of a [DynamiteClient]. +/// +/// This type itself is serializable. +/// +/// The api of this type might change without a major bump. +/// Use methods that return a [DynamiteResponse] instead. +/// +/// See: +/// * [DynamiteResponse] as the response returned by an operation. +/// * [DynamiteApiException] as the exception that can be thrown in operations +/// * [DynamiteAuthentication] for providing authentication methods. +/// * [DynamiteClient] for the client providing operations. +@experimental +class DynamiteRawResponse { + /// Creates a new raw dynamite response. + /// + /// The [response] will be awaited and deserialized. + /// After [future] completes the deserialized response can be accessed + /// through [response]. + DynamiteRawResponse({ + required final Future response, + required this.bodyType, + required this.headersType, + required this.serializers, + }) { + final completer = Completer>(); + future = completer.future; + + // ignore: discarded_futures + response.then( + (final response) async { + _rawBody = switch (bodyType) { + const FullType(Uint8List) => await response.bytes, + const FullType(String) => await response.string, + _ => await response.json, + }; + _rawHeaders = response.responseHeaders; + + final body = deserializeBody(_rawBody, serializers, bodyType); + final headers = deserializeHeaders(_rawHeaders, serializers, headersType); + + _response = DynamiteResponse( + response.statusCode, + body, + headers, + ); + + completer.complete(_response); + }, + onError: completer.completeError, + ); + } + + /// Decodes a raw dynamite response from json data. + /// + /// The [future] must not be awaited and the deserialized response can be + /// accessed immediately through [response]. + factory DynamiteRawResponse.fromJson( + final Map json, { + required final Serializers serializers, + final FullType? bodyType, + final FullType? headersType, + }) { + final statusCode = json['statusCode']! as int; + final body = deserializeBody(json['body'], serializers, bodyType); + final headers = deserializeHeaders(json['headers'], serializers, headersType); + + final response = DynamiteResponse( + statusCode, + body, + headers, + ); + + return DynamiteRawResponse._fromJson( + response, + bodyType: bodyType, + headersType: headersType, + serializers: serializers, + ); + } + + DynamiteRawResponse._fromJson( + this._response, { + required this.bodyType, + required this.headersType, + required this.serializers, + }) : future = Future.value(_response); + + /// The serializers for the header and body. + final Serializers serializers; + + /// The full type of the body. + /// + /// This is `null` if the body type is void. + final FullType? bodyType; + + /// The full type of the headers. + /// + /// This is `null` if the headers type is void. + final FullType? headersType; + + /// Future of the deserialized response. + /// + /// After this future completes the response can be accessed synchronously + /// through [response]. + late final Future> future; + + /// Caches the serialized response body for later serialization in [toJson]. + /// + /// Responses revived with [DynamiteRawResponse.fromJson] are not cached as + /// they are not expected to be serialized again. + Object? _rawBody; + + /// Caches the serialized response headers for later serialization in [toJson]. + /// + /// Responses revived with [DynamiteRawResponse.fromJson] are not cached as + /// they are not expected to be serialized again. + Map? _rawHeaders; + + DynamiteResponse? _response; + + /// Returns the deserialized response synchronously. + /// + /// Throws a `StateError` if [future] has not completed yet and `this` has + /// not been instantiated through [DynamiteRawResponse.fromJson]. + DynamiteResponse get response { + final response = _response; + + if (response == null) { + throw StateError('The response did not finish yet. Make sure to await `this.future`.'); + } + + return response; + } + + /// Deserializes the body. + /// + /// Most efficient if the [serialized] value is already the correct type. + /// The [bodyType] should represent the return type [B]. + static B? deserializeBody(final Object? serialized, final Serializers serializers, final FullType? bodyType) { + // If we use the more efficient helpers from BytesStreamExtension the serialized value can already be correct. + if (serialized is B) { + return serialized; + } + + if (bodyType != null) { + return serializers.deserialize(serialized, specifiedType: bodyType) as B?; + } + + return null; + } + + /// Serializes the body. + Object? serializeBody(final B? object) { + if (bodyType != null && object != null) { + return serializers.serialize(object, specifiedType: bodyType!); + } + + return null; + } + + /// Deserializes the headers. + /// + /// Most efficient if the [serialized] value is already the correct type. + /// The [headersType] should represent the return type [H]. + static H? deserializeHeaders( + final Object? serialized, + final Serializers serializers, + final FullType? headersType, + ) { + // If we use the more efficient helpers from BytesStreamExtension the serialized value can already be correct. + if (serialized is H) { + return serialized; + } + + if (headersType != null) { + return serializers.deserialize(serialized, specifiedType: headersType) as H?; + } + + return null; + } + + /// Serializes the headers. + Object? serializeHeaders(final H? object) { + if (headersType != null && object != null) { + return serializers.serialize(object, specifiedType: headersType!); + } + + return null; + } + + /// Serializes this response into json. + /// + /// To revive it again use [DynamiteRawResponse.fromJson] with the same + /// serializer and `FullType`s as this. + Map toJson() => { + 'statusCode': response.statusCode, + 'body': _rawBody ?? serializeBody(response._body), + 'headers': _rawHeaders ?? serializeHeaders(response._headers), + }; + + @override + String toString() => 'DynamiteResponse(${toJson()})'; +} + +/// The exception thrown by operations of a [DynamiteClient]. +/// +/// +/// See: +/// * [DynamiteResponse] as the response returned by an operation. +/// * [DynamiteRawResponse] as the raw response that can be serialized. +/// * [DynamiteAuthentication] for providing authentication methods. +/// * [DynamiteClient] for the client providing operations. +@immutable +class DynamiteApiException implements Exception { + /// Creates a new dynamite exception with the given information. + const DynamiteApiException( + this.statusCode, + this.headers, + this.body, + ); + + /// Creates a new Exception from the given [response]. + /// + /// Tries to decode the `response` into a string. + static Future fromResponse(final HttpClientResponse response) async { + String body; + try { + body = await response.string; + } on FormatException { + body = 'binary'; + } + + return DynamiteApiException( + response.statusCode, + response.responseHeaders, + body, + ); + } + + /// The returned status code when the exception was thrown. + final int statusCode; + + /// The returned headers when the exception was thrown. + final Map headers; + + /// The returned body code when the exception was thrown. + final String body; + + @override + String toString() => 'DynamiteApiException(statusCode: $statusCode, headers: $headers, body: $body)'; +} + +/// Base dynamite authentication. +/// +/// See: +/// * [DynamiteResponse] as the response returned by an operation. +/// * [DynamiteRawResponse] as the raw response that can be serialized. +/// * [DynamiteApiException] as the exception that can be thrown in operations +/// * [DynamiteClient] for the client providing operations. +@immutable +sealed class DynamiteAuthentication { + /// Creates a new authentication. + const DynamiteAuthentication({ + required this.type, + required this.scheme, + }); + + /// The base type of the authentication. + final String type; + + /// The used authentication scheme. + final String scheme; + + /// The authentication headers added to a request. + Map get headers; +} + +/// Basic http authentication with username and password. +class DynamiteHttpBasicAuthentication extends DynamiteAuthentication { + /// Creates a new http basic authentication. + const DynamiteHttpBasicAuthentication({ + required this.username, + required this.password, + }) : super( + type: 'http', + scheme: 'basic', + ); + + /// The username. + final String username; + + /// The password. + final String password; + + @override + Map get headers => { + 'Authorization': 'Basic ${base64.encode(utf8.encode('$username:$password'))}', + }; +} + +/// Http bearer authentication with a token. +class DynamiteHttpBearerAuthentication extends DynamiteAuthentication { + /// Creates a new http bearer authentication. + const DynamiteHttpBearerAuthentication({ + required this.token, + }) : super( + type: 'http', + scheme: 'bearer', + ); + + /// The authentication token. + final String token; + + @override + Map get headers => { + 'Authorization': 'Bearer $token', + }; +} + +/// A client for making network requests. +/// +/// See: +/// * [DynamiteResponse] as the response returned by an operation. +/// * [DynamiteRawResponse] as the raw response that can be serialized. +/// * [DynamiteApiException] as the exception that can be thrown in operations +/// * [DynamiteAuthentication] for providing authentication methods. +class DynamiteClient { + /// Creates a new dynamite network client. + /// + /// If [httpClient] is not provided a default one will be created. + /// The [baseURL] will be normalized, removing any trailing `/`. + DynamiteClient( + final Uri baseURL, { + this.baseHeaders, + final String? userAgent, + final HttpClient? httpClient, + this.cookieJar, + this.authentications = const [], + }) : httpClient = (httpClient ?? HttpClient())..userAgent = userAgent, + baseURL = baseURL.normalizeEmptyPath(); + + /// The base server url used to build the request uri. + /// + /// See `https://swagger.io/docs/specification/api-host-and-base-path` for + /// further information. + final Uri baseURL; + + /// The base headers added to each request. + final Map? baseHeaders; + + /// The base http client. + final HttpClient httpClient; + + /// The optional cookie jar to persist the response cookies. + final CookieJar? cookieJar; + + /// The available authentications for this client. + /// + /// The first one matching the required authentication type will be used. + final List authentications; + + /// Makes a request against a given [path]. + Future doRequest( + final String method, + final Uri path, + final Map headers, + final Uint8List? body, + final Set? validStatuses, + ) async { + 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); + } + if (body != null) { + request.add(body); + } + if (cookieJar != null) { + request.cookies.addAll(await cookieJar!.loadForRequest(uri)); + } + + final response = await request.close(); + if (cookieJar != null) { + await cookieJar!.saveFromResponse(uri, response.cookies); + } + + if (validStatuses?.contains(response.statusCode) ?? true) { + return response; + } else { + throw await DynamiteApiException.fromResponse(response); + } + } +} diff --git a/packages/dynamite/dynamite_runtime/lib/src/http_client.dart b/packages/dynamite/dynamite_runtime/lib/src/http_client.dart deleted file mode 100644 index d1a4f4b2..00000000 --- a/packages/dynamite/dynamite_runtime/lib/src/http_client.dart +++ /dev/null @@ -1,249 +0,0 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:typed_data'; - -import 'package:cookie_jar/cookie_jar.dart'; -import 'package:dynamite_runtime/src/uri.dart'; -import 'package:meta/meta.dart'; -import 'package:universal_io/io.dart'; - -export 'package:cookie_jar/cookie_jar.dart'; - -extension DynamiteHttpClientResponseBody on HttpClientResponse { - Future get bodyBytes async { - final buffer = BytesBuilder(); - - await forEach(buffer.add); - - return buffer.toBytes(); - } - - Future get body => transform(utf8.decoder).join(); - - Future get jsonBody => transform(utf8.decoder).transform(json.decoder).first; - - Map get responseHeaders { - final responseHeaders = {}; - headers.forEach((final name, final values) { - responseHeaders[name] = values.last; - }); - - return responseHeaders; - } -} - -/// Response returned by operations of a [DynamiteClient]. -/// -/// See: -/// * [DynamiteApiException] as the exception that can be thrown in operations -/// * [DynamiteAuthentication] for providing authentication methods. -/// * [DynamiteClient] for the client providing operations. -class DynamiteResponse { - /// Creates a new dynamite response. - const DynamiteResponse( - this.statusCode, - this.body, - this.headers, - ); - - /// The status code of the response. - final int statusCode; - - /// The decoded body of the response. - final B body; - - /// The decoded headers of the response. - final H headers; - - @override - String toString() => 'DynamiteResponse(data: $body, headers: $headers, statusCode: $statusCode)'; -} - -/// The exception thrown by operations of a [DynamiteClient]. -/// -/// -/// See: -/// * [DynamiteResponse] as the response returned by an operation. -/// * [DynamiteAuthentication] for providing authentication methods. -/// * [DynamiteClient] for the client providing operations. -@immutable -class DynamiteApiException implements Exception { - /// Creates a new dynamite exception with the given information. - const DynamiteApiException( - this.statusCode, - this.headers, - this.body, - ); - - /// Creates a new Exception from the given [response]. - /// - /// Tries to decode the `response` into a string. - static Future fromResponse(final HttpClientResponse response) async { - String body; - try { - body = await response.body; - } on FormatException { - body = 'binary'; - } - - return DynamiteApiException( - response.statusCode, - response.responseHeaders, - body, - ); - } - - /// The returned status code when the exception was thrown. - final int statusCode; - - /// The returned headers when the exception was thrown. - final Map headers; - - /// The returned body code when the exception was thrown. - final String body; - - @override - String toString() => 'DynamiteApiException(statusCode: $statusCode, headers: $headers, body: $body)'; -} - -/// Base dynamite authentication. -/// -/// See: -/// * [DynamiteResponse] as the response returned by an operation. -/// * [DynamiteApiException] as the exception that can be thrown in operations -/// * [DynamiteClient] for the client providing operations. -@immutable -sealed class DynamiteAuthentication { - /// Creates a new authentication. - const DynamiteAuthentication({ - required this.type, - required this.scheme, - }); - - /// The base type of the authentication. - final String type; - - /// The used authentication scheme. - final String scheme; - - /// The authentication headers added to a request. - Map get headers; -} - -/// Basic http authentication with username and password. -class DynamiteHttpBasicAuthentication extends DynamiteAuthentication { - /// Creates a new http basic authentication. - const DynamiteHttpBasicAuthentication({ - required this.username, - required this.password, - }) : super( - type: 'http', - scheme: 'basic', - ); - - /// The username. - final String username; - - /// The password. - final String password; - - @override - Map get headers => { - 'Authorization': 'Basic ${base64.encode(utf8.encode('$username:$password'))}', - }; -} - -/// Http bearer authentication with a token. -class DynamiteHttpBearerAuthentication extends DynamiteAuthentication { - /// Creates a new http bearer authentication. - const DynamiteHttpBearerAuthentication({ - required this.token, - }) : super( - type: 'http', - scheme: 'bearer', - ); - - /// The authentication token. - final String token; - - @override - Map get headers => { - 'Authorization': 'Bearer $token', - }; -} - -/// A client for making network requests. -/// -/// See: -/// * [DynamiteResponse] as the response returned by an operation. -/// * [DynamiteApiException] as the exception that can be thrown in operations -/// * [DynamiteAuthentication] for providing authentication methods. -class DynamiteClient { - /// Creates a new dynamite network client. - /// - /// If [httpClient] is not provided a default one will be created. - /// The [baseURL] will be normalized, removing any trailing `/`. - DynamiteClient( - final Uri baseURL, { - this.baseHeaders, - final String? userAgent, - final HttpClient? httpClient, - this.cookieJar, - this.authentications = const [], - }) : httpClient = (httpClient ?? HttpClient())..userAgent = userAgent, - baseURL = baseURL.normalizeEmptyPath(); - - /// The base server url used to build the request uri. - /// - /// See `https://swagger.io/docs/specification/api-host-and-base-path` for - /// further information. - final Uri baseURL; - - /// The base headers added to each request. - final Map? baseHeaders; - - /// The base http client. - final HttpClient httpClient; - - /// The optional cookie jar to persist the response cookies. - final CookieJar? cookieJar; - - /// The available authentications for this client. - /// - /// The first one matching the required authentication type will be used. - final List authentications; - - /// Makes a request against a given [path]. - Future doRequest( - final String method, - final Uri path, - final Map headers, - final Uint8List? body, - ) async { - 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); - } - if (body != null) { - request.add(body); - } - if (cookieJar != null) { - request.cookies.addAll(await cookieJar!.loadForRequest(uri)); - } - - final response = await request.close(); - if (cookieJar != null) { - await cookieJar!.saveFromResponse(uri, response.cookies); - } - - return response; - } -} diff --git a/packages/dynamite/dynamite_runtime/lib/src/http_extensions.dart b/packages/dynamite/dynamite_runtime/lib/src/http_extensions.dart new file mode 100644 index 00000000..005a80aa --- /dev/null +++ b/packages/dynamite/dynamite_runtime/lib/src/http_extensions.dart @@ -0,0 +1,43 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:universal_io/io.dart'; + +/// A stream of bytes. +/// +/// Usually a `Stream`. +typedef BytesStream = Stream>; + +final _utf8JsonDecoder = utf8.decoder.fuse(json.decoder); + +/// Extension on byte streams that enable efficient transformations. +extension BytesStreamExtension on BytesStream { + /// Returns the all bytes of the stream. + Future get bytes async { + final buffer = BytesBuilder(); + + await forEach(buffer.add); + + return buffer.toBytes(); + } + + /// Converts the stream into a `String` using the [utf8] encoding. + Future get string => transform(utf8.decoder).join(); + + /// Converts the stream into a JSON using the [utf8] encoding. + Future get json => transform(_utf8JsonDecoder).first; +} + +/// Extension on a http responses. +extension HttpClientResponseExtension on HttpClientResponse { + /// Returns a map of headers. + Map get responseHeaders { + final responseHeaders = {}; + headers.forEach((final name, final values) { + responseHeaders[name] = values.last; + }); + + return responseHeaders; + } +} diff --git a/packages/nextcloud/lib/src/api/comments.openapi.dart b/packages/nextcloud/lib/src/api/comments.openapi.dart index a37ddc5a..5200840f 100644 --- a/packages/nextcloud/lib/src/api/comments.openapi.dart +++ b/packages/nextcloud/lib/src/api/comments.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case @@ -97,14 +98,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(CommentsCapabilities_Files.serializer)) .build(); -Serializers get commentsSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeComments(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeComments(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/core.openapi.dart b/packages/nextcloud/lib/src/api/core.openapi.dart index 4d2c581b..69cdd73f 100644 --- a/packages/nextcloud/lib/src/api/core.openapi.dart +++ b/packages/nextcloud/lib/src/api/core.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:convert'; @@ -74,7 +75,13 @@ class CoreClient extends DynamiteClient { CoreWipeClient get wipe => CoreWipeClient(this); - Future getStatus() async { + Future> getStatus() async { + final rawResponse = getStatusRaw(); + + return rawResponse.future; + } + + DynamiteRawResponse getStatusRaw() { const path = '/status.php'; final queryParameters = {}; final headers = { @@ -82,17 +89,19 @@ class CoreClient extends DynamiteClient { }; Uint8List? body; - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreStatus), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(CoreStatus))! - as CoreStatus; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -102,7 +111,20 @@ class CoreAppPasswordClient { final CoreClient _rootClient; /// Create app password - Future getAppPassword({final bool oCSAPIRequest = true}) async { + Future> getAppPassword({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = getAppPasswordRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create app password + DynamiteRawResponse getAppPasswordRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/core/getapppassword'; final queryParameters = {}; final headers = { @@ -128,25 +150,36 @@ class CoreAppPasswordClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreAppPasswordGetAppPasswordResponseApplicationJson), - )! as CoreAppPasswordGetAppPasswordResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreAppPasswordGetAppPasswordResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Rotate app password - Future rotateAppPassword({ + Future> rotateAppPassword({ final bool oCSAPIRequest = true, }) async { + final rawResponse = rotateAppPasswordRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Rotate app password + DynamiteRawResponse rotateAppPasswordRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/core/apppassword/rotate'; final queryParameters = {}; final headers = { @@ -172,25 +205,36 @@ class CoreAppPasswordClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreAppPasswordRotateAppPasswordResponseApplicationJson), - )! as CoreAppPasswordRotateAppPasswordResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreAppPasswordRotateAppPasswordResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Delete app password - Future deleteAppPassword({ + Future> deleteAppPassword({ final bool oCSAPIRequest = true, }) async { + final rawResponse = deleteAppPasswordRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete app password + DynamiteRawResponse deleteAppPasswordRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/core/apppassword'; final queryParameters = {}; final headers = { @@ -216,19 +260,19 @@ class CoreAppPasswordClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreAppPasswordDeleteAppPasswordResponseApplicationJson), - )! as CoreAppPasswordDeleteAppPasswordResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreAppPasswordDeleteAppPasswordResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -238,7 +282,7 @@ class CoreAutoCompleteClient { final CoreClient _rootClient; /// Autocomplete a query - Future $get({ + Future> $get({ required final String search, final String? itemType, final String? itemId, @@ -247,6 +291,29 @@ class CoreAutoCompleteClient { final int limit = 10, final bool oCSAPIRequest = true, }) async { + final rawResponse = $getRaw( + search: search, + itemType: itemType, + itemId: itemId, + sorter: sorter, + shareTypes: shareTypes, + limit: limit, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Autocomplete a query + DynamiteRawResponse $getRaw({ + required final String search, + final String? itemType, + final String? itemId, + final String? sorter, + final List? shareTypes, + final int limit = 10, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/core/autocomplete/get'; final queryParameters = {}; final headers = { @@ -288,19 +355,19 @@ class CoreAutoCompleteClient { queryParameters['limit'] = limit.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreAutoCompleteGetResponseApplicationJson), - )! as CoreAutoCompleteGetResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreAutoCompleteGetResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -315,6 +382,19 @@ class CoreAvatarClient { required final String userId, required final int size, }) async { + final rawResponse = getAvatarDarkRaw( + userId: userId, + size: size, + ); + + return rawResponse.future; + } + + /// Get the dark avatar + DynamiteRawResponse getAvatarDarkRaw({ + required final String userId, + required final int size, + }) { var path = '/index.php/avatar/{userId}/{size}/dark'; final queryParameters = {}; final headers = { @@ -339,22 +419,19 @@ class CoreAvatarClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); path = path.replaceAll('{size}', Uri.encodeQueryComponent(size.toString())); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return DynamiteResponse( - await response.bodyBytes, - _jsonSerializers.deserialize( - response.responseHeaders, - specifiedType: const FullType(CoreAvatarAvatarGetAvatarDarkHeaders), - )! as CoreAvatarAvatarGetAvatarDarkHeaders, - ); - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: const FullType(CoreAvatarAvatarGetAvatarDarkHeaders), + serializers: _jsonSerializers, + ); } /// Get the avatar @@ -362,6 +439,19 @@ class CoreAvatarClient { required final String userId, required final int size, }) async { + final rawResponse = getAvatarRaw( + userId: userId, + size: size, + ); + + return rawResponse.future; + } + + /// Get the avatar + DynamiteRawResponse getAvatarRaw({ + required final String userId, + required final int size, + }) { var path = '/index.php/avatar/{userId}/{size}'; final queryParameters = {}; final headers = { @@ -386,22 +476,19 @@ class CoreAvatarClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); path = path.replaceAll('{size}', Uri.encodeQueryComponent(size.toString())); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return DynamiteResponse( - await response.bodyBytes, - _jsonSerializers.deserialize( - response.responseHeaders, - specifiedType: const FullType(CoreAvatarAvatarGetAvatarHeaders), - )! as CoreAvatarAvatarGetAvatarHeaders, - ); - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: const FullType(CoreAvatarAvatarGetAvatarHeaders), + serializers: _jsonSerializers, + ); } } @@ -411,7 +498,16 @@ class CoreClientFlowLoginV2Client { final CoreClient _rootClient; /// Poll the login flow credentials - Future poll({required final String token}) async { + Future> poll({required final String token}) async { + final rawResponse = pollRaw( + token: token, + ); + + return rawResponse.future; + } + + /// Poll the login flow credentials + DynamiteRawResponse pollRaw({required final String token}) { const path = '/index.php/login/v2/poll'; final queryParameters = {}; final headers = { @@ -435,23 +531,30 @@ class CoreClientFlowLoginV2Client { // coverage:ignore-end queryParameters['token'] = token; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreLoginFlowV2Credentials), - )! as CoreLoginFlowV2Credentials; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreLoginFlowV2Credentials), + headersType: null, + serializers: _jsonSerializers, + ); + } + + /// Init a login flow + Future> init() async { + final rawResponse = initRaw(); + + return rawResponse.future; } /// Init a login flow - Future init() async { + DynamiteRawResponse initRaw() { const path = '/index.php/login/v2'; final queryParameters = {}; final headers = { @@ -474,17 +577,19 @@ class CoreClientFlowLoginV2Client { } // coverage:ignore-end - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(CoreLoginFlowV2))! - as CoreLoginFlowV2; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreLoginFlowV2), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -494,10 +599,23 @@ class CoreCollaborationResourcesClient { final CoreClient _rootClient; /// Search for collections - Future searchCollections({ + Future> searchCollections({ required final String filter, final bool oCSAPIRequest = true, }) async { + final rawResponse = searchCollectionsRaw( + filter: filter, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Search for collections + DynamiteRawResponse searchCollectionsRaw({ + required final String filter, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/collaboration/resources/collections/search/{filter}'; final queryParameters = {}; final headers = { @@ -524,26 +642,39 @@ class CoreCollaborationResourcesClient { // coverage:ignore-end path = path.replaceAll('{filter}', Uri.encodeQueryComponent(filter)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreCollaborationResourcesSearchCollectionsResponseApplicationJson), - )! as CoreCollaborationResourcesSearchCollectionsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreCollaborationResourcesSearchCollectionsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a collection - Future listCollection({ + Future> listCollection({ required final int collectionId, final bool oCSAPIRequest = true, }) async { + final rawResponse = listCollectionRaw( + collectionId: collectionId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a collection + DynamiteRawResponse listCollectionRaw({ + required final int collectionId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/collaboration/resources/collections/{collectionId}'; final queryParameters = {}; final headers = { @@ -570,27 +701,42 @@ class CoreCollaborationResourcesClient { // coverage:ignore-end path = path.replaceAll('{collectionId}', Uri.encodeQueryComponent(collectionId.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreCollaborationResourcesListCollectionResponseApplicationJson), - )! as CoreCollaborationResourcesListCollectionResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreCollaborationResourcesListCollectionResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Rename a collection - Future renameCollection({ + Future> renameCollection({ required final String collectionName, required final int collectionId, final bool oCSAPIRequest = true, }) async { + final rawResponse = renameCollectionRaw( + collectionName: collectionName, + collectionId: collectionId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Rename a collection + DynamiteRawResponse renameCollectionRaw({ + required final String collectionName, + required final int collectionId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/collaboration/resources/collections/{collectionId}'; final queryParameters = {}; final headers = { @@ -618,28 +764,45 @@ class CoreCollaborationResourcesClient { queryParameters['collectionName'] = collectionName; path = path.replaceAll('{collectionId}', Uri.encodeQueryComponent(collectionId.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreCollaborationResourcesRenameCollectionResponseApplicationJson), - )! as CoreCollaborationResourcesRenameCollectionResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreCollaborationResourcesRenameCollectionResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Add a resource to a collection - Future addResource({ + Future> addResource({ required final String resourceType, required final String resourceId, required final int collectionId, final bool oCSAPIRequest = true, }) async { + final rawResponse = addResourceRaw( + resourceType: resourceType, + resourceId: resourceId, + collectionId: collectionId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Add a resource to a collection + DynamiteRawResponse addResourceRaw({ + required final String resourceType, + required final String resourceId, + required final int collectionId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/collaboration/resources/collections/{collectionId}'; final queryParameters = {}; final headers = { @@ -668,28 +831,45 @@ class CoreCollaborationResourcesClient { queryParameters['resourceId'] = resourceId; path = path.replaceAll('{collectionId}', Uri.encodeQueryComponent(collectionId.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreCollaborationResourcesAddResourceResponseApplicationJson), - )! as CoreCollaborationResourcesAddResourceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreCollaborationResourcesAddResourceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Remove a resource from a collection - Future removeResource({ + Future> removeResource({ required final String resourceType, required final String resourceId, required final int collectionId, final bool oCSAPIRequest = true, }) async { + final rawResponse = removeResourceRaw( + resourceType: resourceType, + resourceId: resourceId, + collectionId: collectionId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Remove a resource from a collection + DynamiteRawResponse removeResourceRaw({ + required final String resourceType, + required final String resourceId, + required final int collectionId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/collaboration/resources/collections/{collectionId}'; final queryParameters = {}; final headers = { @@ -718,27 +898,44 @@ class CoreCollaborationResourcesClient { queryParameters['resourceId'] = resourceId; path = path.replaceAll('{collectionId}', Uri.encodeQueryComponent(collectionId.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreCollaborationResourcesRemoveResourceResponseApplicationJson), - )! as CoreCollaborationResourcesRemoveResourceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreCollaborationResourcesRemoveResourceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get collections by resource - Future getCollectionsByResource({ + Future> + getCollectionsByResource({ required final String resourceType, required final String resourceId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getCollectionsByResourceRaw( + resourceType: resourceType, + resourceId: resourceId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get collections by resource + DynamiteRawResponse + getCollectionsByResourceRaw({ + required final String resourceType, + required final String resourceId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/collaboration/resources/{resourceType}/{resourceId}'; final queryParameters = {}; final headers = { @@ -766,28 +963,47 @@ class CoreCollaborationResourcesClient { path = path.replaceAll('{resourceType}', Uri.encodeQueryComponent(resourceType)); path = path.replaceAll('{resourceId}', Uri.encodeQueryComponent(resourceId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreCollaborationResourcesGetCollectionsByResourceResponseApplicationJson), - )! as CoreCollaborationResourcesGetCollectionsByResourceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreCollaborationResourcesGetCollectionsByResourceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Create a collection for a resource - Future createCollectionOnResource({ + Future> + createCollectionOnResource({ required final String name, required final String baseResourceType, required final String baseResourceId, final bool oCSAPIRequest = true, }) async { + final rawResponse = createCollectionOnResourceRaw( + name: name, + baseResourceType: baseResourceType, + baseResourceId: baseResourceId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create a collection for a resource + DynamiteRawResponse + createCollectionOnResourceRaw({ + required final String name, + required final String baseResourceType, + required final String baseResourceId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/collaboration/resources/{baseResourceType}/{baseResourceId}'; final queryParameters = {}; final headers = { @@ -816,19 +1032,19 @@ class CoreCollaborationResourcesClient { path = path.replaceAll('{baseResourceType}', Uri.encodeQueryComponent(baseResourceType)); path = path.replaceAll('{baseResourceId}', Uri.encodeQueryComponent(baseResourceId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreCollaborationResourcesCreateCollectionOnResourceResponseApplicationJson), - )! as CoreCollaborationResourcesCreateCollectionOnResourceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreCollaborationResourcesCreateCollectionOnResourceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -839,10 +1055,23 @@ class CoreGuestAvatarClient { final CoreClient _rootClient; /// Returns a dark guest avatar image response - Future getAvatarDark({ + Future> getAvatarDark({ required final String guestName, required final String size, }) async { + final rawResponse = getAvatarDarkRaw( + guestName: guestName, + size: size, + ); + + return rawResponse.future; + } + + /// Returns a dark guest avatar image response + DynamiteRawResponse getAvatarDarkRaw({ + required final String guestName, + required final String size, + }) { var path = '/index.php/avatar/guest/{guestName}/{size}/dark'; final queryParameters = {}; final headers = { @@ -867,24 +1096,42 @@ class CoreGuestAvatarClient { // coverage:ignore-end path = path.replaceAll('{guestName}', Uri.encodeQueryComponent(guestName)); path = path.replaceAll('{size}', Uri.encodeQueryComponent(size)); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200 || response.statusCode == 201) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200, 201}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } /// Returns a guest avatar image response - Future getAvatar({ + Future> getAvatar({ required final String guestName, required final String size, final int? darkTheme = 0, }) async { + final rawResponse = getAvatarRaw( + guestName: guestName, + size: size, + darkTheme: darkTheme, + ); + + return rawResponse.future; + } + + /// Returns a guest avatar image response + DynamiteRawResponse getAvatarRaw({ + required final String guestName, + required final String size, + final int? darkTheme = 0, + }) { var path = '/index.php/avatar/guest/{guestName}/{size}'; final queryParameters = {}; final headers = { @@ -914,16 +1161,19 @@ class CoreGuestAvatarClient { queryParameters['darkTheme'] = darkTheme.toString(); } } - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200 || response.statusCode == 201) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200, 201}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -933,10 +1183,23 @@ class CoreHoverCardClient { final CoreClient _rootClient; /// Get the user details for a hovercard - Future getUser({ + Future> getUser({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getUserRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the user details for a hovercard + DynamiteRawResponse getUserRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/hovercard/v1/{userId}'; final queryParameters = {}; final headers = { @@ -963,19 +1226,19 @@ class CoreHoverCardClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreHoverCardGetUserResponseApplicationJson), - )! as CoreHoverCardGetUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreHoverCardGetUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -985,10 +1248,23 @@ class CoreNavigationClient { final CoreClient _rootClient; /// Get the apps navigation - Future getAppsNavigation({ + Future> getAppsNavigation({ final int absolute = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getAppsNavigationRaw( + absolute: absolute, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the apps navigation + DynamiteRawResponse getAppsNavigationRaw({ + final int absolute = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/core/navigation/apps'; final queryParameters = {}; final headers = { @@ -1017,26 +1293,39 @@ class CoreNavigationClient { queryParameters['absolute'] = absolute.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreNavigationGetAppsNavigationResponseApplicationJson), - )! as CoreNavigationGetAppsNavigationResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreNavigationGetAppsNavigationResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the settings navigation - Future getSettingsNavigation({ + Future> getSettingsNavigation({ final int absolute = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getSettingsNavigationRaw( + absolute: absolute, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the settings navigation + DynamiteRawResponse getSettingsNavigationRaw({ + final int absolute = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/core/navigation/settings'; final queryParameters = {}; final headers = { @@ -1065,19 +1354,19 @@ class CoreNavigationClient { queryParameters['absolute'] = absolute.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreNavigationGetSettingsNavigationResponseApplicationJson), - )! as CoreNavigationGetSettingsNavigationResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreNavigationGetSettingsNavigationResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1089,6 +1378,13 @@ class CoreOcmClient { /// generate a OCMProvider with local data and send it as DataResponse. This replaces the old PHP file ocm-provider/index.php Future> discovery() async { + final rawResponse = discoveryRaw(); + + return rawResponse.future; + } + + /// generate a OCMProvider with local data and send it as DataResponse. This replaces the old PHP file ocm-provider/index.php + DynamiteRawResponse discoveryRaw() { const path = '/index.php/ocm-provider'; final queryParameters = {}; final headers = { @@ -1111,25 +1407,19 @@ class CoreOcmClient { } // coverage:ignore-end - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return DynamiteResponse( - _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreOcmDiscoveryResponseApplicationJson), - )! as CoreOcmDiscoveryResponseApplicationJson, - _jsonSerializers.deserialize( - response.responseHeaders, - specifiedType: const FullType(CoreOcmOcmDiscoveryHeaders), - )! as CoreOcmOcmDiscoveryHeaders, - ); - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreOcmDiscoveryResponseApplicationJson), + headersType: const FullType(CoreOcmOcmDiscoveryHeaders), + serializers: _jsonSerializers, + ); } } @@ -1139,7 +1429,20 @@ class CoreOcsClient { final CoreClient _rootClient; /// Get the capabilities - Future getCapabilities({final bool oCSAPIRequest = true}) async { + Future> getCapabilities({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = getCapabilitiesRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the capabilities + DynamiteRawResponse getCapabilitiesRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/capabilities'; final queryParameters = {}; final headers = { @@ -1163,19 +1466,19 @@ class CoreOcsClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreOcsGetCapabilitiesResponseApplicationJson), - )! as CoreOcsGetCapabilitiesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreOcsGetCapabilitiesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1185,7 +1488,7 @@ class CorePreviewClient { final CoreClient _rootClient; /// Get a preview by file ID - Future getPreviewByFileId({ + Future> getPreviewByFileId({ final int fileId = -1, final int x = 32, final int y = 32, @@ -1194,6 +1497,29 @@ class CorePreviewClient { final String mode = 'fill', final int mimeFallback = 0, }) async { + final rawResponse = getPreviewByFileIdRaw( + fileId: fileId, + x: x, + y: y, + a: a, + forceIcon: forceIcon, + mode: mode, + mimeFallback: mimeFallback, + ); + + return rawResponse.future; + } + + /// Get a preview by file ID + DynamiteRawResponse getPreviewByFileIdRaw({ + final int fileId = -1, + final int x = 32, + final int y = 32, + final int a = 0, + final int forceIcon = 1, + final String mode = 'fill', + final int mimeFallback = 0, + }) { const path = '/index.php/core/preview'; final queryParameters = {}; final headers = { @@ -1239,20 +1565,23 @@ class CorePreviewClient { if (mimeFallback != 0) { queryParameters['mimeFallback'] = mimeFallback.toString(); } - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a preview by file path - Future getPreview({ + Future> getPreview({ final String file = '', final int x = 32, final int y = 32, @@ -1261,6 +1590,29 @@ class CorePreviewClient { final String mode = 'fill', final int mimeFallback = 0, }) async { + final rawResponse = getPreviewRaw( + file: file, + x: x, + y: y, + a: a, + forceIcon: forceIcon, + mode: mode, + mimeFallback: mimeFallback, + ); + + return rawResponse.future; + } + + /// Get a preview by file path + DynamiteRawResponse getPreviewRaw({ + final String file = '', + final int x = 32, + final int y = 32, + final int a = 0, + final int forceIcon = 1, + final String mode = 'fill', + final int mimeFallback = 0, + }) { const path = '/index.php/core/preview.png'; final queryParameters = {}; final headers = { @@ -1306,16 +1658,19 @@ class CorePreviewClient { if (mimeFallback != 0) { queryParameters['mimeFallback'] = mimeFallback.toString(); } - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1325,12 +1680,29 @@ class CoreProfileApiClient { final CoreClient _rootClient; /// Update the visibility of a parameter - Future setVisibility({ + Future> setVisibility({ required final String paramId, required final String visibility, required final String targetUserId, final bool oCSAPIRequest = true, }) async { + final rawResponse = setVisibilityRaw( + paramId: paramId, + visibility: visibility, + targetUserId: targetUserId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update the visibility of a parameter + DynamiteRawResponse setVisibilityRaw({ + required final String paramId, + required final String visibility, + required final String targetUserId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/profile/{targetUserId}'; final queryParameters = {}; final headers = { @@ -1359,19 +1731,19 @@ class CoreProfileApiClient { queryParameters['visibility'] = visibility; path = path.replaceAll('{targetUserId}', Uri.encodeQueryComponent(targetUserId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreProfileApiSetVisibilityResponseApplicationJson), - )! as CoreProfileApiSetVisibilityResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreProfileApiSetVisibilityResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1381,7 +1753,16 @@ class CoreReferenceClient { final CoreClient _rootClient; /// Get a preview for a reference - Future preview({required final String referenceId}) async { + Future> preview({required final String referenceId}) async { + final rawResponse = previewRaw( + referenceId: referenceId, + ); + + return rawResponse.future; + } + + /// Get a preview for a reference + DynamiteRawResponse previewRaw({required final String referenceId}) { var path = '/index.php/core/references/preview/{referenceId}'; final queryParameters = {}; final headers = { @@ -1405,16 +1786,19 @@ class CoreReferenceClient { // coverage:ignore-end path = path.replaceAll('{referenceId}', Uri.encodeQueryComponent(referenceId)); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1424,10 +1808,23 @@ class CoreReferenceApiClient { final CoreClient _rootClient; /// Resolve a reference - Future resolveOne({ + Future> resolveOne({ required final String reference, final bool oCSAPIRequest = true, }) async { + final rawResponse = resolveOneRaw( + reference: reference, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Resolve a reference + DynamiteRawResponse resolveOneRaw({ + required final String reference, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/references/resolve'; final queryParameters = {}; final headers = { @@ -1454,27 +1851,42 @@ class CoreReferenceApiClient { // coverage:ignore-end queryParameters['reference'] = reference; headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreReferenceApiResolveOneResponseApplicationJson), - )! as CoreReferenceApiResolveOneResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreReferenceApiResolveOneResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Resolve multiple references - Future resolve({ + Future> resolve({ required final List references, final int limit = 1, final bool oCSAPIRequest = true, }) async { + final rawResponse = resolveRaw( + references: references, + limit: limit, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Resolve multiple references + DynamiteRawResponse resolveRaw({ + required final List references, + final int limit = 1, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/references/resolve'; final queryParameters = {}; final headers = { @@ -1504,28 +1916,45 @@ class CoreReferenceApiClient { queryParameters['limit'] = limit.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreReferenceApiResolveResponseApplicationJson), - )! as CoreReferenceApiResolveResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreReferenceApiResolveResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Extract references from a text - Future extract({ + Future> extract({ required final String text, final int resolve = 0, final int limit = 1, final bool oCSAPIRequest = true, }) async { + final rawResponse = extractRaw( + text: text, + resolve: resolve, + limit: limit, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Extract references from a text + DynamiteRawResponse extractRaw({ + required final String text, + final int resolve = 0, + final int limit = 1, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/references/extract'; final queryParameters = {}; final headers = { @@ -1558,25 +1987,36 @@ class CoreReferenceApiClient { queryParameters['limit'] = limit.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreReferenceApiExtractResponseApplicationJson), - )! as CoreReferenceApiExtractResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreReferenceApiExtractResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the providers - Future getProvidersInfo({ + Future> getProvidersInfo({ final bool oCSAPIRequest = true, }) async { + final rawResponse = getProvidersInfoRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the providers + DynamiteRawResponse getProvidersInfoRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/references/providers'; final queryParameters = {}; final headers = { @@ -1602,27 +2042,42 @@ class CoreReferenceApiClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreReferenceApiGetProvidersInfoResponseApplicationJson), - )! as CoreReferenceApiGetProvidersInfoResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreReferenceApiGetProvidersInfoResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Touch a provider - Future touchProvider({ + Future> touchProvider({ required final String providerId, final int? timestamp, final bool oCSAPIRequest = true, }) async { + final rawResponse = touchProviderRaw( + providerId: providerId, + timestamp: timestamp, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Touch a provider + DynamiteRawResponse touchProviderRaw({ + required final String providerId, + final int? timestamp, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/references/provider/{providerId}'; final queryParameters = {}; final headers = { @@ -1652,19 +2107,19 @@ class CoreReferenceApiClient { queryParameters['timestamp'] = timestamp.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreReferenceApiTouchProviderResponseApplicationJson), - )! as CoreReferenceApiTouchProviderResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreReferenceApiTouchProviderResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1674,7 +2129,20 @@ class CoreTextProcessingApiClient { final CoreClient _rootClient; /// This endpoint returns all available LanguageModel task types - Future taskTypes({final bool oCSAPIRequest = true}) async { + Future> taskTypes({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = taskTypesRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// This endpoint returns all available LanguageModel task types + DynamiteRawResponse taskTypesRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/textprocessing/tasktypes'; final queryParameters = {}; final headers = { @@ -1698,29 +2166,48 @@ class CoreTextProcessingApiClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreTextProcessingApiTaskTypesResponseApplicationJson), - )! as CoreTextProcessingApiTaskTypesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreTextProcessingApiTaskTypesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// This endpoint allows scheduling a language model task - Future schedule({ + Future> schedule({ required final String input, required final String type, required final String appId, final String identifier = '', final bool oCSAPIRequest = true, }) async { + final rawResponse = scheduleRaw( + input: input, + type: type, + appId: appId, + identifier: identifier, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// This endpoint allows scheduling a language model task + DynamiteRawResponse scheduleRaw({ + required final String input, + required final String type, + required final String appId, + final String identifier = '', + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/textprocessing/schedule'; final queryParameters = {}; final headers = { @@ -1750,26 +2237,39 @@ class CoreTextProcessingApiClient { queryParameters['identifier'] = identifier; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreTextProcessingApiScheduleResponseApplicationJson), - )! as CoreTextProcessingApiScheduleResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreTextProcessingApiScheduleResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// This endpoint allows checking the status and results of a task. Tasks are removed 1 week after receiving their last update. - Future getTask({ + Future> getTask({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = getTaskRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// This endpoint allows checking the status and results of a task. Tasks are removed 1 week after receiving their last update. + DynamiteRawResponse getTaskRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/textprocessing/task/{id}'; final queryParameters = {}; final headers = { @@ -1794,26 +2294,39 @@ class CoreTextProcessingApiClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreTextProcessingApiGetTaskResponseApplicationJson), - )! as CoreTextProcessingApiGetTaskResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreTextProcessingApiGetTaskResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// This endpoint allows to delete a scheduled task for a user - Future deleteTask({ + Future> deleteTask({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = deleteTaskRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// This endpoint allows to delete a scheduled task for a user + DynamiteRawResponse deleteTaskRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/textprocessing/task/{id}'; final queryParameters = {}; final headers = { @@ -1840,27 +2353,42 @@ class CoreTextProcessingApiClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreTextProcessingApiDeleteTaskResponseApplicationJson), - )! as CoreTextProcessingApiDeleteTaskResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreTextProcessingApiDeleteTaskResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// This endpoint returns a list of tasks of a user that are related with a specific appId and optionally with an identifier - Future listTasksByApp({ + Future> listTasksByApp({ required final String appId, final String? identifier, final bool oCSAPIRequest = true, }) async { + final rawResponse = listTasksByAppRaw( + appId: appId, + identifier: identifier, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// This endpoint returns a list of tasks of a user that are related with a specific appId and optionally with an identifier + DynamiteRawResponse listTasksByAppRaw({ + required final String appId, + final String? identifier, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/textprocessing/tasks/app/{appId}'; final queryParameters = {}; final headers = { @@ -1890,19 +2418,19 @@ class CoreTextProcessingApiClient { queryParameters['identifier'] = identifier; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreTextProcessingApiListTasksByAppResponseApplicationJson), - )! as CoreTextProcessingApiListTasksByAppResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreTextProcessingApiListTasksByAppResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1912,7 +2440,20 @@ class CoreTranslationApiClient { final CoreClient _rootClient; /// Get the list of supported languages - Future languages({final bool oCSAPIRequest = true}) async { + Future> languages({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = languagesRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the list of supported languages + DynamiteRawResponse languagesRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/translation/languages'; final queryParameters = {}; final headers = { @@ -1936,28 +2477,45 @@ class CoreTranslationApiClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreTranslationApiLanguagesResponseApplicationJson), - )! as CoreTranslationApiLanguagesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreTranslationApiLanguagesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Translate a text - Future translate({ + Future> translate({ required final String text, required final String toLanguage, final String? fromLanguage, final bool oCSAPIRequest = true, }) async { + final rawResponse = translateRaw( + text: text, + toLanguage: toLanguage, + fromLanguage: fromLanguage, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Translate a text + DynamiteRawResponse translateRaw({ + required final String text, + required final String toLanguage, + final String? fromLanguage, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/translation/translate'; final queryParameters = {}; final headers = { @@ -1986,19 +2544,19 @@ class CoreTranslationApiClient { queryParameters['fromLanguage'] = fromLanguage; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreTranslationApiTranslateResponseApplicationJson), - )! as CoreTranslationApiTranslateResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreTranslationApiTranslateResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -2008,10 +2566,23 @@ class CoreUnifiedSearchClient { final CoreClient _rootClient; /// Get the providers for unified search - Future getProviders({ + Future> getProviders({ final String from = '', final bool oCSAPIRequest = true, }) async { + final rawResponse = getProvidersRaw( + from: from, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the providers for unified search + DynamiteRawResponse getProvidersRaw({ + final String from = '', + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/search/providers'; final queryParameters = {}; final headers = { @@ -2040,23 +2611,23 @@ class CoreUnifiedSearchClient { queryParameters['from'] = from; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreUnifiedSearchGetProvidersResponseApplicationJson), - )! as CoreUnifiedSearchGetProvidersResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreUnifiedSearchGetProvidersResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Search - Future search({ + Future> search({ required final String providerId, final String term = '', final int? sortOrder, @@ -2065,6 +2636,29 @@ class CoreUnifiedSearchClient { final String from = '', final bool oCSAPIRequest = true, }) async { + final rawResponse = searchRaw( + providerId: providerId, + term: term, + sortOrder: sortOrder, + limit: limit, + cursor: cursor, + from: from, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Search + DynamiteRawResponse searchRaw({ + required final String providerId, + final String term = '', + final int? sortOrder, + final int? limit, + final ContentString? cursor, + final String from = '', + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/search/providers/{providerId}/search'; final queryParameters = {}; final headers = { @@ -2109,19 +2703,19 @@ class CoreUnifiedSearchClient { queryParameters['from'] = from; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreUnifiedSearchSearchResponseApplicationJson), - )! as CoreUnifiedSearchSearchResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreUnifiedSearchSearchResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -2131,7 +2725,16 @@ class CoreWhatsNewClient { final CoreClient _rootClient; /// Get the changes - Future $get({final bool oCSAPIRequest = true}) async { + Future> $get({final bool oCSAPIRequest = true}) async { + final rawResponse = $getRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the changes + DynamiteRawResponse $getRaw({final bool oCSAPIRequest = true}) { const path = '/ocs/v2.php/core/whatsnew'; final queryParameters = {}; final headers = { @@ -2157,26 +2760,39 @@ class CoreWhatsNewClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreWhatsNewGetResponseApplicationJson), - )! as CoreWhatsNewGetResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreWhatsNewGetResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Dismiss the changes - Future dismiss({ + Future> dismiss({ required final String version, final bool oCSAPIRequest = true, }) async { + final rawResponse = dismissRaw( + version: version, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Dismiss the changes + DynamiteRawResponse dismissRaw({ + required final String version, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/core/whatsnew'; final queryParameters = {}; final headers = { @@ -2203,19 +2819,19 @@ class CoreWhatsNewClient { // coverage:ignore-end queryParameters['version'] = version; headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreWhatsNewDismissResponseApplicationJson), - )! as CoreWhatsNewDismissResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreWhatsNewDismissResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -2225,7 +2841,18 @@ class CoreWipeClient { final CoreClient _rootClient; /// Check if the device should be wiped - Future checkWipe({required final String token}) async { + Future> checkWipe({ + required final String token, + }) async { + final rawResponse = checkWipeRaw( + token: token, + ); + + return rawResponse.future; + } + + /// Check if the device should be wiped + DynamiteRawResponse checkWipeRaw({required final String token}) { const path = '/index.php/core/wipe/check'; final queryParameters = {}; final headers = { @@ -2249,23 +2876,32 @@ class CoreWipeClient { // coverage:ignore-end queryParameters['token'] = token; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(CoreWipeCheckWipeResponseApplicationJson), - )! as CoreWipeCheckWipeResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(CoreWipeCheckWipeResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); + } + + /// Finish the wipe + Future> wipeDone({required final String token}) async { + final rawResponse = wipeDoneRaw( + token: token, + ); + + return rawResponse.future; } /// Finish the wipe - Future wipeDone({required final String token}) async { + DynamiteRawResponse wipeDoneRaw({required final String token}) { const path = '/index.php/core/wipe/success'; final queryParameters = {}; final headers = { @@ -2289,19 +2925,19 @@ class CoreWipeClient { // coverage:ignore-end queryParameters['token'] = token; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200 || response.statusCode == 404) { - return _jsonSerializers.deserialize( - json.decode(await response.body), - specifiedType: const FullType(JsonObject), - )! as JsonObject; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200, 404}, + ), + bodyType: const FullType(JsonObject), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -8836,14 +9472,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(CoreWipeCheckWipeResponseApplicationJson.serializer)) .build(); -Serializers get coreSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeCore(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeCore(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/dashboard.openapi.dart b/packages/nextcloud/lib/src/api/dashboard.openapi.dart index 3709a050..a551ffe8 100644 --- a/packages/nextcloud/lib/src/api/dashboard.openapi.dart +++ b/packages/nextcloud/lib/src/api/dashboard.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -43,7 +44,20 @@ class DashboardDashboardApiClient { final DashboardClient _rootClient; /// Get the widgets - Future getWidgets({final bool oCSAPIRequest = true}) async { + Future> getWidgets({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = getWidgetsRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the widgets + DynamiteRawResponse getWidgetsRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/dashboard/api/v1/widgets'; final queryParameters = {}; final headers = { @@ -69,28 +83,45 @@ class DashboardDashboardApiClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(DashboardDashboardApiGetWidgetsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(DashboardDashboardApiGetWidgetsResponseApplicationJson), - )! as DashboardDashboardApiGetWidgetsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get the items for the widgets - Future getWidgetItems({ + Future> getWidgetItems({ final ContentString>? sinceIds, final int limit = 7, final List widgets = const [], final bool oCSAPIRequest = true, }) async { + final rawResponse = getWidgetItemsRaw( + sinceIds: sinceIds, + limit: limit, + widgets: widgets, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the items for the widgets + DynamiteRawResponse getWidgetItemsRaw({ + final ContentString>? sinceIds, + final int limit = 7, + final List widgets = const [], + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/dashboard/api/v1/widget-items'; final queryParameters = {}; final headers = { @@ -130,28 +161,45 @@ class DashboardDashboardApiClient { queryParameters['widgets[]'] = widgets.map((final e) => e); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(DashboardDashboardApiGetWidgetItemsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(DashboardDashboardApiGetWidgetItemsResponseApplicationJson), - )! as DashboardDashboardApiGetWidgetItemsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get the items for the widgets - Future getWidgetItemsV2({ + Future> getWidgetItemsV2({ final ContentString>? sinceIds, final int limit = 7, final List widgets = const [], final bool oCSAPIRequest = true, }) async { + final rawResponse = getWidgetItemsV2Raw( + sinceIds: sinceIds, + limit: limit, + widgets: widgets, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the items for the widgets + DynamiteRawResponse getWidgetItemsV2Raw({ + final ContentString>? sinceIds, + final int limit = 7, + final List widgets = const [], + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/dashboard/api/v2/widget-items'; final queryParameters = {}; final headers = { @@ -191,19 +239,19 @@ class DashboardDashboardApiClient { queryParameters['widgets[]'] = widgets.map((final e) => e); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(DashboardDashboardApiGetWidgetItemsV2ResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(DashboardDashboardApiGetWidgetItemsV2ResponseApplicationJson), - )! as DashboardDashboardApiGetWidgetItemsV2ResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -661,14 +709,8 @@ final Serializers _serializers = (Serializers().toBuilder() )) .build(); -Serializers get dashboardSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeDashboard(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeDashboard(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/dav.openapi.dart b/packages/nextcloud/lib/src/api/dav.openapi.dart index f9838619..5b3505fb 100644 --- a/packages/nextcloud/lib/src/api/dav.openapi.dart +++ b/packages/nextcloud/lib/src/api/dav.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -42,11 +43,26 @@ class DavDirectClient { final DavClient _rootClient; /// Get a direct link to a file - Future getUrl({ + Future> getUrl({ required final int fileId, final int? expirationTime, final bool oCSAPIRequest = true, }) async { + final rawResponse = getUrlRaw( + fileId: fileId, + expirationTime: expirationTime, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a direct link to a file + DynamiteRawResponse getUrlRaw({ + required final int fileId, + final int? expirationTime, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/dav/api/v1/direct'; final queryParameters = {}; final headers = { @@ -76,19 +92,19 @@ class DavDirectClient { queryParameters['expirationTime'] = expirationTime.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(DavDirectGetUrlResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(DavDirectGetUrlResponseApplicationJson), - )! as DavDirectGetUrlResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -303,14 +319,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(DavCapabilities_Dav.serializer)) .build(); -Serializers get davSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeDav(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeDav(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/files.openapi.dart b/packages/nextcloud/lib/src/api/files.openapi.dart index 6d506b3e..615b9c6e 100644 --- a/packages/nextcloud/lib/src/api/files.openapi.dart +++ b/packages/nextcloud/lib/src/api/files.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -53,11 +54,26 @@ class FilesApiClient { final FilesClient _rootClient; /// Gets a thumbnail of the specified file - Future getThumbnail({ + Future> getThumbnail({ required final int x, required final int y, required final String file, }) async { + final rawResponse = getThumbnailRaw( + x: x, + y: y, + file: file, + ); + + return rawResponse.future; + } + + /// Gets a thumbnail of the specified file + DynamiteRawResponse getThumbnailRaw({ + required final int x, + required final int y, + required final String file, + }) { var path = '/index.php/apps/files/api/v1/thumbnail/{x}/{y}/{file}'; final queryParameters = {}; final headers = { @@ -86,16 +102,19 @@ class FilesApiClient { path = path.replaceAll('{y}', Uri.encodeQueryComponent(y.toString())); checkPattern(file, RegExp(r'^.+$'), 'file'); // coverage:ignore-line path = path.replaceAll('{file}', Uri.encodeQueryComponent(file)); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -105,7 +124,18 @@ class FilesDirectEditingClient { final FilesClient _rootClient; /// Get the direct editing capabilities - Future info({final bool oCSAPIRequest = true}) async { + Future> info({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = infoRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the direct editing capabilities + DynamiteRawResponse infoRaw({final bool oCSAPIRequest = true}) { const path = '/ocs/v2.php/apps/files/api/v1/directEditing'; final queryParameters = {}; final headers = { @@ -131,27 +161,42 @@ class FilesDirectEditingClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesDirectEditingInfoResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesDirectEditingInfoResponseApplicationJson), - )! as FilesDirectEditingInfoResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get the templates for direct editing - Future templates({ + Future> templates({ required final String editorId, required final String creatorId, final bool oCSAPIRequest = true, }) async { + final rawResponse = templatesRaw( + editorId: editorId, + creatorId: creatorId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the templates for direct editing + DynamiteRawResponse templatesRaw({ + required final String editorId, + required final String creatorId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files/api/v1/directEditing/templates/{editorId}/{creatorId}'; final queryParameters = {}; final headers = { @@ -179,28 +224,45 @@ class FilesDirectEditingClient { path = path.replaceAll('{editorId}', Uri.encodeQueryComponent(editorId)); path = path.replaceAll('{creatorId}', Uri.encodeQueryComponent(creatorId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesDirectEditingTemplatesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesDirectEditingTemplatesResponseApplicationJson), - )! as FilesDirectEditingTemplatesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Open a file for direct editing - Future open({ + Future> open({ required final String path, final String? editorId, final int? fileId, final bool oCSAPIRequest = true, }) async { + final rawResponse = openRaw( + path: path, + editorId: editorId, + fileId: fileId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Open a file for direct editing + DynamiteRawResponse openRaw({ + required final String path, + final String? editorId, + final int? fileId, + final bool oCSAPIRequest = true, + }) { const path0 = '/ocs/v2.php/apps/files/api/v1/directEditing/open'; final queryParameters = {}; final headers = { @@ -233,29 +295,48 @@ class FilesDirectEditingClient { queryParameters['fileId'] = fileId.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesDirectEditingOpenResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesDirectEditingOpenResponseApplicationJson), - )! as FilesDirectEditingOpenResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Create a file for direct editing - Future create({ + Future> create({ required final String path, required final String editorId, required final String creatorId, final String? templateId, final bool oCSAPIRequest = true, }) async { + final rawResponse = createRaw( + path: path, + editorId: editorId, + creatorId: creatorId, + templateId: templateId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create a file for direct editing + DynamiteRawResponse createRaw({ + required final String path, + required final String editorId, + required final String creatorId, + final String? templateId, + final bool oCSAPIRequest = true, + }) { const path0 = '/ocs/v2.php/apps/files/api/v1/directEditing/create'; final queryParameters = {}; final headers = { @@ -287,19 +368,19 @@ class FilesDirectEditingClient { queryParameters['templateId'] = templateId; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesDirectEditingCreateResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesDirectEditingCreateResponseApplicationJson), - )! as FilesDirectEditingCreateResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -309,10 +390,23 @@ class FilesOpenLocalEditorClient { final FilesClient _rootClient; /// Create a local editor - Future create({ + Future> create({ required final String path, final bool oCSAPIRequest = true, }) async { + final rawResponse = createRaw( + path: path, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create a local editor + DynamiteRawResponse createRaw({ + required final String path, + final bool oCSAPIRequest = true, + }) { const path0 = '/ocs/v2.php/apps/files/api/v1/openlocaleditor'; final queryParameters = {}; final headers = { @@ -339,27 +433,42 @@ class FilesOpenLocalEditorClient { // coverage:ignore-end queryParameters['path'] = path; headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesOpenLocalEditorCreateResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesOpenLocalEditorCreateResponseApplicationJson), - )! as FilesOpenLocalEditorCreateResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Validate a local editor - Future validate({ + Future> validate({ required final String path, required final String token, final bool oCSAPIRequest = true, }) async { + final rawResponse = validateRaw( + path: path, + token: token, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Validate a local editor + DynamiteRawResponse validateRaw({ + required final String path, + required final String token, + final bool oCSAPIRequest = true, + }) { var path0 = '/ocs/v2.php/apps/files/api/v1/openlocaleditor/{token}'; final queryParameters = {}; final headers = { @@ -387,19 +496,19 @@ class FilesOpenLocalEditorClient { queryParameters['path'] = path; path0 = path0.replaceAll('{token}', Uri.encodeQueryComponent(token)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesOpenLocalEditorValidateResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesOpenLocalEditorValidateResponseApplicationJson), - )! as FilesOpenLocalEditorValidateResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -409,7 +518,18 @@ class FilesTemplateClient { final FilesClient _rootClient; /// List the available templates - Future list({final bool oCSAPIRequest = true}) async { + Future> list({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = listRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// List the available templates + DynamiteRawResponse listRaw({final bool oCSAPIRequest = true}) { const path = '/ocs/v2.php/apps/files/api/v1/templates'; final queryParameters = {}; final headers = { @@ -435,28 +555,45 @@ class FilesTemplateClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesTemplateListResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesTemplateListResponseApplicationJson), - )! as FilesTemplateListResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Create a template - Future create({ + Future> create({ required final String filePath, final String templatePath = '', final String templateType = 'user', final bool oCSAPIRequest = true, }) async { + final rawResponse = createRaw( + filePath: filePath, + templatePath: templatePath, + templateType: templateType, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create a template + DynamiteRawResponse createRaw({ + required final String filePath, + final String templatePath = '', + final String templateType = 'user', + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files/api/v1/templates/create'; final queryParameters = {}; final headers = { @@ -489,27 +626,42 @@ class FilesTemplateClient { queryParameters['templateType'] = templateType; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesTemplateCreateResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesTemplateCreateResponseApplicationJson), - )! as FilesTemplateCreateResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Initialize the template directory - Future path({ + Future> path({ final String templatePath = '', final int copySystemTemplates = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = pathRaw( + templatePath: templatePath, + copySystemTemplates: copySystemTemplates, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Initialize the template directory + DynamiteRawResponse pathRaw({ + final String templatePath = '', + final int copySystemTemplates = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files/api/v1/templates/path'; final queryParameters = {}; final headers = { @@ -541,19 +693,19 @@ class FilesTemplateClient { queryParameters['copySystemTemplates'] = copySystemTemplates.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesTemplatePathResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesTemplatePathResponseApplicationJson), - )! as FilesTemplatePathResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -563,11 +715,26 @@ class FilesTransferOwnershipClient { final FilesClient _rootClient; /// Transfer the ownership to another user - Future transfer({ + Future> transfer({ required final String recipient, required final String path, final bool oCSAPIRequest = true, }) async { + final rawResponse = transferRaw( + recipient: recipient, + path: path, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Transfer the ownership to another user + DynamiteRawResponse transferRaw({ + required final String recipient, + required final String path, + final bool oCSAPIRequest = true, + }) { const path0 = '/ocs/v2.php/apps/files/api/v1/transferownership'; final queryParameters = {}; final headers = { @@ -595,26 +762,39 @@ class FilesTransferOwnershipClient { queryParameters['recipient'] = recipient; queryParameters['path'] = path; headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200, 400, 403}, + ), + bodyType: const FullType(FilesTransferOwnershipTransferResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || response.statusCode == 400 || response.statusCode == 403) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesTransferOwnershipTransferResponseApplicationJson), - )! as FilesTransferOwnershipTransferResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Accept an ownership transfer - Future accept({ + Future> accept({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = acceptRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Accept an ownership transfer + DynamiteRawResponse acceptRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files/api/v1/transferownership/{id}'; final queryParameters = {}; final headers = { @@ -641,26 +821,39 @@ class FilesTransferOwnershipClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200, 403, 404}, + ), + bodyType: const FullType(FilesTransferOwnershipAcceptResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || response.statusCode == 403 || response.statusCode == 404) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesTransferOwnershipAcceptResponseApplicationJson), - )! as FilesTransferOwnershipAcceptResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Reject an ownership transfer - Future reject({ + Future> reject({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = rejectRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Reject an ownership transfer + DynamiteRawResponse rejectRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files/api/v1/transferownership/{id}'; final queryParameters = {}; final headers = { @@ -687,19 +880,19 @@ class FilesTransferOwnershipClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200, 403, 404}, + ), + bodyType: const FullType(FilesTransferOwnershipRejectResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || response.statusCode == 403 || response.statusCode == 404) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesTransferOwnershipRejectResponseApplicationJson), - )! as FilesTransferOwnershipRejectResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -2369,14 +2562,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(FilesTemplate.serializer)) .build(); -Serializers get filesSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeFiles(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeFiles(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/files_external.openapi.dart b/packages/nextcloud/lib/src/api/files_external.openapi.dart index 26bc0874..abf4ce85 100644 --- a/packages/nextcloud/lib/src/api/files_external.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_external.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -44,7 +45,20 @@ class FilesExternalApiClient { final FilesExternalClient _rootClient; /// Get the mount points visible for this user - Future getUserMounts({final bool oCSAPIRequest = true}) async { + Future> getUserMounts({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = getUserMountsRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the mount points visible for this user + DynamiteRawResponse getUserMountsRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files_external/api/v1/mounts'; final queryParameters = {}; final headers = { @@ -70,19 +84,19 @@ class FilesExternalApiClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesExternalApiGetUserMountsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesExternalApiGetUserMountsResponseApplicationJson), - )! as FilesExternalApiGetUserMountsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -344,14 +358,8 @@ final Serializers _serializers = (Serializers().toBuilder() )) .build(); -Serializers get filesExternalSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeFilesExternal(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeFilesExternal(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/files_reminders.openapi.dart b/packages/nextcloud/lib/src/api/files_reminders.openapi.dart index 3e8d897b..b6267f9c 100644 --- a/packages/nextcloud/lib/src/api/files_reminders.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_reminders.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -44,11 +45,26 @@ class FilesRemindersApiClient { final FilesRemindersClient _rootClient; /// Get a reminder - Future $get({ + Future> $get({ required final String version, required final int fileId, final bool oCSAPIRequest = true, }) async { + final rawResponse = $getRaw( + version: version, + fileId: fileId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a reminder + DynamiteRawResponse $getRaw({ + required final String version, + required final int fileId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_reminders/api/v{version}/{fileId}'; final queryParameters = {}; final headers = { @@ -77,28 +93,45 @@ class FilesRemindersApiClient { path = path.replaceAll('{version}', Uri.encodeQueryComponent(version)); path = path.replaceAll('{fileId}', Uri.encodeQueryComponent(fileId.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesRemindersApiGetResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesRemindersApiGetResponseApplicationJson), - )! as FilesRemindersApiGetResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Set a reminder - Future $set({ + Future> $set({ required final String dueDate, required final String version, required final int fileId, final bool oCSAPIRequest = true, }) async { + final rawResponse = $setRaw( + dueDate: dueDate, + version: version, + fileId: fileId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Set a reminder + DynamiteRawResponse $setRaw({ + required final String dueDate, + required final String version, + required final int fileId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_reminders/api/v{version}/{fileId}'; final queryParameters = {}; final headers = { @@ -128,31 +161,42 @@ class FilesRemindersApiClient { path = path.replaceAll('{version}', Uri.encodeQueryComponent(version)); path = path.replaceAll('{fileId}', Uri.encodeQueryComponent(fileId.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200, 201, 400, 401, 404}, + ), + bodyType: const FullType(FilesRemindersApiSetResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || - response.statusCode == 201 || - response.statusCode == 400 || - response.statusCode == 401 || - response.statusCode == 404) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesRemindersApiSetResponseApplicationJson), - )! as FilesRemindersApiSetResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Remove a reminder - Future remove({ + Future> remove({ required final String version, required final int fileId, final bool oCSAPIRequest = true, }) async { + final rawResponse = removeRaw( + version: version, + fileId: fileId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Remove a reminder + DynamiteRawResponse removeRaw({ + required final String version, + required final int fileId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_reminders/api/v{version}/{fileId}'; final queryParameters = {}; final headers = { @@ -181,19 +225,19 @@ class FilesRemindersApiClient { path = path.replaceAll('{version}', Uri.encodeQueryComponent(version)); path = path.replaceAll('{fileId}', Uri.encodeQueryComponent(fileId.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200, 401, 404}, + ), + bodyType: const FullType(FilesRemindersApiRemoveResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || response.statusCode == 401 || response.statusCode == 404) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesRemindersApiRemoveResponseApplicationJson), - )! as FilesRemindersApiRemoveResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -512,14 +556,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(FilesRemindersApiRemoveResponseApplicationJson_Ocs.serializer)) .build(); -Serializers get filesRemindersSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeFilesReminders(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeFilesReminders(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/files_sharing.openapi.dart b/packages/nextcloud/lib/src/api/files_sharing.openapi.dart index 600db34c..b984d898 100644 --- a/packages/nextcloud/lib/src/api/files_sharing.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_sharing.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -54,7 +55,20 @@ class FilesSharingDeletedShareapiClient { final FilesSharingClient _rootClient; /// Get a list of all deleted shares - Future list({final bool oCSAPIRequest = true}) async { + Future> list({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = listRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of all deleted shares + DynamiteRawResponse listRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files_sharing/api/v1/deletedshares'; final queryParameters = {}; final headers = { @@ -80,26 +94,39 @@ class FilesSharingDeletedShareapiClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingDeletedShareapiListResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingDeletedShareapiListResponseApplicationJson), - )! as FilesSharingDeletedShareapiListResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Undelete a deleted share - Future undelete({ + Future> undelete({ required final String id, final bool oCSAPIRequest = true, }) async { + final rawResponse = undeleteRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Undelete a deleted share + DynamiteRawResponse undeleteRaw({ + required final String id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/deletedshares/{id}'; final queryParameters = {}; final headers = { @@ -126,19 +153,19 @@ class FilesSharingDeletedShareapiClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingDeletedShareapiUndeleteResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingDeletedShareapiUndeleteResponseApplicationJson), - )! as FilesSharingDeletedShareapiUndeleteResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -148,10 +175,23 @@ class FilesSharingPublicPreviewClient { final FilesSharingClient _rootClient; /// Get a direct link preview for a shared file - Future directLink({ + Future> directLink({ required final String token, final bool oCSAPIRequest = true, }) async { + final rawResponse = directLinkRaw( + token: token, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a direct link preview for a shared file + DynamiteRawResponse directLinkRaw({ + required final String token, + final bool oCSAPIRequest = true, + }) { var path = '/index.php/s/{token}/preview'; final queryParameters = {}; final headers = { @@ -176,20 +216,23 @@ class FilesSharingPublicPreviewClient { // coverage:ignore-end path = path.replaceAll('{token}', Uri.encodeQueryComponent(token)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get a preview for a shared file - Future getPreview({ + Future> getPreview({ required final String token, final String file = '', final int x = 32, @@ -197,6 +240,27 @@ class FilesSharingPublicPreviewClient { final int a = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getPreviewRaw( + token: token, + file: file, + x: x, + y: y, + a: a, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a preview for a shared file + DynamiteRawResponse getPreviewRaw({ + required final String token, + final String file = '', + final int x = 32, + final int y = 32, + final int a = 0, + final bool oCSAPIRequest = true, + }) { var path = '/index.php/apps/files_sharing/publicpreview/{token}'; final queryParameters = {}; final headers = { @@ -233,16 +297,19 @@ class FilesSharingPublicPreviewClient { queryParameters['a'] = a.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -252,7 +319,20 @@ class FilesSharingRemoteClient { final FilesSharingClient _rootClient; /// Get a list of accepted remote shares - Future getShares({final bool oCSAPIRequest = true}) async { + Future> getShares({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = getSharesRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of accepted remote shares + DynamiteRawResponse getSharesRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files_sharing/api/v1/remote_shares'; final queryParameters = {}; final headers = { @@ -278,25 +358,36 @@ class FilesSharingRemoteClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingRemoteGetSharesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingRemoteGetSharesResponseApplicationJson), - )! as FilesSharingRemoteGetSharesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get list of pending remote shares - Future getOpenShares({ + Future> getOpenShares({ final bool oCSAPIRequest = true, }) async { + final rawResponse = getOpenSharesRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get list of pending remote shares + DynamiteRawResponse getOpenSharesRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending'; final queryParameters = {}; final headers = { @@ -322,26 +413,39 @@ class FilesSharingRemoteClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingRemoteGetOpenSharesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingRemoteGetOpenSharesResponseApplicationJson), - )! as FilesSharingRemoteGetOpenSharesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Accept a remote share - Future acceptShare({ + Future> acceptShare({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = acceptShareRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Accept a remote share + DynamiteRawResponse acceptShareRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/{id}'; final queryParameters = {}; final headers = { @@ -368,26 +472,39 @@ class FilesSharingRemoteClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingRemoteAcceptShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingRemoteAcceptShareResponseApplicationJson), - )! as FilesSharingRemoteAcceptShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Decline a remote share - Future declineShare({ + Future> declineShare({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = declineShareRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Decline a remote share + DynamiteRawResponse declineShareRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/{id}'; final queryParameters = {}; final headers = { @@ -414,26 +531,39 @@ class FilesSharingRemoteClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingRemoteDeclineShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingRemoteDeclineShareResponseApplicationJson), - )! as FilesSharingRemoteDeclineShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get info of a remote share - Future getShare({ + Future> getShare({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = getShareRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get info of a remote share + DynamiteRawResponse getShareRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/remote_shares/{id}'; final queryParameters = {}; final headers = { @@ -460,26 +590,39 @@ class FilesSharingRemoteClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingRemoteGetShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingRemoteGetShareResponseApplicationJson), - )! as FilesSharingRemoteGetShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Unshare a remote share - Future unshare({ + Future> unshare({ required final int id, final bool oCSAPIRequest = true, }) async { + final rawResponse = unshareRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Unshare a remote share + DynamiteRawResponse unshareRaw({ + required final int id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/remote_shares/{id}'; final queryParameters = {}; final headers = { @@ -506,19 +649,19 @@ class FilesSharingRemoteClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingRemoteUnshareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingRemoteUnshareResponseApplicationJson), - )! as FilesSharingRemoteUnshareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -528,12 +671,29 @@ class FilesSharingShareInfoClient { final FilesSharingClient _rootClient; /// Get the info about a share - Future info({ + Future> info({ required final String t, final String? password, final String? dir, final int depth = -1, }) async { + final rawResponse = infoRaw( + t: t, + password: password, + dir: dir, + depth: depth, + ); + + return rawResponse.future; + } + + /// Get the info about a share + DynamiteRawResponse infoRaw({ + required final String t, + final String? password, + final String? dir, + final int depth = -1, + }) { const path = '/index.php/apps/files_sharing/shareinfo'; final queryParameters = {}; final headers = { @@ -566,19 +726,19 @@ class FilesSharingShareInfoClient { if (depth != -1) { queryParameters['depth'] = depth.toString(); } - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareInfo), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareInfo), - )! as FilesSharingShareInfo; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -588,7 +748,7 @@ class FilesSharingShareapiClient { final FilesSharingClient _rootClient; /// Get shares of the current user - Future getShares({ + Future> getShares({ final String sharedWithMe = 'false', final String reshares = 'false', final String subfiles = 'false', @@ -596,6 +756,27 @@ class FilesSharingShareapiClient { final String includeTags = 'false', final bool oCSAPIRequest = true, }) async { + final rawResponse = getSharesRaw( + sharedWithMe: sharedWithMe, + reshares: reshares, + subfiles: subfiles, + path: path, + includeTags: includeTags, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get shares of the current user + DynamiteRawResponse getSharesRaw({ + final String sharedWithMe = 'false', + final String reshares = 'false', + final String subfiles = 'false', + final String path = '', + final String includeTags = 'false', + final bool oCSAPIRequest = true, + }) { const path0 = '/ocs/v2.php/apps/files_sharing/api/v1/shares'; final queryParameters = {}; final headers = { @@ -636,23 +817,23 @@ class FilesSharingShareapiClient { queryParameters['include_tags'] = includeTags; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiGetSharesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiGetSharesResponseApplicationJson), - )! as FilesSharingShareapiGetSharesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Create a share - Future createShare({ + Future> createShare({ final String? path, final int? permissions, final int shareType = -1, @@ -666,6 +847,39 @@ class FilesSharingShareapiClient { final String? attributes, final bool oCSAPIRequest = true, }) async { + final rawResponse = createShareRaw( + path: path, + permissions: permissions, + shareType: shareType, + shareWith: shareWith, + publicUpload: publicUpload, + password: password, + sendPasswordByTalk: sendPasswordByTalk, + expireDate: expireDate, + note: note, + label: label, + attributes: attributes, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create a share + DynamiteRawResponse createShareRaw({ + final String? path, + final int? permissions, + final int shareType = -1, + final String? shareWith, + final String publicUpload = 'false', + final String password = '', + final String? sendPasswordByTalk, + final String expireDate = '', + final String note = '', + final String label = '', + final String? attributes, + final bool oCSAPIRequest = true, + }) { const path0 = '/ocs/v2.php/apps/files_sharing/api/v1/shares'; final queryParameters = {}; final headers = { @@ -724,26 +938,39 @@ class FilesSharingShareapiClient { queryParameters['attributes'] = attributes; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiCreateShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiCreateShareResponseApplicationJson), - )! as FilesSharingShareapiCreateShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get all shares relative to a file, including parent folders shares rights - Future getInheritedShares({ + Future> getInheritedShares({ required final String path, final bool oCSAPIRequest = true, }) async { + final rawResponse = getInheritedSharesRaw( + path: path, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get all shares relative to a file, including parent folders shares rights + DynamiteRawResponse getInheritedSharesRaw({ + required final String path, + final bool oCSAPIRequest = true, + }) { const path0 = '/ocs/v2.php/apps/files_sharing/api/v1/shares/inherited'; final queryParameters = {}; final headers = { @@ -770,25 +997,36 @@ class FilesSharingShareapiClient { // coverage:ignore-end queryParameters['path'] = path; headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path0, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiGetInheritedSharesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiGetInheritedSharesResponseApplicationJson), - )! as FilesSharingShareapiGetInheritedSharesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get all shares that are still pending - Future pendingShares({ + Future> pendingShares({ final bool oCSAPIRequest = true, }) async { + final rawResponse = pendingSharesRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get all shares that are still pending + DynamiteRawResponse pendingSharesRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files_sharing/api/v1/shares/pending'; final queryParameters = {}; final headers = { @@ -814,27 +1052,42 @@ class FilesSharingShareapiClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiPendingSharesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiPendingSharesResponseApplicationJson), - )! as FilesSharingShareapiPendingSharesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get a specific share by id - Future getShare({ + Future> getShare({ required final String id, final int includeTags = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getShareRaw( + id: id, + includeTags: includeTags, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a specific share by id + DynamiteRawResponse getShareRaw({ + required final String id, + final int includeTags = 0, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/shares/{id}'; final queryParameters = {}; final headers = { @@ -864,23 +1117,23 @@ class FilesSharingShareapiClient { queryParameters['include_tags'] = includeTags.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiGetShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiGetShareResponseApplicationJson), - )! as FilesSharingShareapiGetShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Update a share - Future updateShare({ + Future> updateShare({ required final String id, final int? permissions, final String? password, @@ -893,6 +1146,37 @@ class FilesSharingShareapiClient { final String? attributes, final bool oCSAPIRequest = true, }) async { + final rawResponse = updateShareRaw( + id: id, + permissions: permissions, + password: password, + sendPasswordByTalk: sendPasswordByTalk, + publicUpload: publicUpload, + expireDate: expireDate, + note: note, + label: label, + hideDownload: hideDownload, + attributes: attributes, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update a share + DynamiteRawResponse updateShareRaw({ + required final String id, + final int? permissions, + final String? password, + final String? sendPasswordByTalk, + final String? publicUpload, + final String? expireDate, + final String? note, + final String? label, + final String? hideDownload, + final String? attributes, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/shares/{id}'; final queryParameters = {}; final headers = { @@ -946,26 +1230,39 @@ class FilesSharingShareapiClient { queryParameters['attributes'] = attributes; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiUpdateShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiUpdateShareResponseApplicationJson), - )! as FilesSharingShareapiUpdateShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Delete a share - Future deleteShare({ + Future> deleteShare({ required final String id, final bool oCSAPIRequest = true, }) async { + final rawResponse = deleteShareRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete a share + DynamiteRawResponse deleteShareRaw({ + required final String id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/shares/{id}'; final queryParameters = {}; final headers = { @@ -992,26 +1289,39 @@ class FilesSharingShareapiClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiDeleteShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiDeleteShareResponseApplicationJson), - )! as FilesSharingShareapiDeleteShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Accept a share - Future acceptShare({ + Future> acceptShare({ required final String id, final bool oCSAPIRequest = true, }) async { + final rawResponse = acceptShareRaw( + id: id, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Accept a share + DynamiteRawResponse acceptShareRaw({ + required final String id, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/files_sharing/api/v1/shares/pending/{id}'; final queryParameters = {}; final headers = { @@ -1038,19 +1348,19 @@ class FilesSharingShareapiClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareapiAcceptShareResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareapiAcceptShareResponseApplicationJson), - )! as FilesSharingShareapiAcceptShareResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -1071,6 +1381,30 @@ class FilesSharingShareesapiClient { final int lookup = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = searchRaw( + search: search, + itemType: itemType, + page: page, + perPage: perPage, + shareType: shareType, + lookup: lookup, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Search for sharees + DynamiteRawResponse searchRaw({ + final String search = '', + final String? itemType, + final int page = 1, + final int perPage = 200, + final ContentString? shareType, + final int lookup = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files_sharing/api/v1/sharees'; final queryParameters = {}; final headers = { @@ -1117,34 +1451,43 @@ class FilesSharingShareesapiClient { queryParameters['lookup'] = lookup.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareesapiSearchResponseApplicationJson), + headersType: const FullType(FilesSharingShareesapiShareesapiSearchHeaders), + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return DynamiteResponse( - _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareesapiSearchResponseApplicationJson), - )! as FilesSharingShareesapiSearchResponseApplicationJson, - _jsonSerializers.deserialize( - response.responseHeaders, - specifiedType: const FullType(FilesSharingShareesapiShareesapiSearchHeaders), - )! as FilesSharingShareesapiShareesapiSearchHeaders, - ); - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Find recommended sharees - Future findRecommended({ + Future> findRecommended({ required final String itemType, final ContentString? shareType, final bool oCSAPIRequest = true, }) async { + final rawResponse = findRecommendedRaw( + itemType: itemType, + shareType: shareType, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Find recommended sharees + DynamiteRawResponse findRecommendedRaw({ + required final String itemType, + final ContentString? shareType, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/files_sharing/api/v1/sharees_recommended'; final queryParameters = {}; final headers = { @@ -1177,19 +1520,19 @@ class FilesSharingShareesapiClient { ); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(FilesSharingShareesapiFindRecommendedResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(FilesSharingShareesapiFindRecommendedResponseApplicationJson), - )! as FilesSharingShareesapiFindRecommendedResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -4732,14 +5075,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(FilesSharingCapabilities_FilesSharing_Sharee.serializer)) .build(); -Serializers get filesSharingSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeFilesSharing(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeFilesSharing(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart b/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart index b81fcdf4..6aa8aa3f 100644 --- a/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_trashbin.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -42,12 +43,29 @@ class FilesTrashbinPreviewClient { final FilesTrashbinClient _rootClient; /// Get the preview for a file - Future getPreview({ + Future> getPreview({ final int fileId = -1, final int x = 32, final int y = 32, final int a = 0, }) async { + final rawResponse = getPreviewRaw( + fileId: fileId, + x: x, + y: y, + a: a, + ); + + return rawResponse.future; + } + + /// Get the preview for a file + DynamiteRawResponse getPreviewRaw({ + final int fileId = -1, + final int x = 32, + final int y = 32, + final int a = 0, + }) { const path = '/index.php/apps/files_trashbin/preview'; final queryParameters = {}; final headers = { @@ -84,16 +102,19 @@ class FilesTrashbinPreviewClient { if (a != 0) { queryParameters['a'] = a.toString(); } - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -165,14 +186,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(FilesTrashbinCapabilities_Files.serializer)) .build(); -Serializers get filesTrashbinSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeFilesTrashbin(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeFilesTrashbin(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/files_versions.openapi.dart b/packages/nextcloud/lib/src/api/files_versions.openapi.dart index 76c72f92..54750077 100644 --- a/packages/nextcloud/lib/src/api/files_versions.openapi.dart +++ b/packages/nextcloud/lib/src/api/files_versions.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -42,12 +43,29 @@ class FilesVersionsPreviewClient { final FilesVersionsClient _rootClient; /// Get the preview for a file version - Future getPreview({ + Future> getPreview({ final String file = '', final int x = 44, final int y = 44, final String version = '', }) async { + final rawResponse = getPreviewRaw( + file: file, + x: x, + y: y, + version: version, + ); + + return rawResponse.future; + } + + /// Get the preview for a file version + DynamiteRawResponse getPreviewRaw({ + final String file = '', + final int x = 44, + final int y = 44, + final String version = '', + }) { const path = '/index.php/apps/files_versions/preview'; final queryParameters = {}; final headers = { @@ -84,16 +102,19 @@ class FilesVersionsPreviewClient { if (version != '') { queryParameters['version'] = version; } - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -169,14 +190,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(FilesVersionsCapabilities_Files.serializer)) .build(); -Serializers get filesVersionsSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeFilesVersions(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeFilesVersions(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/news.openapi.dart b/packages/nextcloud/lib/src/api/news.openapi.dart index f893bde8..6a7581e9 100644 --- a/packages/nextcloud/lib/src/api/news.openapi.dart +++ b/packages/nextcloud/lib/src/api/news.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -35,7 +36,13 @@ class NewsClient extends DynamiteClient { authentications: client.authentications, ); - Future getSupportedApiVersions() async { + Future> getSupportedApiVersions() async { + final rawResponse = getSupportedApiVersionsRaw(); + + return rawResponse.future; + } + + DynamiteRawResponse getSupportedApiVersionsRaw() { const path = '/index.php/apps/news/api'; final queryParameters = {}; final headers = { @@ -60,22 +67,28 @@ class NewsClient extends DynamiteClient { } // coverage:ignore-end - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NewsSupportedAPIVersions), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NewsSupportedAPIVersions), - )! as NewsSupportedAPIVersions; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future listFolders() async { + Future> listFolders() async { + final rawResponse = listFoldersRaw(); + + return rawResponse.future; + } + + DynamiteRawResponse listFoldersRaw() { const path = '/index.php/apps/news/api/v1-3/folders'; final queryParameters = {}; final headers = { @@ -100,20 +113,30 @@ class NewsClient extends DynamiteClient { } // coverage:ignore-end - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NewsListFolders), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NewsListFolders))! - as NewsListFolders; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future createFolder({required final String name}) async { + Future> createFolder({required final String name}) async { + final rawResponse = createFolderRaw( + name: name, + ); + + return rawResponse.future; + } + + DynamiteRawResponse createFolderRaw({required final String name}) { const path = '/index.php/apps/news/api/v1-3/folders'; final queryParameters = {}; final headers = { @@ -139,23 +162,37 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end queryParameters['name'] = name; - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NewsListFolders), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NewsListFolders))! - as NewsListFolders; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future renameFolder({ + Future> renameFolder({ required final int folderId, required final String name, }) async { + final rawResponse = renameFolderRaw( + folderId: folderId, + name: name, + ); + + return rawResponse.future; + } + + DynamiteRawResponse renameFolderRaw({ + required final int folderId, + required final String name, + }) { var path = '/index.php/apps/news/api/v1-3/folders/{folderId}'; final queryParameters = {}; final headers = {}; @@ -180,19 +217,30 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{folderId}', Uri.encodeQueryComponent(folderId.toString())); queryParameters['name'] = name; - final response = await doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future deleteFolder({required final int folderId}) async { + Future> deleteFolder({required final int folderId}) async { + final rawResponse = deleteFolderRaw( + folderId: folderId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse deleteFolderRaw({required final int folderId}) { var path = '/index.php/apps/news/api/v1-3/folders/{folderId}'; final queryParameters = {}; final headers = {}; @@ -216,22 +264,37 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{folderId}', Uri.encodeQueryComponent(folderId.toString())); - final response = await doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future markFolderAsRead({ + Future> markFolderAsRead({ required final int folderId, required final int newestItemId, }) async { + final rawResponse = markFolderAsReadRaw( + folderId: folderId, + newestItemId: newestItemId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse markFolderAsReadRaw({ + required final int folderId, + required final int newestItemId, + }) { var path = '/index.php/apps/news/api/v1-3/folders/{folderId}/read'; final queryParameters = {}; final headers = {}; @@ -256,19 +319,28 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{folderId}', Uri.encodeQueryComponent(folderId.toString())); queryParameters['newestItemId'] = newestItemId.toString(); - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future listFeeds() async { + Future> listFeeds() async { + final rawResponse = listFeedsRaw(); + + return rawResponse.future; + } + + DynamiteRawResponse listFeedsRaw() { const path = '/index.php/apps/news/api/v1-3/feeds'; final queryParameters = {}; final headers = { @@ -293,23 +365,37 @@ class NewsClient extends DynamiteClient { } // coverage:ignore-end - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NewsListFeeds), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NewsListFeeds))! - as NewsListFeeds; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future addFeed({ + Future> addFeed({ required final String url, final int? folderId, }) async { + final rawResponse = addFeedRaw( + url: url, + folderId: folderId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse addFeedRaw({ + required final String url, + final int? folderId, + }) { const path = '/index.php/apps/news/api/v1-3/feeds'; final queryParameters = {}; final headers = { @@ -338,20 +424,30 @@ class NewsClient extends DynamiteClient { if (folderId != null) { queryParameters['folderId'] = folderId.toString(); } - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NewsListFeeds), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NewsListFeeds))! - as NewsListFeeds; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future deleteFeed({required final int feedId}) async { + Future> deleteFeed({required final int feedId}) async { + final rawResponse = deleteFeedRaw( + feedId: feedId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse deleteFeedRaw({required final int feedId}) { var path = '/index.php/apps/news/api/v1-3/feeds/{feedId}'; final queryParameters = {}; final headers = {}; @@ -375,22 +471,37 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{feedId}', Uri.encodeQueryComponent(feedId.toString())); - final response = await doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future moveFeed({ + Future> moveFeed({ required final int feedId, final int? folderId, }) async { + final rawResponse = moveFeedRaw( + feedId: feedId, + folderId: folderId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse moveFeedRaw({ + required final int feedId, + final int? folderId, + }) { var path = '/index.php/apps/news/api/v1-3/feeds/{feedId}/move'; final queryParameters = {}; final headers = {}; @@ -417,22 +528,37 @@ class NewsClient extends DynamiteClient { if (folderId != null) { queryParameters['folderId'] = folderId.toString(); } - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future renameFeed({ + Future> renameFeed({ required final int feedId, required final String feedTitle, }) async { + final rawResponse = renameFeedRaw( + feedId: feedId, + feedTitle: feedTitle, + ); + + return rawResponse.future; + } + + DynamiteRawResponse renameFeedRaw({ + required final int feedId, + required final String feedTitle, + }) { var path = '/index.php/apps/news/api/v1-3/feeds/{feedId}/rename'; final queryParameters = {}; final headers = {}; @@ -457,22 +583,37 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{feedId}', Uri.encodeQueryComponent(feedId.toString())); queryParameters['feedTitle'] = feedTitle; - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future markFeedAsRead({ + Future> markFeedAsRead({ required final int feedId, required final int newestItemId, }) async { + final rawResponse = markFeedAsReadRaw( + feedId: feedId, + newestItemId: newestItemId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse markFeedAsReadRaw({ + required final int feedId, + required final int newestItemId, + }) { var path = '/index.php/apps/news/api/v1-3/feeds/{feedId}/read'; final queryParameters = {}; final headers = {}; @@ -497,19 +638,22 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{feedId}', Uri.encodeQueryComponent(feedId.toString())); queryParameters['newestItemId'] = newestItemId.toString(); - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future listArticles({ + Future> listArticles({ final int type = 3, final int id = 0, final int getRead = 1, @@ -517,6 +661,26 @@ class NewsClient extends DynamiteClient { final int offset = 0, final int oldestFirst = 0, }) async { + final rawResponse = listArticlesRaw( + type: type, + id: id, + getRead: getRead, + batchSize: batchSize, + offset: offset, + oldestFirst: oldestFirst, + ); + + return rawResponse.future; + } + + DynamiteRawResponse listArticlesRaw({ + final int type = 3, + final int id = 0, + final int getRead = 1, + final int batchSize = -1, + final int offset = 0, + final int oldestFirst = 0, + }) { const path = '/index.php/apps/news/api/v1-3/items'; final queryParameters = {}; final headers = { @@ -559,24 +723,40 @@ class NewsClient extends DynamiteClient { if (oldestFirst != 0) { queryParameters['oldestFirst'] = oldestFirst.toString(); } - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NewsListArticles), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NewsListArticles))! - as NewsListArticles; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future listUpdatedArticles({ + Future> listUpdatedArticles({ final int type = 3, final int id = 0, final int lastModified = 0, }) async { + final rawResponse = listUpdatedArticlesRaw( + type: type, + id: id, + lastModified: lastModified, + ); + + return rawResponse.future; + } + + DynamiteRawResponse listUpdatedArticlesRaw({ + final int type = 3, + final int id = 0, + final int lastModified = 0, + }) { const path = '/index.php/apps/news/api/v1-3/items/updated'; final queryParameters = {}; final headers = { @@ -610,20 +790,30 @@ class NewsClient extends DynamiteClient { if (lastModified != 0) { queryParameters['lastModified'] = lastModified.toString(); } - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NewsListArticles), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NewsListArticles))! - as NewsListArticles; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future markArticleAsRead({required final int itemId}) async { + Future> markArticleAsRead({required final int itemId}) async { + final rawResponse = markArticleAsReadRaw( + itemId: itemId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse markArticleAsReadRaw({required final int itemId}) { var path = '/index.php/apps/news/api/v1-3/items/{itemId}/read'; final queryParameters = {}; final headers = {}; @@ -647,19 +837,30 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future markArticleAsUnread({required final int itemId}) async { + Future> markArticleAsUnread({required final int itemId}) async { + final rawResponse = markArticleAsUnreadRaw( + itemId: itemId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse markArticleAsUnreadRaw({required final int itemId}) { var path = '/index.php/apps/news/api/v1-3/items/{itemId}/unread'; final queryParameters = {}; final headers = {}; @@ -683,19 +884,30 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future starArticle({required final int itemId}) async { + Future> starArticle({required final int itemId}) async { + final rawResponse = starArticleRaw( + itemId: itemId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse starArticleRaw({required final int itemId}) { var path = '/index.php/apps/news/api/v1-3/items/{itemId}/star'; final queryParameters = {}; final headers = {}; @@ -719,19 +931,30 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future unstarArticle({required final int itemId}) async { + Future> unstarArticle({required final int itemId}) async { + final rawResponse = unstarArticleRaw( + itemId: itemId, + ); + + return rawResponse.future; + } + + DynamiteRawResponse unstarArticleRaw({required final int itemId}) { var path = '/index.php/apps/news/api/v1-3/items/{itemId}/unstar'; final queryParameters = {}; final headers = {}; @@ -755,16 +978,19 @@ class NewsClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{itemId}', Uri.encodeQueryComponent(itemId.toString())); - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: null, + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -1097,14 +1323,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder.new)) .build(); -Serializers get newsSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeNews(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeNews(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/notes.openapi.dart b/packages/nextcloud/lib/src/api/notes.openapi.dart index 086aed41..0eeb21f4 100644 --- a/packages/nextcloud/lib/src/api/notes.openapi.dart +++ b/packages/nextcloud/lib/src/api/notes.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:convert'; @@ -36,7 +37,7 @@ class NotesClient extends DynamiteClient { authentications: client.authentications, ); - Future> getNotes({ + Future, void>> getNotes({ final String? category, final String exclude = '', final int pruneBefore = 0, @@ -44,6 +45,26 @@ class NotesClient extends DynamiteClient { final String? chunkCursor, final String? ifNoneMatch, }) async { + final rawResponse = getNotesRaw( + category: category, + exclude: exclude, + pruneBefore: pruneBefore, + chunkSize: chunkSize, + chunkCursor: chunkCursor, + ifNoneMatch: ifNoneMatch, + ); + + return rawResponse.future; + } + + DynamiteRawResponse, void> getNotesRaw({ + final String? category, + final String exclude = '', + final int pruneBefore = 0, + final int chunkSize = 0, + final String? chunkCursor, + final String? ifNoneMatch, + }) { const path = '/index.php/apps/notes/api/v1/notes'; final queryParameters = {}; final headers = { @@ -86,28 +107,46 @@ class NotesClient extends DynamiteClient { if (ifNoneMatch != null) { headers['If-None-Match'] = ifNoneMatch; } - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse, void>( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(BuiltList, [FullType(NotesNote)]), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(BuiltList, [FullType(NotesNote)]), - )! as BuiltList; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future createNote({ + Future> createNote({ final String category = '', final String title = '', final String content = '', final int modified = 0, final int favorite = 0, }) async { + final rawResponse = createNoteRaw( + category: category, + title: title, + content: content, + modified: modified, + favorite: favorite, + ); + + return rawResponse.future; + } + + DynamiteRawResponse createNoteRaw({ + final String category = '', + final String title = '', + final String content = '', + final int modified = 0, + final int favorite = 0, + }) { const path = '/index.php/apps/notes/api/v1/notes'; final queryParameters = {}; final headers = { @@ -147,24 +186,40 @@ class NotesClient extends DynamiteClient { if (favorite != 0) { queryParameters['favorite'] = favorite.toString(); } - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotesNote), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NotesNote))! - as NotesNote; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future getNote({ + Future> getNote({ required final int id, final String exclude = '', final String? ifNoneMatch, }) async { + final rawResponse = getNoteRaw( + id: id, + exclude: exclude, + ifNoneMatch: ifNoneMatch, + ); + + return rawResponse.future; + } + + DynamiteRawResponse getNoteRaw({ + required final int id, + final String exclude = '', + final String? ifNoneMatch, + }) { var path = '/index.php/apps/notes/api/v1/notes/{id}'; final queryParameters = {}; final headers = { @@ -196,20 +251,22 @@ class NotesClient extends DynamiteClient { if (ifNoneMatch != null) { headers['If-None-Match'] = ifNoneMatch; } - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotesNote), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NotesNote))! - as NotesNote; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future updateNote({ + Future> updateNote({ required final int id, final String? content, final int? modified, @@ -218,6 +275,28 @@ class NotesClient extends DynamiteClient { final int? favorite, final String? ifMatch, }) async { + final rawResponse = updateNoteRaw( + id: id, + content: content, + modified: modified, + title: title, + category: category, + favorite: favorite, + ifMatch: ifMatch, + ); + + return rawResponse.future; + } + + DynamiteRawResponse updateNoteRaw({ + required final int id, + final String? content, + final int? modified, + final String? title, + final String? category, + final int? favorite, + final String? ifMatch, + }) { var path = '/index.php/apps/notes/api/v1/notes/{id}'; final queryParameters = {}; final headers = { @@ -261,20 +340,30 @@ class NotesClient extends DynamiteClient { if (ifMatch != null) { headers['If-Match'] = ifMatch; } - final response = await doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotesNote), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NotesNote))! - as NotesNote; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future deleteNote({required final int id}) async { + Future> deleteNote({required final int id}) async { + final rawResponse = deleteNoteRaw( + id: id, + ); + + return rawResponse.future; + } + + DynamiteRawResponse deleteNoteRaw({required final int id}) { var path = '/index.php/apps/notes/api/v1/notes/{id}'; final queryParameters = {}; final headers = { @@ -300,19 +389,28 @@ class NotesClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); - final response = await doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(String), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return response.body; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future getSettings() async { + Future> getSettings() async { + final rawResponse = getSettingsRaw(); + + return rawResponse.future; + } + + DynamiteRawResponse getSettingsRaw() { const path = '/index.php/apps/notes/api/v1/settings'; final queryParameters = {}; final headers = { @@ -337,20 +435,30 @@ class NotesClient extends DynamiteClient { } // coverage:ignore-end - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotesSettings), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NotesSettings))! - as NotesSettings; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } - Future updateSettings({required final NotesSettings settings}) async { + Future> updateSettings({required final NotesSettings settings}) async { + final rawResponse = updateSettingsRaw( + settings: settings, + ); + + return rawResponse.future; + } + + DynamiteRawResponse updateSettingsRaw({required final NotesSettings settings}) { const path = '/index.php/apps/notes/api/v1/settings'; final queryParameters = {}; final headers = { @@ -378,17 +486,19 @@ class NotesClient extends DynamiteClient { headers['Content-Type'] = 'application/json'; body = utf8.encode(json.encode(_jsonSerializers.serialize(settings, specifiedType: const FullType(NotesSettings)))) as Uint8List; - final response = await doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotesSettings), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(NotesSettings))! - as NotesSettings; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -633,14 +743,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder.new)) .build(); -Serializers get notesSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeNotes(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeNotes(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/notifications.openapi.dart b/packages/nextcloud/lib/src/api/notifications.openapi.dart index 3ecd9e6d..a2729e74 100644 --- a/packages/nextcloud/lib/src/api/notifications.openapi.dart +++ b/packages/nextcloud/lib/src/api/notifications.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -52,13 +53,34 @@ class NotificationsApiClient { /// Generate a notification for a user /// /// This endpoint requires admin access - Future generateNotification({ + Future> generateNotification({ required final String shortMessage, required final String userId, final String longMessage = '', final NotificationsApiGenerateNotificationApiVersion apiVersion = NotificationsApiGenerateNotificationApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = generateNotificationRaw( + shortMessage: shortMessage, + userId: userId, + longMessage: longMessage, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Generate a notification for a user + /// + /// This endpoint requires admin access + DynamiteRawResponse generateNotificationRaw({ + required final String shortMessage, + required final String userId, + final String longMessage = '', + final NotificationsApiGenerateNotificationApiVersion apiVersion = NotificationsApiGenerateNotificationApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/admin_notifications/{userId}'; final queryParameters = {}; final headers = { @@ -90,19 +112,19 @@ class NotificationsApiClient { } path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotificationsApiGenerateNotificationResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsApiGenerateNotificationResponseApplicationJson), - )! as NotificationsApiGenerateNotificationResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -119,6 +141,21 @@ class NotificationsEndpointClient { NotificationsEndpointListNotificationsApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = listNotificationsRaw( + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get all notifications + DynamiteRawResponse listNotificationsRaw({ + final NotificationsEndpointListNotificationsApiVersion apiVersion = + NotificationsEndpointListNotificationsApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/notifications'; final queryParameters = {}; final headers = { @@ -145,34 +182,44 @@ class NotificationsEndpointClient { // coverage:ignore-end path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotificationsEndpointListNotificationsResponseApplicationJson), + headersType: const FullType(NotificationsEndpointEndpointListNotificationsHeaders), + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return DynamiteResponse( - _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsEndpointListNotificationsResponseApplicationJson), - )! as NotificationsEndpointListNotificationsResponseApplicationJson, - _jsonSerializers.deserialize( - response.responseHeaders, - specifiedType: const FullType(NotificationsEndpointEndpointListNotificationsHeaders), - )! as NotificationsEndpointEndpointListNotificationsHeaders, - ); - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Delete all notifications - Future deleteAllNotifications({ + Future> + deleteAllNotifications({ final NotificationsEndpointDeleteAllNotificationsApiVersion apiVersion = NotificationsEndpointDeleteAllNotificationsApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = deleteAllNotificationsRaw( + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete all notifications + DynamiteRawResponse + deleteAllNotificationsRaw({ + final NotificationsEndpointDeleteAllNotificationsApiVersion apiVersion = + NotificationsEndpointDeleteAllNotificationsApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/notifications'; final queryParameters = {}; final headers = { @@ -199,27 +246,42 @@ class NotificationsEndpointClient { // coverage:ignore-end path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotificationsEndpointDeleteAllNotificationsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsEndpointDeleteAllNotificationsResponseApplicationJson), - )! as NotificationsEndpointDeleteAllNotificationsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get a notification - Future getNotification({ + Future> getNotification({ required final int id, final NotificationsEndpointGetNotificationApiVersion apiVersion = NotificationsEndpointGetNotificationApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = getNotificationRaw( + id: id, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a notification + DynamiteRawResponse getNotificationRaw({ + required final int id, + final NotificationsEndpointGetNotificationApiVersion apiVersion = NotificationsEndpointGetNotificationApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/notifications/{id}'; final queryParameters = {}; final headers = { @@ -247,28 +309,44 @@ class NotificationsEndpointClient { path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotificationsEndpointGetNotificationResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsEndpointGetNotificationResponseApplicationJson), - )! as NotificationsEndpointGetNotificationResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Delete a notification - Future deleteNotification({ + Future> deleteNotification({ required final int id, final NotificationsEndpointDeleteNotificationApiVersion apiVersion = NotificationsEndpointDeleteNotificationApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = deleteNotificationRaw( + id: id, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete a notification + DynamiteRawResponse deleteNotificationRaw({ + required final int id, + final NotificationsEndpointDeleteNotificationApiVersion apiVersion = + NotificationsEndpointDeleteNotificationApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/notifications/{id}'; final queryParameters = {}; final headers = { @@ -296,28 +374,44 @@ class NotificationsEndpointClient { path = path.replaceAll('{id}', Uri.encodeQueryComponent(id.toString())); path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotificationsEndpointDeleteNotificationResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsEndpointDeleteNotificationResponseApplicationJson), - )! as NotificationsEndpointDeleteNotificationResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Check if notification IDs exist - Future confirmIdsForUser({ + Future> confirmIdsForUser({ required final List ids, final NotificationsEndpointConfirmIdsForUserApiVersion apiVersion = NotificationsEndpointConfirmIdsForUserApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = confirmIdsForUserRaw( + ids: ids, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Check if notification IDs exist + DynamiteRawResponse confirmIdsForUserRaw({ + required final List ids, + final NotificationsEndpointConfirmIdsForUserApiVersion apiVersion = + NotificationsEndpointConfirmIdsForUserApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/notifications/exists'; final queryParameters = {}; final headers = { @@ -345,19 +439,19 @@ class NotificationsEndpointClient { queryParameters['ids[]'] = ids.map((final e) => e.toString()); path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200, 400}, + ), + bodyType: const FullType(NotificationsEndpointConfirmIdsForUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || response.statusCode == 400) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsEndpointConfirmIdsForUserResponseApplicationJson), - )! as NotificationsEndpointConfirmIdsForUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -367,13 +461,32 @@ class NotificationsPushClient { final NotificationsClient _rootClient; /// Register device for push notifications - Future registerDevice({ + Future> registerDevice({ required final String pushTokenHash, required final String devicePublicKey, required final String proxyServer, final NotificationsPushRegisterDeviceApiVersion apiVersion = NotificationsPushRegisterDeviceApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = registerDeviceRaw( + pushTokenHash: pushTokenHash, + devicePublicKey: devicePublicKey, + proxyServer: proxyServer, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Register device for push notifications + DynamiteRawResponse registerDeviceRaw({ + required final String pushTokenHash, + required final String devicePublicKey, + required final String proxyServer, + final NotificationsPushRegisterDeviceApiVersion apiVersion = NotificationsPushRegisterDeviceApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/push'; final queryParameters = {}; final headers = { @@ -403,26 +516,39 @@ class NotificationsPushClient { queryParameters['proxyServer'] = proxyServer; path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200, 201}, + ), + bodyType: const FullType(NotificationsPushRegisterDeviceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || response.statusCode == 201) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsPushRegisterDeviceResponseApplicationJson), - )! as NotificationsPushRegisterDeviceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Remove a device from push notifications - Future removeDevice({ + Future> removeDevice({ final NotificationsPushRemoveDeviceApiVersion apiVersion = NotificationsPushRemoveDeviceApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = removeDeviceRaw( + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Remove a device from push notifications + DynamiteRawResponse removeDeviceRaw({ + final NotificationsPushRemoveDeviceApiVersion apiVersion = NotificationsPushRemoveDeviceApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/push'; final queryParameters = {}; final headers = { @@ -449,19 +575,19 @@ class NotificationsPushClient { // coverage:ignore-end path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200, 202, 401}, + ), + bodyType: const FullType(NotificationsPushRemoveDeviceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200 || response.statusCode == 202 || response.statusCode == 401) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsPushRemoveDeviceResponseApplicationJson), - )! as NotificationsPushRemoveDeviceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -471,13 +597,32 @@ class NotificationsSettingsClient { final NotificationsClient _rootClient; /// Update personal notification settings - Future personal({ + Future> personal({ required final int batchSetting, required final String soundNotification, required final String soundTalk, final NotificationsSettingsPersonalApiVersion apiVersion = NotificationsSettingsPersonalApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = personalRaw( + batchSetting: batchSetting, + soundNotification: soundNotification, + soundTalk: soundTalk, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update personal notification settings + DynamiteRawResponse personalRaw({ + required final int batchSetting, + required final String soundNotification, + required final String soundTalk, + final NotificationsSettingsPersonalApiVersion apiVersion = NotificationsSettingsPersonalApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/settings'; final queryParameters = {}; final headers = { @@ -507,31 +652,52 @@ class NotificationsSettingsClient { queryParameters['soundTalk'] = soundTalk; path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotificationsSettingsPersonalResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsSettingsPersonalResponseApplicationJson), - )! as NotificationsSettingsPersonalResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Update default notification settings for new users /// /// This endpoint requires admin access - Future admin({ + Future> admin({ required final int batchSetting, required final String soundNotification, required final String soundTalk, final NotificationsSettingsAdminApiVersion apiVersion = NotificationsSettingsAdminApiVersion.v2, final String oCSAPIRequest = 'true', }) async { + final rawResponse = adminRaw( + batchSetting: batchSetting, + soundNotification: soundNotification, + soundTalk: soundTalk, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update default notification settings for new users + /// + /// This endpoint requires admin access + DynamiteRawResponse adminRaw({ + required final int batchSetting, + required final String soundNotification, + required final String soundTalk, + final NotificationsSettingsAdminApiVersion apiVersion = NotificationsSettingsAdminApiVersion.v2, + final String oCSAPIRequest = 'true', + }) { var path = '/ocs/v2.php/apps/notifications/api/{apiVersion}/settings/admin'; final queryParameters = {}; final headers = { @@ -561,19 +727,19 @@ class NotificationsSettingsClient { queryParameters['soundTalk'] = soundTalk; path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest; - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(NotificationsSettingsAdminResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(NotificationsSettingsAdminResponseApplicationJson), - )! as NotificationsSettingsAdminResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -1917,14 +2083,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), ListBuilder.new)) .build(); -Serializers get notificationsSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeNotifications(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeNotifications(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart b/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart index 6bf28cb4..01b37ff4 100644 --- a/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart +++ b/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -55,7 +56,22 @@ class ProvisioningApiAppConfigClient { /// Get a list of apps /// /// This endpoint requires admin access - Future getApps({final bool oCSAPIRequest = true}) async { + Future> getApps({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = getAppsRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of apps + /// + /// This endpoint requires admin access + DynamiteRawResponse getAppsRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/apps'; final queryParameters = {}; final headers = { @@ -81,28 +97,43 @@ class ProvisioningApiAppConfigClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppConfigGetAppsResponseApplicationJson), - )! as ProvisioningApiAppConfigGetAppsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppConfigGetAppsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the config keys of an app /// /// This endpoint requires admin access - Future getKeys({ + Future> getKeys({ required final String app, final bool oCSAPIRequest = true, }) async { + final rawResponse = getKeysRaw( + app: app, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the config keys of an app + /// + /// This endpoint requires admin access + DynamiteRawResponse getKeysRaw({ + required final String app, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/apps/{app}'; final queryParameters = {}; final headers = { @@ -129,30 +160,49 @@ class ProvisioningApiAppConfigClient { // coverage:ignore-end path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppConfigGetKeysResponseApplicationJson), - )! as ProvisioningApiAppConfigGetKeysResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppConfigGetKeysResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a the config value of an app /// /// This endpoint requires admin access - Future getValue({ + Future> getValue({ required final String app, required final String key, final String defaultValue = '', final bool oCSAPIRequest = true, }) async { + final rawResponse = getValueRaw( + app: app, + key: key, + defaultValue: defaultValue, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a the config value of an app + /// + /// This endpoint requires admin access + DynamiteRawResponse getValueRaw({ + required final String app, + required final String key, + final String defaultValue = '', + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/apps/{app}/{key}'; final queryParameters = {}; final headers = { @@ -183,28 +233,45 @@ class ProvisioningApiAppConfigClient { queryParameters['defaultValue'] = defaultValue; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppConfigGetValueResponseApplicationJson), - )! as ProvisioningApiAppConfigGetValueResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppConfigGetValueResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Update the config value of an app - Future setValue({ + Future> setValue({ required final String value, required final String app, required final String key, final bool oCSAPIRequest = true, }) async { + final rawResponse = setValueRaw( + value: value, + app: app, + key: key, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update the config value of an app + DynamiteRawResponse setValueRaw({ + required final String value, + required final String app, + required final String key, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/apps/{app}/{key}'; final queryParameters = {}; final headers = { @@ -233,29 +300,46 @@ class ProvisioningApiAppConfigClient { path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); path = path.replaceAll('{key}', Uri.encodeQueryComponent(key)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppConfigSetValueResponseApplicationJson), - )! as ProvisioningApiAppConfigSetValueResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppConfigSetValueResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Delete a config key of an app /// /// This endpoint requires admin access - Future deleteKey({ + Future> deleteKey({ required final String app, required final String key, final bool oCSAPIRequest = true, }) async { + final rawResponse = deleteKeyRaw( + app: app, + key: key, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete a config key of an app + /// + /// This endpoint requires admin access + DynamiteRawResponse deleteKeyRaw({ + required final String app, + required final String key, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/apps/{app}/{key}'; final queryParameters = {}; final headers = { @@ -283,19 +367,19 @@ class ProvisioningApiAppConfigClient { path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); path = path.replaceAll('{key}', Uri.encodeQueryComponent(key)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppConfigDeleteKeyResponseApplicationJson), - )! as ProvisioningApiAppConfigDeleteKeyResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppConfigDeleteKeyResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -307,10 +391,25 @@ class ProvisioningApiAppsClient { /// Get a list of installed apps /// /// This endpoint requires admin access - Future getApps({ + Future> getApps({ final String? filter, final bool oCSAPIRequest = true, }) async { + final rawResponse = getAppsRaw( + filter: filter, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of installed apps + /// + /// This endpoint requires admin access + DynamiteRawResponse getAppsRaw({ + final String? filter, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/apps'; final queryParameters = {}; final headers = { @@ -339,28 +438,43 @@ class ProvisioningApiAppsClient { queryParameters['filter'] = filter; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppsGetAppsResponseApplicationJson), - )! as ProvisioningApiAppsGetAppsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppsGetAppsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the app info for an app /// /// This endpoint requires admin access - Future getAppInfo({ + Future> getAppInfo({ required final String app, final bool oCSAPIRequest = true, }) async { + final rawResponse = getAppInfoRaw( + app: app, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the app info for an app + /// + /// This endpoint requires admin access + DynamiteRawResponse getAppInfoRaw({ + required final String app, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/apps/{app}'; final queryParameters = {}; final headers = { @@ -387,28 +501,43 @@ class ProvisioningApiAppsClient { // coverage:ignore-end path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppsGetAppInfoResponseApplicationJson), - )! as ProvisioningApiAppsGetAppInfoResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppsGetAppInfoResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Enable an app /// /// This endpoint requires admin access - Future enable({ + Future> enable({ required final String app, final bool oCSAPIRequest = true, }) async { + final rawResponse = enableRaw( + app: app, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Enable an app + /// + /// This endpoint requires admin access + DynamiteRawResponse enableRaw({ + required final String app, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/apps/{app}'; final queryParameters = {}; final headers = { @@ -435,28 +564,43 @@ class ProvisioningApiAppsClient { // coverage:ignore-end path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppsEnableResponseApplicationJson), - )! as ProvisioningApiAppsEnableResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppsEnableResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Disable an app /// /// This endpoint requires admin access - Future disable({ + Future> disable({ required final String app, final bool oCSAPIRequest = true, }) async { + final rawResponse = disableRaw( + app: app, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Disable an app + /// + /// This endpoint requires admin access + DynamiteRawResponse disableRaw({ + required final String app, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/apps/{app}'; final queryParameters = {}; final headers = { @@ -483,19 +627,19 @@ class ProvisioningApiAppsClient { // coverage:ignore-end path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiAppsDisableResponseApplicationJson), - )! as ProvisioningApiAppsDisableResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiAppsDisableResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -505,12 +649,29 @@ class ProvisioningApiGroupsClient { final ProvisioningApiClient _rootClient; /// Get a list of groups - Future getGroups({ + Future> getGroups({ final String search = '', final int? limit, final int offset = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getGroupsRaw( + search: search, + limit: limit, + offset: offset, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of groups + DynamiteRawResponse getGroupsRaw({ + final String search = '', + final int? limit, + final int offset = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/groups'; final queryParameters = {}; final headers = { @@ -545,29 +706,46 @@ class ProvisioningApiGroupsClient { queryParameters['offset'] = offset.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsGetGroupsResponseApplicationJson), - )! as ProvisioningApiGroupsGetGroupsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsGetGroupsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Create a new group /// /// This endpoint requires admin access - Future addGroup({ + Future> addGroup({ required final String groupid, final String displayname = '', final bool oCSAPIRequest = true, }) async { + final rawResponse = addGroupRaw( + groupid: groupid, + displayname: displayname, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create a new group + /// + /// This endpoint requires admin access + DynamiteRawResponse addGroupRaw({ + required final String groupid, + final String displayname = '', + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/groups'; final queryParameters = {}; final headers = { @@ -597,28 +775,45 @@ class ProvisioningApiGroupsClient { queryParameters['displayname'] = displayname; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsAddGroupResponseApplicationJson), - )! as ProvisioningApiGroupsAddGroupResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsAddGroupResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of groups details - Future getGroupsDetails({ + Future> getGroupsDetails({ final String search = '', final int? limit, final int offset = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getGroupsDetailsRaw( + search: search, + limit: limit, + offset: offset, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of groups details + DynamiteRawResponse getGroupsDetailsRaw({ + final String search = '', + final int? limit, + final int offset = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/groups/details'; final queryParameters = {}; final headers = { @@ -653,26 +848,39 @@ class ProvisioningApiGroupsClient { queryParameters['offset'] = offset.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsGetGroupsDetailsResponseApplicationJson), - )! as ProvisioningApiGroupsGetGroupsDetailsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsGetGroupsDetailsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of users in the specified group - Future getGroupUsers({ + Future> getGroupUsers({ required final String groupId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getGroupUsersRaw( + groupId: groupId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of users in the specified group + DynamiteRawResponse getGroupUsersRaw({ + required final String groupId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/groups/{groupId}/users'; final queryParameters = {}; final headers = { @@ -700,29 +908,49 @@ class ProvisioningApiGroupsClient { checkPattern(groupId, RegExp(r'^.+$'), 'groupId'); // coverage:ignore-line path = path.replaceAll('{groupId}', Uri.encodeQueryComponent(groupId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsGetGroupUsersResponseApplicationJson), - )! as ProvisioningApiGroupsGetGroupUsersResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsGetGroupUsersResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of users details in the specified group - Future getGroupUsersDetails({ + Future> + getGroupUsersDetails({ required final String groupId, final String search = '', final int? limit, final int offset = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getGroupUsersDetailsRaw( + groupId: groupId, + search: search, + limit: limit, + offset: offset, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of users details in the specified group + DynamiteRawResponse getGroupUsersDetailsRaw({ + required final String groupId, + final String search = '', + final int? limit, + final int offset = 0, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/groups/{groupId}/users/details'; final queryParameters = {}; final headers = { @@ -759,28 +987,43 @@ class ProvisioningApiGroupsClient { queryParameters['offset'] = offset.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsGetGroupUsersDetailsResponseApplicationJson), - )! as ProvisioningApiGroupsGetGroupUsersDetailsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsGetGroupUsersDetailsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the list of user IDs that are a subadmin of the group /// /// This endpoint requires admin access - Future getSubAdminsOfGroup({ + Future> getSubAdminsOfGroup({ required final String groupId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getSubAdminsOfGroupRaw( + groupId: groupId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the list of user IDs that are a subadmin of the group + /// + /// This endpoint requires admin access + DynamiteRawResponse getSubAdminsOfGroupRaw({ + required final String groupId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/groups/{groupId}/subadmins'; final queryParameters = {}; final headers = { @@ -808,27 +1051,41 @@ class ProvisioningApiGroupsClient { checkPattern(groupId, RegExp(r'^.+$'), 'groupId'); // coverage:ignore-line path = path.replaceAll('{groupId}', Uri.encodeQueryComponent(groupId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsGetSubAdminsOfGroupResponseApplicationJson), - )! as ProvisioningApiGroupsGetSubAdminsOfGroupResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsGetSubAdminsOfGroupResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of users in the specified group @Deprecated('') - Future getGroup({ + Future> getGroup({ required final String groupId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getGroupRaw( + groupId: groupId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of users in the specified group + @Deprecated('') + DynamiteRawResponse getGroupRaw({ + required final String groupId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/groups/{groupId}'; final queryParameters = {}; final headers = { @@ -856,30 +1113,49 @@ class ProvisioningApiGroupsClient { checkPattern(groupId, RegExp(r'^.+$'), 'groupId'); // coverage:ignore-line path = path.replaceAll('{groupId}', Uri.encodeQueryComponent(groupId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsGetGroupResponseApplicationJson), - )! as ProvisioningApiGroupsGetGroupResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsGetGroupResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Update a group /// /// This endpoint requires admin access - Future updateGroup({ + Future> updateGroup({ required final String key, required final String value, required final String groupId, final bool oCSAPIRequest = true, }) async { + final rawResponse = updateGroupRaw( + key: key, + value: value, + groupId: groupId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update a group + /// + /// This endpoint requires admin access + DynamiteRawResponse updateGroupRaw({ + required final String key, + required final String value, + required final String groupId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/groups/{groupId}'; final queryParameters = {}; final headers = { @@ -909,28 +1185,43 @@ class ProvisioningApiGroupsClient { checkPattern(groupId, RegExp(r'^.+$'), 'groupId'); // coverage:ignore-line path = path.replaceAll('{groupId}', Uri.encodeQueryComponent(groupId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsUpdateGroupResponseApplicationJson), - )! as ProvisioningApiGroupsUpdateGroupResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsUpdateGroupResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Delete a group /// /// This endpoint requires admin access - Future deleteGroup({ + Future> deleteGroup({ required final String groupId, final bool oCSAPIRequest = true, }) async { + final rawResponse = deleteGroupRaw( + groupId: groupId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete a group + /// + /// This endpoint requires admin access + DynamiteRawResponse deleteGroupRaw({ + required final String groupId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/groups/{groupId}'; final queryParameters = {}; final headers = { @@ -958,19 +1249,19 @@ class ProvisioningApiGroupsClient { checkPattern(groupId, RegExp(r'^.+$'), 'groupId'); // coverage:ignore-line path = path.replaceAll('{groupId}', Uri.encodeQueryComponent(groupId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiGroupsDeleteGroupResponseApplicationJson), - )! as ProvisioningApiGroupsDeleteGroupResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiGroupsDeleteGroupResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -980,12 +1271,29 @@ class ProvisioningApiPreferencesClient { final ProvisioningApiClient _rootClient; /// Update a preference value of an app - Future setPreference({ + Future> setPreference({ required final String configValue, required final String appId, required final String configKey, final bool oCSAPIRequest = true, }) async { + final rawResponse = setPreferenceRaw( + configValue: configValue, + appId: appId, + configKey: configKey, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update a preference value of an app + DynamiteRawResponse setPreferenceRaw({ + required final String configValue, + required final String appId, + required final String configKey, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/users/{appId}/{configKey}'; final queryParameters = {}; final headers = { @@ -1014,27 +1322,42 @@ class ProvisioningApiPreferencesClient { path = path.replaceAll('{appId}', Uri.encodeQueryComponent(appId)); path = path.replaceAll('{configKey}', Uri.encodeQueryComponent(configKey)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200 || response.statusCode == 400) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiPreferencesSetPreferenceResponseApplicationJson), - )! as ProvisioningApiPreferencesSetPreferenceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200, 400}, + ), + bodyType: const FullType(ProvisioningApiPreferencesSetPreferenceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Delete a preference for an app - Future deletePreference({ + Future> deletePreference({ required final String appId, required final String configKey, final bool oCSAPIRequest = true, }) async { + final rawResponse = deletePreferenceRaw( + appId: appId, + configKey: configKey, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete a preference for an app + DynamiteRawResponse deletePreferenceRaw({ + required final String appId, + required final String configKey, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/users/{appId}/{configKey}'; final queryParameters = {}; final headers = { @@ -1062,27 +1385,44 @@ class ProvisioningApiPreferencesClient { path = path.replaceAll('{appId}', Uri.encodeQueryComponent(appId)); path = path.replaceAll('{configKey}', Uri.encodeQueryComponent(configKey)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200 || response.statusCode == 400) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiPreferencesDeletePreferenceResponseApplicationJson), - )! as ProvisioningApiPreferencesDeletePreferenceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200, 400}, + ), + bodyType: const FullType(ProvisioningApiPreferencesDeletePreferenceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Update multiple preference values of an app - Future setMultiplePreferences({ + Future> + setMultiplePreferences({ required final ContentString> configs, required final String appId, final bool oCSAPIRequest = true, }) async { + final rawResponse = setMultiplePreferencesRaw( + configs: configs, + appId: appId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update multiple preference values of an app + DynamiteRawResponse + setMultiplePreferencesRaw({ + required final ContentString> configs, + required final String appId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/users/{appId}'; final queryParameters = {}; final headers = { @@ -1115,27 +1455,44 @@ class ProvisioningApiPreferencesClient { ); path = path.replaceAll('{appId}', Uri.encodeQueryComponent(appId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200 || response.statusCode == 400) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiPreferencesSetMultiplePreferencesResponseApplicationJson), - )! as ProvisioningApiPreferencesSetMultiplePreferencesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200, 400}, + ), + bodyType: const FullType(ProvisioningApiPreferencesSetMultiplePreferencesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Delete multiple preferences for an app - Future deleteMultiplePreference({ + Future> + deleteMultiplePreference({ required final List configKeys, required final String appId, final bool oCSAPIRequest = true, }) async { + final rawResponse = deleteMultiplePreferenceRaw( + configKeys: configKeys, + appId: appId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete multiple preferences for an app + DynamiteRawResponse + deleteMultiplePreferenceRaw({ + required final List configKeys, + required final String appId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/provisioning_api/api/v1/config/users/{appId}'; final queryParameters = {}; final headers = { @@ -1163,19 +1520,19 @@ class ProvisioningApiPreferencesClient { queryParameters['configKeys[]'] = configKeys.map((final e) => e); path = path.replaceAll('{appId}', Uri.encodeQueryComponent(appId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200 || response.statusCode == 400) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiPreferencesDeleteMultiplePreferenceResponseApplicationJson), - )! as ProvisioningApiPreferencesDeleteMultiplePreferenceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200, 400}, + ), + bodyType: const FullType(ProvisioningApiPreferencesDeleteMultiplePreferenceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -1185,12 +1542,29 @@ class ProvisioningApiUsersClient { final ProvisioningApiClient _rootClient; /// Get a list of users - Future getUsers({ + Future> getUsers({ final String search = '', final int? limit, final int offset = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getUsersRaw( + search: search, + limit: limit, + offset: offset, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of users + DynamiteRawResponse getUsersRaw({ + final String search = '', + final int? limit, + final int offset = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/users'; final queryParameters = {}; final headers = { @@ -1225,23 +1599,23 @@ class ProvisioningApiUsersClient { queryParameters['offset'] = offset.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetUsersResponseApplicationJson), - )! as ProvisioningApiUsersGetUsersResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetUsersResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Create a new user - Future addUser({ + Future> addUser({ required final String userid, final String password = '', final String displayName = '', @@ -1253,6 +1627,35 @@ class ProvisioningApiUsersClient { final String? manager, final bool oCSAPIRequest = true, }) async { + final rawResponse = addUserRaw( + userid: userid, + password: password, + displayName: displayName, + email: email, + groups: groups, + subadmin: subadmin, + quota: quota, + language: language, + manager: manager, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Create a new user + DynamiteRawResponse addUserRaw({ + required final String userid, + final String password = '', + final String displayName = '', + final String email = '', + final List groups = const [], + final List subadmin = const [], + final String quota = '', + final String language = '', + final String? manager, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/users'; final queryParameters = {}; final headers = { @@ -1303,28 +1706,45 @@ class ProvisioningApiUsersClient { queryParameters['manager'] = manager; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersAddUserResponseApplicationJson), - )! as ProvisioningApiUsersAddUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersAddUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of users and their details - Future getUsersDetails({ + Future> getUsersDetails({ final String search = '', final int? limit, final int offset = 0, final bool oCSAPIRequest = true, }) async { + final rawResponse = getUsersDetailsRaw( + search: search, + limit: limit, + offset: offset, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of users and their details + DynamiteRawResponse getUsersDetailsRaw({ + final String search = '', + final int? limit, + final int offset = 0, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/users/details'; final queryParameters = {}; final headers = { @@ -1359,27 +1779,42 @@ class ProvisioningApiUsersClient { queryParameters['offset'] = offset.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetUsersDetailsResponseApplicationJson), - )! as ProvisioningApiUsersGetUsersDetailsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetUsersDetailsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Search users by their phone numbers - Future searchByPhoneNumbers({ + Future> searchByPhoneNumbers({ required final String location, required final ContentString>> search, final bool oCSAPIRequest = true, }) async { + final rawResponse = searchByPhoneNumbersRaw( + location: location, + search: search, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Search users by their phone numbers + DynamiteRawResponse searchByPhoneNumbersRaw({ + required final String location, + required final ContentString>> search, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/users/search/by-phone'; final queryParameters = {}; final headers = { @@ -1415,26 +1850,39 @@ class ProvisioningApiUsersClient { ]), ); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersSearchByPhoneNumbersResponseApplicationJson), - )! as ProvisioningApiUsersSearchByPhoneNumbersResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersSearchByPhoneNumbersResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the details of a user - Future getUser({ + Future> getUser({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getUserRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the details of a user + DynamiteRawResponse getUserRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}'; final queryParameters = {}; final headers = { @@ -1461,28 +1909,45 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetUserResponseApplicationJson), - )! as ProvisioningApiUsersGetUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Update a value of the user's details - Future editUser({ + Future> editUser({ required final String key, required final String value, required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = editUserRaw( + key: key, + value: value, + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update a value of the user's details + DynamiteRawResponse editUserRaw({ + required final String key, + required final String value, + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}'; final queryParameters = {}; final headers = { @@ -1511,26 +1976,39 @@ class ProvisioningApiUsersClient { queryParameters['value'] = value; path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersEditUserResponseApplicationJson), - )! as ProvisioningApiUsersEditUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersEditUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Delete a user - Future deleteUser({ + Future> deleteUser({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = deleteUserRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete a user + DynamiteRawResponse deleteUserRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}'; final queryParameters = {}; final headers = { @@ -1557,25 +2035,36 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersDeleteUserResponseApplicationJson), - )! as ProvisioningApiUsersDeleteUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersDeleteUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the details of the current user - Future getCurrentUser({ + Future> getCurrentUser({ final bool oCSAPIRequest = true, }) async { + final rawResponse = getCurrentUserRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the details of the current user + DynamiteRawResponse getCurrentUserRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/user'; final queryParameters = {}; final headers = { @@ -1601,25 +2090,36 @@ class ProvisioningApiUsersClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetCurrentUserResponseApplicationJson), - )! as ProvisioningApiUsersGetCurrentUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetCurrentUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of fields that are editable for the current user - Future getEditableFields({ + Future> getEditableFields({ final bool oCSAPIRequest = true, }) async { + final rawResponse = getEditableFieldsRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of fields that are editable for the current user + DynamiteRawResponse getEditableFieldsRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/cloud/user/fields'; final queryParameters = {}; final headers = { @@ -1645,26 +2145,41 @@ class ProvisioningApiUsersClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetEditableFieldsResponseApplicationJson), - )! as ProvisioningApiUsersGetEditableFieldsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetEditableFieldsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of fields that are editable for a user - Future getEditableFieldsForUser({ + Future> + getEditableFieldsForUser({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getEditableFieldsForUserRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of fields that are editable for a user + DynamiteRawResponse + getEditableFieldsForUserRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/user/fields/{userId}'; final queryParameters = {}; final headers = { @@ -1691,29 +2206,48 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetEditableFieldsForUserResponseApplicationJson), - )! as ProvisioningApiUsersGetEditableFieldsForUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetEditableFieldsForUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Update multiple values of the user's details - Future editUserMultiValue({ + Future> editUserMultiValue({ required final String key, required final String value, required final String userId, required final String collectionName, final bool oCSAPIRequest = true, }) async { + final rawResponse = editUserMultiValueRaw( + key: key, + value: value, + userId: userId, + collectionName: collectionName, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update multiple values of the user's details + DynamiteRawResponse editUserMultiValueRaw({ + required final String key, + required final String value, + required final String userId, + required final String collectionName, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/{collectionName}'; final queryParameters = {}; final headers = { @@ -1748,26 +2282,39 @@ class ProvisioningApiUsersClient { ); // coverage:ignore-line path = path.replaceAll('{collectionName}', Uri.encodeQueryComponent(collectionName)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersEditUserMultiValueResponseApplicationJson), - )! as ProvisioningApiUsersEditUserMultiValueResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersEditUserMultiValueResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Wipe all devices of a user - Future wipeUserDevices({ + Future> wipeUserDevices({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = wipeUserDevicesRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Wipe all devices of a user + DynamiteRawResponse wipeUserDevicesRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/wipe'; final queryParameters = {}; final headers = { @@ -1794,26 +2341,39 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersWipeUserDevicesResponseApplicationJson), - )! as ProvisioningApiUsersWipeUserDevicesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersWipeUserDevicesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Enable a user - Future enableUser({ + Future> enableUser({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = enableUserRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Enable a user + DynamiteRawResponse enableUserRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/enable'; final queryParameters = {}; final headers = { @@ -1840,26 +2400,39 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersEnableUserResponseApplicationJson), - )! as ProvisioningApiUsersEnableUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersEnableUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Disable a user - Future disableUser({ + Future> disableUser({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = disableUserRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Disable a user + DynamiteRawResponse disableUserRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/disable'; final queryParameters = {}; final headers = { @@ -1886,26 +2459,39 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersDisableUserResponseApplicationJson), - )! as ProvisioningApiUsersDisableUserResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersDisableUserResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a list of groups the user belongs to - Future getUsersGroups({ + Future> getUsersGroups({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getUsersGroupsRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get a list of groups the user belongs to + DynamiteRawResponse getUsersGroupsRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/groups'; final queryParameters = {}; final headers = { @@ -1932,27 +2518,42 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetUsersGroupsResponseApplicationJson), - )! as ProvisioningApiUsersGetUsersGroupsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetUsersGroupsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Add a user to a group - Future addToGroup({ + Future> addToGroup({ required final String userId, final String groupid = '', final bool oCSAPIRequest = true, }) async { + final rawResponse = addToGroupRaw( + userId: userId, + groupid: groupid, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Add a user to a group + DynamiteRawResponse addToGroupRaw({ + required final String userId, + final String groupid = '', + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/groups'; final queryParameters = {}; final headers = { @@ -1982,27 +2583,42 @@ class ProvisioningApiUsersClient { queryParameters['groupid'] = groupid; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersAddToGroupResponseApplicationJson), - )! as ProvisioningApiUsersAddToGroupResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersAddToGroupResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Remove a user from a group - Future removeFromGroup({ + Future> removeFromGroup({ required final String groupid, required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = removeFromGroupRaw( + groupid: groupid, + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Remove a user from a group + DynamiteRawResponse removeFromGroupRaw({ + required final String groupid, + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/groups'; final queryParameters = {}; final headers = { @@ -2030,28 +2646,44 @@ class ProvisioningApiUsersClient { queryParameters['groupid'] = groupid; path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersRemoveFromGroupResponseApplicationJson), - )! as ProvisioningApiUsersRemoveFromGroupResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersRemoveFromGroupResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get the groups a user is a subadmin of /// /// This endpoint requires admin access - Future getUserSubAdminGroups({ + Future> + getUserSubAdminGroups({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = getUserSubAdminGroupsRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the groups a user is a subadmin of + /// + /// This endpoint requires admin access + DynamiteRawResponse getUserSubAdminGroupsRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/subadmins'; final queryParameters = {}; final headers = { @@ -2078,29 +2710,46 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersGetUserSubAdminGroupsResponseApplicationJson), - )! as ProvisioningApiUsersGetUserSubAdminGroupsResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersGetUserSubAdminGroupsResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Make a user a subadmin of a group /// /// This endpoint requires admin access - Future addSubAdmin({ + Future> addSubAdmin({ required final String groupid, required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = addSubAdminRaw( + groupid: groupid, + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Make a user a subadmin of a group + /// + /// This endpoint requires admin access + DynamiteRawResponse addSubAdminRaw({ + required final String groupid, + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/subadmins'; final queryParameters = {}; final headers = { @@ -2128,29 +2777,46 @@ class ProvisioningApiUsersClient { queryParameters['groupid'] = groupid; path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersAddSubAdminResponseApplicationJson), - )! as ProvisioningApiUsersAddSubAdminResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersAddSubAdminResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Remove a user from the subadmins of a group /// /// This endpoint requires admin access - Future removeSubAdmin({ + Future> removeSubAdmin({ required final String groupid, required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = removeSubAdminRaw( + groupid: groupid, + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Remove a user from the subadmins of a group + /// + /// This endpoint requires admin access + DynamiteRawResponse removeSubAdminRaw({ + required final String groupid, + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/subadmins'; final queryParameters = {}; final headers = { @@ -2178,26 +2844,39 @@ class ProvisioningApiUsersClient { queryParameters['groupid'] = groupid; path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersRemoveSubAdminResponseApplicationJson), - )! as ProvisioningApiUsersRemoveSubAdminResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersRemoveSubAdminResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Resend the welcome message - Future resendWelcomeMessage({ + Future> resendWelcomeMessage({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = resendWelcomeMessageRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Resend the welcome message + DynamiteRawResponse resendWelcomeMessageRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/cloud/users/{userId}/welcome'; final queryParameters = {}; final headers = { @@ -2224,19 +2903,19 @@ class ProvisioningApiUsersClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ProvisioningApiUsersResendWelcomeMessageResponseApplicationJson), - )! as ProvisioningApiUsersResendWelcomeMessageResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ProvisioningApiUsersResendWelcomeMessageResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -7181,14 +7860,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(ProvisioningApiCapabilities_ProvisioningApi.serializer)) .build(); -Serializers get provisioningApiSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeProvisioningApi(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeProvisioningApi(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/settings.openapi.dart b/packages/nextcloud/lib/src/api/settings.openapi.dart index f2123319..00389a9d 100644 --- a/packages/nextcloud/lib/src/api/settings.openapi.dart +++ b/packages/nextcloud/lib/src/api/settings.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -45,6 +46,15 @@ class SettingsLogSettingsClient { /// /// This endpoint requires admin access Future> download() async { + final rawResponse = downloadRaw(); + + return rawResponse.future; + } + + /// download logfile + /// + /// This endpoint requires admin access + DynamiteRawResponse downloadRaw() { const path = '/index.php/settings/admin/log/download'; final queryParameters = {}; final headers = { @@ -69,22 +79,19 @@ class SettingsLogSettingsClient { } // coverage:ignore-end - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: const FullType(SettingsLogSettingsLogSettingsDownloadHeaders), + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return DynamiteResponse( - await response.bodyBytes, - _jsonSerializers.deserialize( - response.responseHeaders, - specifiedType: const FullType(SettingsLogSettingsLogSettingsDownloadHeaders), - )! as SettingsLogSettingsLogSettingsDownloadHeaders, - ); - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -176,14 +183,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(SettingsLogSettingsLogSettingsDownloadHeaders.serializer)) .build(); -Serializers get settingsSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeSettings(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeSettings(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/sharebymail.openapi.dart b/packages/nextcloud/lib/src/api/sharebymail.openapi.dart index bc71e019..79f4a197 100644 --- a/packages/nextcloud/lib/src/api/sharebymail.openapi.dart +++ b/packages/nextcloud/lib/src/api/sharebymail.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case @@ -273,14 +274,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(SharebymailCapabilities_FilesSharing_Sharebymail_ExpireDate.serializer)) .build(); -Serializers get sharebymailSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeSharebymail(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeSharebymail(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/theming.openapi.dart b/packages/nextcloud/lib/src/api/theming.openapi.dart index 55b0e313..2ce57726 100644 --- a/packages/nextcloud/lib/src/api/theming.openapi.dart +++ b/packages/nextcloud/lib/src/api/theming.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -49,7 +50,16 @@ class ThemingIconClient { final ThemingClient _rootClient; /// Return a 32x32 favicon as png - Future getFavicon({final String app = 'core'}) async { + Future> getFavicon({final String app = 'core'}) async { + final rawResponse = getFaviconRaw( + app: app, + ); + + return rawResponse.future; + } + + /// Return a 32x32 favicon as png + DynamiteRawResponse getFaviconRaw({final String app = 'core'}) { var path = '/index.php/apps/theming/favicon/{app}'; final queryParameters = {}; final headers = { @@ -73,20 +83,32 @@ class ThemingIconClient { // coverage:ignore-end path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } /// Return a 512x512 icon for touch devices - Future getTouchIcon({final String app = 'core'}) async { + Future> getTouchIcon({final String app = 'core'}) async { + final rawResponse = getTouchIconRaw( + app: app, + ); + + return rawResponse.future; + } + + /// Return a 512x512 icon for touch devices + DynamiteRawResponse getTouchIconRaw({final String app = 'core'}) { var path = '/index.php/apps/theming/icon/{app}'; final queryParameters = {}; final headers = { @@ -110,23 +132,39 @@ class ThemingIconClient { // coverage:ignore-end path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get a themed icon - Future getThemedIcon({ + Future> getThemedIcon({ required final String app, required final String image, }) async { + final rawResponse = getThemedIconRaw( + app: app, + image: image, + ); + + return rawResponse.future; + } + + /// Get a themed icon + DynamiteRawResponse getThemedIconRaw({ + required final String app, + required final String image, + }) { var path = '/index.php/apps/theming/img/{app}/{image}'; final queryParameters = {}; final headers = { @@ -152,16 +190,19 @@ class ThemingIconClient { path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); checkPattern(image, RegExp(r'^.+$'), 'image'); // coverage:ignore-line path = path.replaceAll('{image}', Uri.encodeQueryComponent(image)); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -173,11 +214,26 @@ class ThemingThemingClient { final ThemingClient _rootClient; /// Get the CSS stylesheet for a theme - Future getThemeStylesheet({ + Future> getThemeStylesheet({ required final String themeId, final int plain = 0, final int withCustomCss = 0, }) async { + final rawResponse = getThemeStylesheetRaw( + themeId: themeId, + plain: plain, + withCustomCss: withCustomCss, + ); + + return rawResponse.future; + } + + /// Get the CSS stylesheet for a theme + DynamiteRawResponse getThemeStylesheetRaw({ + required final String themeId, + final int plain = 0, + final int withCustomCss = 0, + }) { var path = '/index.php/apps/theming/theme/{themeId}.css'; final queryParameters = {}; final headers = { @@ -207,23 +263,39 @@ class ThemingThemingClient { if (withCustomCss != 0) { queryParameters['withCustomCss'] = withCustomCss.toString(); } - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.body; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(String), + headersType: null, + serializers: _jsonSerializers, + ); } /// Get an image - Future getImage({ + Future> getImage({ required final String key, final int useSvg = 1, }) async { + final rawResponse = getImageRaw( + key: key, + useSvg: useSvg, + ); + + return rawResponse.future; + } + + /// Get an image + DynamiteRawResponse getImageRaw({ + required final String key, + final int useSvg = 1, + }) { var path = '/index.php/apps/theming/image/{key}'; final queryParameters = {}; final headers = { @@ -250,20 +322,36 @@ class ThemingThemingClient { if (useSvg != 1) { queryParameters['useSvg'] = useSvg.toString(); } - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); + } + + /// Get the manifest for an app + Future> getManifest({ + required final String app, + }) async { + final rawResponse = getManifestRaw( + app: app, + ); + + return rawResponse.future; } /// Get the manifest for an app - Future getManifest({required final String app}) async { + DynamiteRawResponse getManifestRaw({ + required final String app, + }) { var path = '/index.php/apps/theming/manifest/{app}'; final queryParameters = {}; final headers = { @@ -287,19 +375,19 @@ class ThemingThemingClient { // coverage:ignore-end path = path.replaceAll('{app}', Uri.encodeQueryComponent(app)); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ThemingThemingGetManifestResponseApplicationJson), - )! as ThemingThemingGetManifestResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ThemingThemingGetManifestResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -309,7 +397,16 @@ class ThemingUserThemeClient { final ThemingClient _rootClient; /// Get the background image - Future getBackground({final bool oCSAPIRequest = true}) async { + Future> getBackground({final bool oCSAPIRequest = true}) async { + final rawResponse = getBackgroundRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the background image + DynamiteRawResponse getBackgroundRaw({final bool oCSAPIRequest = true}) { const path = '/index.php/apps/theming/background'; final queryParameters = {}; final headers = { @@ -335,25 +432,45 @@ class ThemingUserThemeClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return response.bodyBytes; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(Uint8List), + headersType: null, + serializers: _jsonSerializers, + ); } /// Set the background - Future setBackground({ + Future> setBackground({ required final String type, final String value = '', final String? color, final bool oCSAPIRequest = true, }) async { + final rawResponse = setBackgroundRaw( + type: type, + value: value, + color: color, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Set the background + DynamiteRawResponse setBackgroundRaw({ + required final String type, + final String value = '', + final String? color, + final bool oCSAPIRequest = true, + }) { var path = '/index.php/apps/theming/background/{type}'; final queryParameters = {}; final headers = { @@ -386,21 +503,32 @@ class ThemingUserThemeClient { queryParameters['color'] = color; } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(ThemingBackground))! - as ThemingBackground; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ThemingBackground), + headersType: null, + serializers: _jsonSerializers, + ); } /// Delete the background - Future deleteBackground({final bool oCSAPIRequest = true}) async { + Future> deleteBackground({final bool oCSAPIRequest = true}) async { + final rawResponse = deleteBackgroundRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Delete the background + DynamiteRawResponse deleteBackgroundRaw({final bool oCSAPIRequest = true}) { const path = '/index.php/apps/theming/background/custom'; final queryParameters = {}; final headers = { @@ -426,24 +554,39 @@ class ThemingUserThemeClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize(await response.jsonBody, specifiedType: const FullType(ThemingBackground))! - as ThemingBackground; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ThemingBackground), + headersType: null, + serializers: _jsonSerializers, + ); } /// Enable theme - Future enableTheme({ + Future> enableTheme({ required final String themeId, final bool oCSAPIRequest = true, }) async { + final rawResponse = enableThemeRaw( + themeId: themeId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Enable theme + DynamiteRawResponse enableThemeRaw({ + required final String themeId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/theming/api/v1/theme/{themeId}/enable'; final queryParameters = {}; final headers = { @@ -470,26 +613,39 @@ class ThemingUserThemeClient { // coverage:ignore-end path = path.replaceAll('{themeId}', Uri.encodeQueryComponent(themeId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ThemingUserThemeEnableThemeResponseApplicationJson), - )! as ThemingUserThemeEnableThemeResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ThemingUserThemeEnableThemeResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } /// Disable theme - Future disableTheme({ + Future> disableTheme({ required final String themeId, final bool oCSAPIRequest = true, }) async { + final rawResponse = disableThemeRaw( + themeId: themeId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Disable theme + DynamiteRawResponse disableThemeRaw({ + required final String themeId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/theming/api/v1/theme/{themeId}'; final queryParameters = {}; final headers = { @@ -516,19 +672,19 @@ class ThemingUserThemeClient { // coverage:ignore-end path = path.replaceAll('{themeId}', Uri.encodeQueryComponent(themeId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, - ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(ThemingUserThemeDisableThemeResponseApplicationJson), - )! as ThemingUserThemeDisableThemeResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(ThemingUserThemeDisableThemeResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, + ); } } @@ -941,14 +1097,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(ThemingPublicCapabilities_Theming.serializer)) .build(); -Serializers get themingSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeTheming(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeTheming(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/updatenotification.openapi.dart b/packages/nextcloud/lib/src/api/updatenotification.openapi.dart index 10d4f71e..52e28318 100644 --- a/packages/nextcloud/lib/src/api/updatenotification.openapi.dart +++ b/packages/nextcloud/lib/src/api/updatenotification.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -45,11 +46,28 @@ class UpdatenotificationApiClient { /// List available updates for apps /// /// This endpoint requires admin access - Future getAppList({ + Future> getAppList({ required final String newVersion, final UpdatenotificationApiGetAppListApiVersion apiVersion = UpdatenotificationApiGetAppListApiVersion.v1, final bool oCSAPIRequest = true, }) async { + final rawResponse = getAppListRaw( + newVersion: newVersion, + apiVersion: apiVersion, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// List available updates for apps + /// + /// This endpoint requires admin access + DynamiteRawResponse getAppListRaw({ + required final String newVersion, + final UpdatenotificationApiGetAppListApiVersion apiVersion = UpdatenotificationApiGetAppListApiVersion.v1, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/updatenotification/api/{apiVersion}/applist/{newVersion}'; final queryParameters = {}; final headers = { @@ -77,19 +95,19 @@ class UpdatenotificationApiClient { path = path.replaceAll('{newVersion}', Uri.encodeQueryComponent(newVersion)); path = path.replaceAll('{apiVersion}', Uri.encodeQueryComponent(apiVersion.name)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UpdatenotificationApiGetAppListResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UpdatenotificationApiGetAppListResponseApplicationJson), - )! as UpdatenotificationApiGetAppListResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -305,15 +323,8 @@ final Serializers _serializers = (Serializers().toBuilder() )) .build(); -Serializers get updatenotificationSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeUpdatenotification(final Object data) => - _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeUpdatenotification(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/uppush.openapi.dart b/packages/nextcloud/lib/src/api/uppush.openapi.dart index 6a766bf2..55976672 100644 --- a/packages/nextcloud/lib/src/api/uppush.openapi.dart +++ b/packages/nextcloud/lib/src/api/uppush.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -35,7 +36,14 @@ class UppushClient extends DynamiteClient { ); /// Check if the UnifiedPush provider is present - Future check() async { + Future> check() async { + final rawResponse = checkRaw(); + + return rawResponse.future; + } + + /// Check if the UnifiedPush provider is present + DynamiteRawResponse checkRaw() { const path = '/index.php/apps/uppush'; final queryParameters = {}; final headers = { @@ -60,25 +68,38 @@ class UppushClient extends DynamiteClient { } // coverage:ignore-end - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushCheckResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushCheckResponseApplicationJson), - )! as UppushCheckResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Set keepalive interval /// /// This endpoint requires admin access - Future setKeepalive({required final int keepalive}) async { + Future> setKeepalive({ + required final int keepalive, + }) async { + final rawResponse = setKeepaliveRaw( + keepalive: keepalive, + ); + + return rawResponse.future; + } + + /// Set keepalive interval + /// + /// This endpoint requires admin access + DynamiteRawResponse setKeepaliveRaw({required final int keepalive}) { const path = '/index.php/apps/uppush/keepalive'; final queryParameters = {}; final headers = { @@ -104,23 +125,36 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end queryParameters['keepalive'] = keepalive.toString(); - final response = await doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushSetKeepaliveResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushSetKeepaliveResponseApplicationJson), - )! as UppushSetKeepaliveResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Request to create a new deviceId - Future createDevice({required final String deviceName}) async { + Future> createDevice({ + required final String deviceName, + }) async { + final rawResponse = createDeviceRaw( + deviceName: deviceName, + ); + + return rawResponse.future; + } + + /// Request to create a new deviceId + DynamiteRawResponse createDeviceRaw({ + required final String deviceName, + }) { const path = '/index.php/apps/uppush/device'; final queryParameters = {}; final headers = { @@ -146,25 +180,38 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end queryParameters['deviceName'] = deviceName; - final response = await doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushCreateDeviceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushCreateDeviceResponseApplicationJson), - )! as UppushCreateDeviceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Request to get push messages /// /// This is a public page since it has to be handle by the non-connected app (NextPush app and not Nextcloud-app) - Future syncDevice({required final String deviceId}) async { + Future> syncDevice({ + required final String deviceId, + }) async { + final rawResponse = syncDeviceRaw( + deviceId: deviceId, + ); + + return rawResponse.future; + } + + /// Request to get push messages + /// + /// This is a public page since it has to be handle by the non-connected app (NextPush app and not Nextcloud-app) + DynamiteRawResponse syncDeviceRaw({required final String deviceId}) { var path = '/index.php/apps/uppush/device/{deviceId}'; final queryParameters = {}; final headers = { @@ -190,23 +237,36 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{deviceId}', Uri.encodeQueryComponent(deviceId)); - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {401}, + ), + bodyType: const FullType(UppushSyncDeviceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 401) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushSyncDeviceResponseApplicationJson), - )! as UppushSyncDeviceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Delete a device - Future deleteDevice({required final String deviceId}) async { + Future> deleteDevice({ + required final String deviceId, + }) async { + final rawResponse = deleteDeviceRaw( + deviceId: deviceId, + ); + + return rawResponse.future; + } + + /// Delete a device + DynamiteRawResponse deleteDeviceRaw({ + required final String deviceId, + }) { var path = '/index.php/apps/uppush/device/{deviceId}'; final queryParameters = {}; final headers = { @@ -232,26 +292,39 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{deviceId}', Uri.encodeQueryComponent(deviceId)); - final response = await doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushDeleteDeviceResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushDeleteDeviceResponseApplicationJson), - )! as UppushDeleteDeviceResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Create an authorization token for a new 3rd party service - Future createApp({ + Future> createApp({ required final String deviceId, required final String appName, }) async { + final rawResponse = createAppRaw( + deviceId: deviceId, + appName: appName, + ); + + return rawResponse.future; + } + + /// Create an authorization token for a new 3rd party service + DynamiteRawResponse createAppRaw({ + required final String deviceId, + required final String appName, + }) { const path = '/index.php/apps/uppush/app'; final queryParameters = {}; final headers = { @@ -278,23 +351,34 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end queryParameters['deviceId'] = deviceId; queryParameters['appName'] = appName; - final response = await doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushCreateAppResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushCreateAppResponseApplicationJson), - )! as UppushCreateAppResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Delete an authorization token - Future deleteApp({required final String token}) async { + Future> deleteApp({ + required final String token, + }) async { + final rawResponse = deleteAppRaw( + token: token, + ); + + return rawResponse.future; + } + + /// Delete an authorization token + DynamiteRawResponse deleteAppRaw({required final String token}) { var path = '/index.php/apps/uppush/app/{token}'; final queryParameters = {}; final headers = { @@ -320,23 +404,36 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{token}', Uri.encodeQueryComponent(token)); - final response = await doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushDeleteAppResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushDeleteAppResponseApplicationJson), - )! as UppushDeleteAppResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Unifiedpush discovery Following specifications - Future unifiedpushDiscovery({required final String token}) async { + Future> unifiedpushDiscovery({ + required final String token, + }) async { + final rawResponse = unifiedpushDiscoveryRaw( + token: token, + ); + + return rawResponse.future; + } + + /// Unifiedpush discovery Following specifications + DynamiteRawResponse unifiedpushDiscoveryRaw({ + required final String token, + }) { var path = '/index.php/apps/uppush/push/{token}'; final queryParameters = {}; final headers = { @@ -362,23 +459,32 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{token}', Uri.encodeQueryComponent(token)); - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushUnifiedpushDiscoveryResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushUnifiedpushDiscoveryResponseApplicationJson), - )! as UppushUnifiedpushDiscoveryResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Receive notifications from 3rd parties - Future push({required final String token}) async { + Future> push({required final String token}) async { + final rawResponse = pushRaw( + token: token, + ); + + return rawResponse.future; + } + + /// Receive notifications from 3rd parties + DynamiteRawResponse pushRaw({required final String token}) { var path = '/index.php/apps/uppush/push/{token}'; final queryParameters = {}; final headers = { @@ -404,23 +510,30 @@ class UppushClient extends DynamiteClient { // coverage:ignore-end path = path.replaceAll('{token}', Uri.encodeQueryComponent(token)); - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {201}, + ), + bodyType: const FullType(UppushPushResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 201) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushPushResponseApplicationJson), - )! as UppushPushResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Matrix Gateway discovery - Future gatewayMatrixDiscovery() async { + Future> gatewayMatrixDiscovery() async { + final rawResponse = gatewayMatrixDiscoveryRaw(); + + return rawResponse.future; + } + + /// Matrix Gateway discovery + DynamiteRawResponse gatewayMatrixDiscoveryRaw() { const path = '/index.php/apps/uppush/gateway/matrix'; final queryParameters = {}; final headers = { @@ -445,23 +558,30 @@ class UppushClient extends DynamiteClient { } // coverage:ignore-end - final response = await doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushGatewayMatrixDiscoveryResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushGatewayMatrixDiscoveryResponseApplicationJson), - )! as UppushGatewayMatrixDiscoveryResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Matrix Gateway - Future gatewayMatrix() async { + Future> gatewayMatrix() async { + final rawResponse = gatewayMatrixRaw(); + + return rawResponse.future; + } + + /// Matrix Gateway + DynamiteRawResponse gatewayMatrixRaw() { const path = '/index.php/apps/uppush/gateway/matrix'; final queryParameters = {}; final headers = { @@ -486,19 +606,19 @@ class UppushClient extends DynamiteClient { } // coverage:ignore-end - final response = await doRequest( - 'post', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: doRequest( + 'post', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UppushGatewayMatrixResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UppushGatewayMatrixResponseApplicationJson), - )! as UppushGatewayMatrixResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -1011,14 +1131,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), ListBuilder.new)) .build(); -Serializers get uppushSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeUppush(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeUppush(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/user_status.openapi.dart b/packages/nextcloud/lib/src/api/user_status.openapi.dart index 33416074..2c56063c 100644 --- a/packages/nextcloud/lib/src/api/user_status.openapi.dart +++ b/packages/nextcloud/lib/src/api/user_status.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -50,10 +51,23 @@ class UserStatusHeartbeatClient { final UserStatusClient _rootClient; /// Keep the status alive - Future heartbeat({ + Future> heartbeat({ required final String status, final bool oCSAPIRequest = true, }) async { + final rawResponse = heartbeatRaw( + status: status, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Keep the status alive + DynamiteRawResponse heartbeatRaw({ + required final String status, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/heartbeat'; final queryParameters = {}; final headers = { @@ -80,19 +94,19 @@ class UserStatusHeartbeatClient { // coverage:ignore-end queryParameters['status'] = status; headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusHeartbeatHeartbeatResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusHeartbeatHeartbeatResponseApplicationJson), - )! as UserStatusHeartbeatHeartbeatResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -102,7 +116,20 @@ class UserStatusPredefinedStatusClient { final UserStatusClient _rootClient; /// Get all predefined messages - Future findAll({final bool oCSAPIRequest = true}) async { + Future> findAll({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = findAllRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get all predefined messages + DynamiteRawResponse findAllRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/predefined_statuses'; final queryParameters = {}; final headers = { @@ -128,19 +155,19 @@ class UserStatusPredefinedStatusClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusPredefinedStatusFindAllResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusPredefinedStatusFindAllResponseApplicationJson), - )! as UserStatusPredefinedStatusFindAllResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -150,11 +177,26 @@ class UserStatusStatusesClient { final UserStatusClient _rootClient; /// Find statuses of users - Future findAll({ + Future> findAll({ final int? limit, final int? offset, final bool oCSAPIRequest = true, }) async { + final rawResponse = findAllRaw( + limit: limit, + offset: offset, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Find statuses of users + DynamiteRawResponse findAllRaw({ + final int? limit, + final int? offset, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/statuses'; final queryParameters = {}; final headers = { @@ -186,26 +228,39 @@ class UserStatusStatusesClient { queryParameters['offset'] = offset.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusStatusesFindAllResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusStatusesFindAllResponseApplicationJson), - )! as UserStatusStatusesFindAllResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Find the status of a user - Future find({ + Future> find({ required final String userId, final bool oCSAPIRequest = true, }) async { + final rawResponse = findRaw( + userId: userId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Find the status of a user + DynamiteRawResponse findRaw({ + required final String userId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/user_status/api/v1/statuses/{userId}'; final queryParameters = {}; final headers = { @@ -232,19 +287,19 @@ class UserStatusStatusesClient { // coverage:ignore-end path = path.replaceAll('{userId}', Uri.encodeQueryComponent(userId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusStatusesFindResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusStatusesFindResponseApplicationJson), - )! as UserStatusStatusesFindResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -254,7 +309,20 @@ class UserStatusUserStatusClient { final UserStatusClient _rootClient; /// Get the status of the current user - Future getStatus({final bool oCSAPIRequest = true}) async { + Future> getStatus({ + final bool oCSAPIRequest = true, + }) async { + final rawResponse = getStatusRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get the status of the current user + DynamiteRawResponse getStatusRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/user_status'; final queryParameters = {}; final headers = { @@ -280,26 +348,39 @@ class UserStatusUserStatusClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusUserStatusGetStatusResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusUserStatusGetStatusResponseApplicationJson), - )! as UserStatusUserStatusGetStatusResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Update the status type of the current user - Future setStatus({ + Future> setStatus({ required final String statusType, final bool oCSAPIRequest = true, }) async { + final rawResponse = setStatusRaw( + statusType: statusType, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Update the status type of the current user + DynamiteRawResponse setStatusRaw({ + required final String statusType, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/user_status/status'; final queryParameters = {}; final headers = { @@ -326,27 +407,42 @@ class UserStatusUserStatusClient { // coverage:ignore-end queryParameters['statusType'] = statusType; headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusUserStatusSetStatusResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusUserStatusSetStatusResponseApplicationJson), - )! as UserStatusUserStatusSetStatusResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Set the message to a predefined message for the current user - Future setPredefinedMessage({ + Future> setPredefinedMessage({ required final String messageId, final int? clearAt, final bool oCSAPIRequest = true, }) async { + final rawResponse = setPredefinedMessageRaw( + messageId: messageId, + clearAt: clearAt, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Set the message to a predefined message for the current user + DynamiteRawResponse setPredefinedMessageRaw({ + required final String messageId, + final int? clearAt, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/user_status/message/predefined'; final queryParameters = {}; final headers = { @@ -376,28 +472,45 @@ class UserStatusUserStatusClient { queryParameters['clearAt'] = clearAt.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusUserStatusSetPredefinedMessageResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusUserStatusSetPredefinedMessageResponseApplicationJson), - )! as UserStatusUserStatusSetPredefinedMessageResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Set the message to a custom message for the current user - Future setCustomMessage({ + Future> setCustomMessage({ final String? statusIcon, final String? message, final int? clearAt, final bool oCSAPIRequest = true, }) async { + final rawResponse = setCustomMessageRaw( + statusIcon: statusIcon, + message: message, + clearAt: clearAt, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Set the message to a custom message for the current user + DynamiteRawResponse setCustomMessageRaw({ + final String? statusIcon, + final String? message, + final int? clearAt, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/user_status/message/custom'; final queryParameters = {}; final headers = { @@ -432,25 +545,36 @@ class UserStatusUserStatusClient { queryParameters['clearAt'] = clearAt.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusUserStatusSetCustomMessageResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusUserStatusSetCustomMessageResponseApplicationJson), - )! as UserStatusUserStatusSetCustomMessageResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Clear the message of the current user - Future clearMessage({ + Future> clearMessage({ final bool oCSAPIRequest = true, }) async { + final rawResponse = clearMessageRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Clear the message of the current user + DynamiteRawResponse clearMessageRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/user_status/api/v1/user_status/message'; final queryParameters = {}; final headers = { @@ -476,26 +600,39 @@ class UserStatusUserStatusClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusUserStatusClearMessageResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusUserStatusClearMessageResponseApplicationJson), - )! as UserStatusUserStatusClearMessageResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Revert the status to the previous status - Future revertStatus({ + Future> revertStatus({ required final String messageId, final bool oCSAPIRequest = true, }) async { + final rawResponse = revertStatusRaw( + messageId: messageId, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Revert the status to the previous status + DynamiteRawResponse revertStatusRaw({ + required final String messageId, + final bool oCSAPIRequest = true, + }) { var path = '/ocs/v2.php/apps/user_status/api/v1/user_status/revert/{messageId}'; final queryParameters = {}; final headers = { @@ -522,19 +659,19 @@ class UserStatusUserStatusClient { // coverage:ignore-end path = path.replaceAll('{messageId}', Uri.encodeQueryComponent(messageId)); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'delete', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'delete', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(UserStatusUserStatusRevertStatusResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(UserStatusUserStatusRevertStatusResponseApplicationJson), - )! as UserStatusUserStatusRevertStatusResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -1762,14 +1899,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(UserStatusCapabilities_UserStatus.serializer)) .build(); -Serializers get userStatusSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeUserStatus(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeUserStatus(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/api/weather_status.openapi.dart b/packages/nextcloud/lib/src/api/weather_status.openapi.dart index 5c328256..a01f6a5b 100644 --- a/packages/nextcloud/lib/src/api/weather_status.openapi.dart +++ b/packages/nextcloud/lib/src/api/weather_status.openapi.dart @@ -1,4 +1,5 @@ // ignore_for_file: camel_case_types +// ignore_for_file: discarded_futures // ignore_for_file: public_member_api_docs // ignore_for_file: unreachable_switch_case import 'dart:typed_data'; @@ -43,10 +44,23 @@ class WeatherStatusWeatherStatusClient { final WeatherStatusClient _rootClient; /// Change the weather status mode. There are currently 2 modes: - ask the browser - use the user defined address - Future setMode({ + Future> setMode({ required final int mode, final bool oCSAPIRequest = true, }) async { + final rawResponse = setModeRaw( + mode: mode, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Change the weather status mode. There are currently 2 modes: - ask the browser - use the user defined address + DynamiteRawResponse setModeRaw({ + required final int mode, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/weather_status/api/v1/mode'; final queryParameters = {}; final headers = { @@ -73,25 +87,35 @@ class WeatherStatusWeatherStatusClient { // coverage:ignore-end queryParameters['mode'] = mode.toString(); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(WeatherStatusWeatherStatusSetModeResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(WeatherStatusWeatherStatusSetModeResponseApplicationJson), - )! as WeatherStatusWeatherStatusSetModeResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Try to use the address set in user personal settings as weather location - Future usePersonalAddress({ + Future> + usePersonalAddress({final bool oCSAPIRequest = true}) async { + final rawResponse = usePersonalAddressRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Try to use the address set in user personal settings as weather location + DynamiteRawResponse usePersonalAddressRaw({ final bool oCSAPIRequest = true, - }) async { + }) { const path = '/ocs/v2.php/apps/weather_status/api/v1/use-personal'; final queryParameters = {}; final headers = { @@ -117,25 +141,36 @@ class WeatherStatusWeatherStatusClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(WeatherStatusWeatherStatusUsePersonalAddressResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(WeatherStatusWeatherStatusUsePersonalAddressResponseApplicationJson), - )! as WeatherStatusWeatherStatusUsePersonalAddressResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get stored user location - Future getLocation({ + Future> getLocation({ final bool oCSAPIRequest = true, }) async { + final rawResponse = getLocationRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get stored user location + DynamiteRawResponse getLocationRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/weather_status/api/v1/location'; final queryParameters = {}; final headers = { @@ -161,28 +196,45 @@ class WeatherStatusWeatherStatusClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(WeatherStatusWeatherStatusGetLocationResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(WeatherStatusWeatherStatusGetLocationResponseApplicationJson), - )! as WeatherStatusWeatherStatusGetLocationResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Set address and resolve it to get coordinates or directly set coordinates and get address with reverse geocoding - Future setLocation({ + Future> setLocation({ final String? address, final num? lat, final num? lon, final bool oCSAPIRequest = true, }) async { + final rawResponse = setLocationRaw( + address: address, + lat: lat, + lon: lon, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Set address and resolve it to get coordinates or directly set coordinates and get address with reverse geocoding + DynamiteRawResponse setLocationRaw({ + final String? address, + final num? lat, + final num? lon, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/weather_status/api/v1/location'; final queryParameters = {}; final headers = { @@ -217,25 +269,36 @@ class WeatherStatusWeatherStatusClient { queryParameters['lon'] = lon.toString(); } headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(WeatherStatusWeatherStatusSetLocationResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(WeatherStatusWeatherStatusSetLocationResponseApplicationJson), - )! as WeatherStatusWeatherStatusSetLocationResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get forecast for current location - Future getForecast({ + Future> getForecast({ final bool oCSAPIRequest = true, }) async { + final rawResponse = getForecastRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get forecast for current location + DynamiteRawResponse getForecastRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/weather_status/api/v1/forecast'; final queryParameters = {}; final headers = { @@ -261,25 +324,36 @@ class WeatherStatusWeatherStatusClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(WeatherStatusWeatherStatusGetForecastResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(WeatherStatusWeatherStatusGetForecastResponseApplicationJson), - )! as WeatherStatusWeatherStatusGetForecastResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Get favorites list - Future getFavorites({ + Future> getFavorites({ final bool oCSAPIRequest = true, }) async { + final rawResponse = getFavoritesRaw( + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Get favorites list + DynamiteRawResponse getFavoritesRaw({ + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/weather_status/api/v1/favorites'; final queryParameters = {}; final headers = { @@ -305,26 +379,39 @@ class WeatherStatusWeatherStatusClient { // coverage:ignore-end headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'get', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'get', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(WeatherStatusWeatherStatusGetFavoritesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(WeatherStatusWeatherStatusGetFavoritesResponseApplicationJson), - )! as WeatherStatusWeatherStatusGetFavoritesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } /// Set favorites list - Future setFavorites({ + Future> setFavorites({ required final List favorites, final bool oCSAPIRequest = true, }) async { + final rawResponse = setFavoritesRaw( + favorites: favorites, + oCSAPIRequest: oCSAPIRequest, + ); + + return rawResponse.future; + } + + /// Set favorites list + DynamiteRawResponse setFavoritesRaw({ + required final List favorites, + final bool oCSAPIRequest = true, + }) { const path = '/ocs/v2.php/apps/weather_status/api/v1/favorites'; final queryParameters = {}; final headers = { @@ -351,19 +438,19 @@ class WeatherStatusWeatherStatusClient { // coverage:ignore-end queryParameters['favorites[]'] = favorites.map((final e) => e); headers['OCS-APIRequest'] = oCSAPIRequest.toString(); - final response = await _rootClient.doRequest( - 'put', - Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null), - headers, - body, + final uri = Uri(path: path, queryParameters: queryParameters.isNotEmpty ? queryParameters : null); + return DynamiteRawResponse( + response: _rootClient.doRequest( + 'put', + uri, + headers, + body, + const {200}, + ), + bodyType: const FullType(WeatherStatusWeatherStatusSetFavoritesResponseApplicationJson), + headersType: null, + serializers: _jsonSerializers, ); - if (response.statusCode == 200) { - return _jsonSerializers.deserialize( - await response.jsonBody, - specifiedType: const FullType(WeatherStatusWeatherStatusSetFavoritesResponseApplicationJson), - )! as WeatherStatusWeatherStatusSetFavoritesResponseApplicationJson; - } - throw await DynamiteApiException.fromResponse(response); // coverage:ignore-line } } @@ -1813,14 +1900,8 @@ final Serializers _serializers = (Serializers().toBuilder() ..add(WeatherStatusCapabilities_WeatherStatus.serializer)) .build(); -Serializers get weatherStatusSerializers => _serializers; - final Serializers _jsonSerializers = (_serializers.toBuilder() ..addPlugin(StandardJsonPlugin()) ..addPlugin(const ContentStringPlugin())) .build(); - -T deserializeWeatherStatus(final Object data) => _serializers.deserialize(data, specifiedType: FullType(T))! as T; - -Object? serializeWeatherStatus(final T data) => _serializers.serialize(data, specifiedType: FullType(T)); // coverage:ignore-end diff --git a/packages/nextcloud/lib/src/client.dart b/packages/nextcloud/lib/src/client.dart index be53fd5a..c42c66ca 100644 --- a/packages/nextcloud/lib/src/client.dart +++ b/packages/nextcloud/lib/src/client.dart @@ -1,6 +1,3 @@ -import 'package:built_value/serializer.dart'; -import 'package:built_value/standard_json_plugin.dart'; -import 'package:dynamite_runtime/content_string.dart'; import 'package:nextcloud/nextcloud.dart'; // ignore: public_member_api_docs @@ -123,44 +120,3 @@ class NextcloudClient extends DynamiteClient { /// Client for the weather status APIs WeatherStatusClient get weatherStatus => _weatherStatus ??= WeatherStatusClient.fromClient(this); } - -// coverage:ignore-start - -// ignore: public_member_api_docs -final serializers = Serializers.merge([ - commentsSerializers, - coreSerializers, - dashboardSerializers, - davSerializers, - filesSerializers, - filesExternalSerializers, - filesRemindersSerializers, - filesSharingSerializers, - filesTrashbinSerializers, - filesVersionsSerializers, - newsSerializers, - notesSerializers, - notificationsSerializers, - provisioningApiSerializers, - settingsSerializers, - sharebymailSerializers, - themingSerializers, - updatenotificationSerializers, - uppushSerializers, - userStatusSerializers, - weatherStatusSerializers, -]); - -// ignore: public_member_api_docs -final Serializers jsonSerializers = (serializers.toBuilder() - ..addPlugin(StandardJsonPlugin()) - ..addPlugin(const ContentStringPlugin())) - .build(); - -// ignore: public_member_api_docs -T deserializeNextcloud(final Object data) => serializers.deserialize(data, specifiedType: FullType(T))! as T; - -// ignore: public_member_api_docs -Object? serializeNextcloud(final T data) => serializers.serialize(data, specifiedType: FullType(T)); - -// coverage:ignore-end diff --git a/packages/nextcloud/lib/src/version_supported.dart b/packages/nextcloud/lib/src/version_supported.dart index 4cf736fb..61008f20 100644 --- a/packages/nextcloud/lib/src/version_supported.dart +++ b/packages/nextcloud/lib/src/version_supported.dart @@ -35,9 +35,9 @@ extension NewsVersionSupported on NewsClient { /// /// Also returns the supported API version number Future<(bool, String)> isSupported() async { - final versions = await getSupportedApiVersions(); + final response = await getSupportedApiVersions(); return ( - versions.apiLevels!.contains(newsSupportedVersion), + response.body.apiLevels!.contains(newsSupportedVersion), newsSupportedVersion, ); } diff --git a/packages/nextcloud/lib/src/webdav/client.dart b/packages/nextcloud/lib/src/webdav/client.dart index 10114b8b..a7dd64d3 100644 --- a/packages/nextcloud/lib/src/webdav/client.dart +++ b/packages/nextcloud/lib/src/webdav/client.dart @@ -53,7 +53,7 @@ class WebDavClient { throw DynamiteApiException( response.statusCode, response.responseHeaders, - await response.body, + await response.string, ); } @@ -82,7 +82,7 @@ class WebDavClient { } Future _parseResponse(final HttpClientResponse response) async => - WebDavMultistatus.fromXmlElement(xml.XmlDocument.parse(await response.body).rootElement); + WebDavMultistatus.fromXmlElement(xml.XmlDocument.parse(await response.string).rootElement); Map _getUploadHeaders({ required final DateTime? lastModified, @@ -205,7 +205,7 @@ class WebDavClient { ); /// Gets the content of the file at [path]. - Future get(final Uri path) async => (await getStream(path)).bodyBytes; + Future get(final Uri path) async => (await getStream(path)).bytes; /// Gets the content of the file at [path]. Future getStream(final Uri path) async => _send( diff --git a/packages/nextcloud/test/core_test.dart b/packages/nextcloud/test/core_test.dart index 3e99b608..5f4a6326 100644 --- a/packages/nextcloud/test/core_test.dart +++ b/packages/nextcloud/test/core_test.dart @@ -19,55 +19,72 @@ void main() { tearDown(() => container.destroy()); test('Is supported from capabilities', () async { - final (supported, _) = client.core.isSupported((await client.core.ocs.getCapabilities()).ocs.data); + final response = await client.core.ocs.getCapabilities(); + + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final (supported, _) = client.core.isSupported(response.body.ocs.data); expect(supported, isTrue); }); test('Is supported from status', () async { - final status = await client.core.getStatus(); - expect(status.isSupported, isTrue); + final response = await client.core.getStatus(); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.isSupported, isTrue); }); test('Get status', () async { - final status = await client.core.getStatus(); - expect(status.installed, true); - expect(status.maintenance, false); - expect(status.needsDbUpgrade, false); - expect(status.version, startsWith('$coreSupportedVersion.')); - expect(status.versionstring, startsWith('$coreSupportedVersion.')); - expect(status.edition, ''); - expect(status.productname, 'Nextcloud'); - expect(status.extendedSupport, false); + final response = await client.core.getStatus(); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.installed, isTrue); + expect(response.body.maintenance, isFalse); + expect(response.body.needsDbUpgrade, isFalse); + expect(response.body.version, startsWith('$coreSupportedVersion.')); + expect(response.body.versionstring, startsWith('$coreSupportedVersion.')); + expect(response.body.edition, ''); + expect(response.body.productname, 'Nextcloud'); + expect(response.body.extendedSupport, isFalse); }); test('Get capabilities', () async { - final capabilities = await client.core.ocs.getCapabilities(); - expect(capabilities.ocs.data.version.major, coreSupportedVersion); - expect(capabilities.ocs.data.version.string, startsWith('$coreSupportedVersion.')); - expect(capabilities.ocs.data.capabilities.commentsCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.davCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.filesCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.filesSharingCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.filesTrashbinCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.filesVersionsCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.notesCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.notificationsCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.provisioningApiCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.sharebymailCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.themingPublicCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.userStatusCapabilities, isNotNull); - expect(capabilities.ocs.data.capabilities.weatherStatusCapabilities, isNotNull); + final response = await client.core.ocs.getCapabilities(); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.version.major, coreSupportedVersion); + expect(response.body.ocs.data.version.string, startsWith('$coreSupportedVersion.')); + expect(response.body.ocs.data.capabilities.commentsCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.davCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.filesCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.filesSharingCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.filesTrashbinCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.filesVersionsCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.notesCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.notificationsCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.provisioningApiCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.sharebymailCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.themingPublicCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.userStatusCapabilities, isNotNull); + expect(response.body.ocs.data.capabilities.weatherStatusCapabilities, isNotNull); }); test('Get navigation apps', () async { - final navigationApps = await client.core.navigation.getAppsNavigation(); - expect(navigationApps.ocs.data, hasLength(6)); - expect(navigationApps.ocs.data[0].id, 'dashboard'); - expect(navigationApps.ocs.data[1].id, 'files'); - expect(navigationApps.ocs.data[2].id, 'photos'); - expect(navigationApps.ocs.data[3].id, 'activity'); - expect(navigationApps.ocs.data[4].id, 'notes'); - expect(navigationApps.ocs.data[5].id, 'news'); + final response = await client.core.navigation.getAppsNavigation(); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + expect(response.body.ocs.data, hasLength(6)); + + expect(response.body.ocs.data[0].id, 'dashboard'); + expect(response.body.ocs.data[1].id, 'files'); + expect(response.body.ocs.data[2].id, 'photos'); + expect(response.body.ocs.data[3].id, 'activity'); + expect(response.body.ocs.data[4].id, 'notes'); + expect(response.body.ocs.data[5].id, 'news'); }); test( @@ -82,48 +99,53 @@ void main() { ShareType.group.index, ], ); - expect(response.ocs.data, hasLength(3)); - - expect(response.ocs.data[0].id, 'admin'); - expect(response.ocs.data[0].label, 'admin'); - expect(response.ocs.data[0].icon, 'icon-user'); - expect(response.ocs.data[0].source, 'users'); - expect(response.ocs.data[0].status, isEmpty); - expect(response.ocs.data[0].subline, ''); - expect(response.ocs.data[0].shareWithDisplayNameUnique, 'admin@example.com'); - - expect(response.ocs.data[1].id, 'user2'); - expect(response.ocs.data[1].label, 'User Two'); - expect(response.ocs.data[1].icon, 'icon-user'); - expect(response.ocs.data[1].source, 'users'); - expect(response.ocs.data[1].status, isEmpty); - expect(response.ocs.data[1].subline, ''); - expect(response.ocs.data[1].shareWithDisplayNameUnique, 'user2'); - - expect(response.ocs.data[2].id, 'admin'); - expect(response.ocs.data[2].label, 'admin'); - expect(response.ocs.data[2].icon, ''); - expect(response.ocs.data[2].source, 'groups'); - expect(response.ocs.data[2].status, isEmpty); - expect(response.ocs.data[2].subline, ''); - expect(response.ocs.data[2].shareWithDisplayNameUnique, ''); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + expect(response.body.ocs.data, hasLength(3)); + + expect(response.body.ocs.data[0].id, 'admin'); + expect(response.body.ocs.data[0].label, 'admin'); + expect(response.body.ocs.data[0].icon, 'icon-user'); + expect(response.body.ocs.data[0].source, 'users'); + expect(response.body.ocs.data[0].status, isEmpty); + expect(response.body.ocs.data[0].subline, ''); + expect(response.body.ocs.data[0].shareWithDisplayNameUnique, 'admin@example.com'); + + expect(response.body.ocs.data[1].id, 'user2'); + expect(response.body.ocs.data[1].label, 'User Two'); + expect(response.body.ocs.data[1].icon, 'icon-user'); + expect(response.body.ocs.data[1].source, 'users'); + expect(response.body.ocs.data[1].status, isEmpty); + expect(response.body.ocs.data[1].subline, ''); + expect(response.body.ocs.data[1].shareWithDisplayNameUnique, 'user2'); + + expect(response.body.ocs.data[2].id, 'admin'); + expect(response.body.ocs.data[2].label, 'admin'); + expect(response.body.ocs.data[2].icon, ''); + expect(response.body.ocs.data[2].source, 'groups'); + expect(response.body.ocs.data[2].status, isEmpty); + expect(response.body.ocs.data[2].subline, ''); + expect(response.body.ocs.data[2].shareWithDisplayNameUnique, ''); }, skip: true, // TODO: This test only works on 28+ due to a bug fix with the status ); test('Get preview', () async { final response = await client.core.preview.getPreview(file: 'Nextcloud.png'); - expect(response, isNotEmpty); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body, isNotEmpty); }); test('Get avatar', () async { final response = await client.core.avatar.getAvatar(userId: 'admin', size: 32); - expect(response.data, isNotEmpty); + expect(response.body, isNotEmpty); }); test('Get dark avatar', () async { final response = await client.core.avatar.getAvatarDark(userId: 'admin', size: 32); - expect(response.data, isNotEmpty); + expect(response.body, isNotEmpty); }); test('Delete app password', () async { @@ -136,7 +158,10 @@ void main() { test('Unified search providers', () async { final response = await client.core.unifiedSearch.getProviders(); - expect(response.ocs.data, hasLength(13)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data, hasLength(13)); }); test('Unified search', () async { @@ -144,16 +169,20 @@ void main() { providerId: 'settings', term: 'Personal info', ); - expect(response.ocs.data.name, 'Settings'); - expect(response.ocs.data.isPaginated, isFalse); - expect(response.ocs.data.entries, hasLength(1)); - expect(response.ocs.data.entries.single.thumbnailUrl, isEmpty); - expect(response.ocs.data.entries.single.title, 'Personal info'); - expect(response.ocs.data.entries.single.subline, isEmpty); - expect(response.ocs.data.entries.single.resourceUrl, isNotEmpty); - expect(response.ocs.data.entries.single.icon, 'icon-settings-dark'); - expect(response.ocs.data.entries.single.rounded, isFalse); - expect(response.ocs.data.entries.single.attributes, isEmpty); + + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.name, 'Settings'); + expect(response.body.ocs.data.isPaginated, isFalse); + expect(response.body.ocs.data.entries, hasLength(1)); + expect(response.body.ocs.data.entries.single.thumbnailUrl, isEmpty); + expect(response.body.ocs.data.entries.single.title, 'Personal info'); + expect(response.body.ocs.data.entries.single.subline, isEmpty); + expect(response.body.ocs.data.entries.single.resourceUrl, isNotEmpty); + expect(response.body.ocs.data.entries.single.icon, 'icon-settings-dark'); + expect(response.body.ocs.data.entries.single.rounded, isFalse); + expect(response.body.ocs.data.entries.single.attributes, isEmpty); }); }, retry: retryCount, diff --git a/packages/nextcloud/test/dashboard_test.dart b/packages/nextcloud/test/dashboard_test.dart index ef7b6801..f529f82c 100644 --- a/packages/nextcloud/test/dashboard_test.dart +++ b/packages/nextcloud/test/dashboard_test.dart @@ -19,21 +19,21 @@ void main() { test('Get widgets', () async { final response = await client.dashboard.dashboardApi.getWidgets(); - expect(response.ocs.data.keys, equals(['activity', 'notes', 'recommendations', 'user_status'])); + expect(response.body.ocs.data.keys, equals(['activity', 'notes', 'recommendations', 'user_status'])); }); group('Get widget items', () { test('v1', () async { final response = await client.dashboard.dashboardApi.getWidgetItems(); - expect(response.ocs.data.keys, equals(['recommendations'])); - final items = response.ocs.data['recommendations']!; + expect(response.body.ocs.data.keys, equals(['recommendations'])); + final items = response.body.ocs.data['recommendations']!; expect(items, hasLength(7)); }); test('v2', () async { final response = await client.dashboard.dashboardApi.getWidgetItemsV2(); - expect(response.ocs.data.keys, equals(['recommendations'])); - final items = response.ocs.data['recommendations']!.items; + expect(response.body.ocs.data.keys, equals(['recommendations'])); + final items = response.body.ocs.data['recommendations']!.items; expect(items, hasLength(7)); }); }); diff --git a/packages/nextcloud/test/news_test.dart b/packages/nextcloud/test/news_test.dart index 36c944e6..8e54491f 100644 --- a/packages/nextcloud/test/news_test.dart +++ b/packages/nextcloud/test/news_test.dart @@ -26,12 +26,13 @@ void main() { }); tearDown(() => container.destroy()); - Future addWikipediaFeed([final int? folderID]) async => client.news.addFeed( + Future> addWikipediaFeed([final int? folderID]) async => + client.news.addFeed( url: 'http://host.docker.internal:${rssServer.port}/wikipedia.xml', folderId: folderID, ); - Future addNasaFeed() async => client.news.addFeed( + Future> addNasaFeed() async => client.news.addFeed( url: 'http://host.docker.internal:${rssServer.port}/nasa.xml', ); @@ -42,26 +43,38 @@ void main() { test('Add feed', () async { var response = await client.news.listFeeds(); - expect(response.starredCount, 0); - expect(response.newestItemId, null); - expect(response.feeds, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.starredCount, 0); + expect(response.body.newestItemId, null); + expect(response.body.feeds, hasLength(0)); response = await addWikipediaFeed(); - expect(response.starredCount, null); - expect(response.newestItemId, isNotNull); - expect(response.feeds, hasLength(1)); - expect(response.feeds[0].url, 'http://host.docker.internal:${rssServer.port}/wikipedia.xml'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.starredCount, null); + expect(response.body.newestItemId, isNotNull); + expect(response.body.feeds, hasLength(1)); + expect(response.body.feeds[0].url, 'http://host.docker.internal:${rssServer.port}/wikipedia.xml'); response = await client.news.listFeeds(); - expect(response.starredCount, 0); - expect(response.newestItemId, isNotNull); - expect(response.feeds, hasLength(1)); - expect(response.feeds[0].url, 'http://host.docker.internal:${rssServer.port}/wikipedia.xml'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.starredCount, 0); + expect(response.body.newestItemId, isNotNull); + expect(response.body.feeds, hasLength(1)); + expect(response.body.feeds[0].url, 'http://host.docker.internal:${rssServer.port}/wikipedia.xml'); }); test('Rename feed', () async { var response = await addWikipediaFeed(); - expect(response.feeds[0].title, 'Wikipedia featured articles feed'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.feeds[0].title, 'Wikipedia featured articles feed'); await client.news.renameFeed( feedId: 1, @@ -69,7 +82,10 @@ void main() { ); response = await client.news.listFeeds(); - expect(response.feeds[0].title, 'test1'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.feeds[0].title, 'test1'); }); test('Move feed to folder', () async { @@ -81,40 +97,57 @@ void main() { ); final response = await client.news.listFolders(); - expect(response.folders, hasLength(1)); - expect(response.folders[0].id, 1); - expect(response.folders[0].name, 'test1'); - expect(response.folders[0].opened, true); - expect(response.folders[0].feeds, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.folders, hasLength(1)); + expect(response.body.folders[0].id, 1); + expect(response.body.folders[0].name, 'test1'); + expect(response.body.folders[0].opened, true); + expect(response.body.folders[0].feeds, hasLength(0)); }); test('Mark feed as read', () async { final feedsResponse = await addWikipediaFeed(); - var articlesResponse = await client.news.listArticles(type: NewsListType.unread.index); - expect(articlesResponse.items.length, greaterThan(0)); + var response = await client.news.listArticles(type: NewsListType.unread.index); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items.length, greaterThan(0)); await client.news.markFeedAsRead( - feedId: feedsResponse.feeds[0].id, - newestItemId: feedsResponse.newestItemId!, + feedId: feedsResponse.body.feeds[0].id, + newestItemId: feedsResponse.body.newestItemId!, ); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + response = await client.news.listArticles(type: NewsListType.unread.index); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); - articlesResponse = await client.news.listArticles(type: NewsListType.unread.index); - expect(articlesResponse.items, hasLength(0)); + expect(response.body.items, hasLength(0)); }); test('List articles', () async { var response = await client.news.listArticles(); - expect(response.items, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(0)); await addWikipediaFeed(); response = await client.news.listArticles(); - expect(response.items.length, greaterThan(0)); - expect(response.items[0].body, isNotNull); - expect(response.items[0].feedId, 1); - expect(response.items[0].unread, true); - expect(response.items[0].starred, false); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items.length, greaterThan(0)); + expect(response.body.items[0].body, isNotNull); + expect(response.body.items[0].feedId, 1); + expect(response.body.items[0].unread, true); + expect(response.body.items[0].starred, false); }); test('List updated articles', () async { @@ -126,146 +159,212 @@ void main() { await addWikipediaFeed(); var response = await client.news.listArticles(); - final wikipediaArticles = response.items.length; + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final wikipediaArticles = response.body.items.length; expect(wikipediaArticles, greaterThan(0)); await addNasaFeed(); response = await client.news.listArticles(); - final nasaArticles = response.items.length - wikipediaArticles; + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final nasaArticles = response.body.items.length - wikipediaArticles; expect(nasaArticles, greaterThan(0)); response = await client.news.listUpdatedArticles( - lastModified: response.items[response.items.length - 1 - nasaArticles].lastModified, + lastModified: response.body.items[response.body.items.length - 1 - nasaArticles].lastModified, ); - expect(response.items, hasLength(nasaArticles)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(nasaArticles)); }); test('Mark article as read', () async { await addWikipediaFeed(); var response = await client.news.listArticles(type: NewsListType.unread.index); - final unreadArticles = response.items.length; + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final unreadArticles = response.body.items.length; expect(unreadArticles, greaterThan(0)); await client.news.markArticleAsRead( - itemId: response.items[0].id, + itemId: response.body.items[0].id, ); response = await client.news.listArticles(type: NewsListType.unread.index); - expect(response.items, hasLength(unreadArticles - 1)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(unreadArticles - 1)); }); test('Mark article as unread', () async { await addWikipediaFeed(); var response = await client.news.listArticles(type: NewsListType.unread.index); - final readArticle = response.items[0]; + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final readArticle = response.body.items[0]; await client.news.markArticleAsRead(itemId: readArticle.id); response = await client.news.listArticles(type: NewsListType.unread.index); - final unreadArticles = response.items.length; + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final unreadArticles = response.body.items.length; expect(unreadArticles, greaterThan(0)); await client.news.markArticleAsUnread(itemId: readArticle.id); response = await client.news.listArticles(type: NewsListType.unread.index); - expect(response.items, hasLength(unreadArticles + 1)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(unreadArticles + 1)); }); test('Star article', () async { await addWikipediaFeed(); var response = await client.news.listArticles(type: NewsListType.starred.index); - final starredArticles = response.items.length; + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final starredArticles = response.body.items.length; expect(starredArticles, 0); response = await client.news.listArticles(); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + await client.news.starArticle( - itemId: response.items[0].id, + itemId: response.body.items[0].id, ); response = await client.news.listArticles(type: NewsListType.starred.index); - expect(response.items, hasLength(1)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(1)); }); test('Unstar article', () async { await addWikipediaFeed(); var response = await client.news.listArticles(); - final item = response.items[0]; + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final item = response.body.items[0]; await client.news.starArticle( itemId: item.id, ); response = await client.news.listArticles(type: NewsListType.starred.index); - expect(response.items, hasLength(1)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(1)); await client.news.unstarArticle( itemId: item.id, ); response = await client.news.listArticles(type: NewsListType.starred.index); - expect(response.items, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(0)); }); test('Create folder', () async { var response = await client.news.listFolders(); - expect(response.folders, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.folders, hasLength(0)); response = await client.news.createFolder(name: 'test1'); - expect(response.folders, hasLength(1)); - expect(response.folders[0].id, 1); - expect(response.folders[0].name, 'test1'); - expect(response.folders[0].opened, true); - expect(response.folders[0].feeds, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.folders, hasLength(1)); + expect(response.body.folders[0].id, 1); + expect(response.body.folders[0].name, 'test1'); + expect(response.body.folders[0].opened, true); + expect(response.body.folders[0].feeds, hasLength(0)); response = await client.news.listFolders(); - expect(response.folders, hasLength(1)); - expect(response.folders[0].id, 1); - expect(response.folders[0].name, 'test1'); - expect(response.folders[0].opened, true); - expect(response.folders[0].feeds, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.folders, hasLength(1)); + expect(response.body.folders[0].id, 1); + expect(response.body.folders[0].name, 'test1'); + expect(response.body.folders[0].opened, true); + expect(response.body.folders[0].feeds, hasLength(0)); }); test('List folders', () async { var response = await client.news.listFolders(); - expect(response.folders, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.folders, hasLength(0)); await client.news.createFolder(name: 'test1'); await client.news.createFolder(name: 'test2'); response = response = await client.news.listFolders(); - expect(response.folders, hasLength(2)); - expect(response.folders[0].id, 1); - expect(response.folders[0].name, 'test1'); - expect(response.folders[0].opened, true); - expect(response.folders[0].feeds, hasLength(0)); - expect(response.folders[1].id, 2); - expect(response.folders[1].name, 'test2'); - expect(response.folders[1].opened, true); - expect(response.folders[1].feeds, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.folders, hasLength(2)); + expect(response.body.folders[0].id, 1); + expect(response.body.folders[0].name, 'test1'); + expect(response.body.folders[0].opened, true); + expect(response.body.folders[0].feeds, hasLength(0)); + expect(response.body.folders[1].id, 2); + expect(response.body.folders[1].name, 'test2'); + expect(response.body.folders[1].opened, true); + expect(response.body.folders[1].feeds, hasLength(0)); }); test('Add feed to folder', () async { await client.news.createFolder(name: 'test1'); final response = await addWikipediaFeed(1); - expect(response.starredCount, null); - expect(response.newestItemId, isNotNull); - expect(response.feeds, hasLength(1)); - expect(response.feeds[0].folderId, 1); - expect(response.feeds[0].url, 'http://host.docker.internal:${rssServer.port}/wikipedia.xml'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.starredCount, null); + expect(response.body.newestItemId, isNotNull); + expect(response.body.feeds, hasLength(1)); + expect(response.body.feeds[0].folderId, 1); + expect(response.body.feeds[0].url, 'http://host.docker.internal:${rssServer.port}/wikipedia.xml'); }); test('Mark folder as read', () async { final foldersResponse = await client.news.createFolder(name: 'test1'); final feedsResponse = await addWikipediaFeed(1); - var articlesResponse = await client.news.listArticles(type: NewsListType.unread.index); - expect(articlesResponse.items.length, greaterThan(0)); + var response = await client.news.listArticles(type: NewsListType.unread.index); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items.length, greaterThan(0)); await client.news.markFolderAsRead( - folderId: foldersResponse.folders[0].id, - newestItemId: feedsResponse.newestItemId!, + folderId: foldersResponse.body.folders[0].id, + newestItemId: feedsResponse.body.newestItemId!, ); - articlesResponse = await client.news.listArticles(type: NewsListType.unread.index); - expect(articlesResponse.items, hasLength(0)); + response = await client.news.listArticles(type: NewsListType.unread.index); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.items, hasLength(0)); }); }, retry: retryCount, diff --git a/packages/nextcloud/test/notes_test.dart b/packages/nextcloud/test/notes_test.dart index 149298a1..c8f8b429 100644 --- a/packages/nextcloud/test/notes_test.dart +++ b/packages/nextcloud/test/notes_test.dart @@ -19,7 +19,11 @@ void main() { tearDown(() => container.destroy()); test('Is supported', () async { - final (supported, _) = client.notes.isSupported((await client.core.ocs.getCapabilities()).ocs.data); + final response = await client.core.ocs.getCapabilities(); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + final (supported, _) = client.notes.isSupported(response.body.ocs.data); expect(supported, isTrue); }); @@ -30,14 +34,17 @@ void main() { category: 'c', favorite: 1, ); - expect(response.id, isPositive); - expect(response.title, 'a'); - expect(response.content, 'b'); - expect(response.category, 'c'); - expect(response.favorite, true); - expect(response.readonly, false); - expect(response.etag, isNotNull); - expect(response.modified, isNotNull); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.id, isPositive); + expect(response.body.title, 'a'); + expect(response.body.content, 'b'); + expect(response.body.category, 'c'); + expect(response.body.favorite, true); + expect(response.body.readonly, false); + expect(response.body.etag, isNotNull); + expect(response.body.modified, isNotNull); }); test('Create note not favorite', () async { @@ -46,14 +53,17 @@ void main() { content: 'b', category: 'c', ); - expect(response.id, isPositive); - expect(response.title, 'a'); - expect(response.content, 'b'); - expect(response.category, 'c'); - expect(response.favorite, false); - expect(response.readonly, false); - expect(response.etag, isNotNull); - expect(response.modified, isNotNull); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.id, isPositive); + expect(response.body.title, 'a'); + expect(response.body.content, 'b'); + expect(response.body.category, 'c'); + expect(response.body.favorite, false); + expect(response.body.readonly, false); + expect(response.body.etag, isNotNull); + expect(response.body.modified, isNotNull); }); test('Get notes', () async { @@ -61,63 +71,84 @@ void main() { await client.notes.createNote(title: 'b'); final response = await client.notes.getNotes(); - expect(response, hasLength(2)); - expect(response[0].title, 'a'); - expect(response[1].title, 'b'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body, hasLength(2)); + expect(response.body[0].title, 'a'); + expect(response.body[1].title, 'b'); }); test('Get note', () async { final response = await client.notes.getNote( - id: (await client.notes.createNote(title: 'a')).id, + id: (await client.notes.createNote(title: 'a')).body.id, ); - expect(response.title, 'a'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.title, 'a'); }); test('Update note', () async { - final id = (await client.notes.createNote(title: 'a')).id; + final id = (await client.notes.createNote(title: 'a')).body.id; await client.notes.updateNote( id: id, title: 'b', ); final response = await client.notes.getNote(id: id); - expect(response.title, 'b'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.title, 'b'); }); test('Update note fail changed on server', () async { final response = await client.notes.createNote(title: 'a'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + await client.notes.updateNote( - id: response.id, + id: response.body.id, title: 'b', - ifMatch: '"${response.etag}"', + ifMatch: '"${response.body.etag}"', ); expect( () => client.notes.updateNote( - id: response.id, + id: response.body.id, title: 'c', - ifMatch: '"${response.etag}"', + ifMatch: '"${response.body.etag}"', ), throwsA(predicate((final e) => (e! as DynamiteApiException).statusCode == 412)), ); }); test('Delete note', () async { - final id = (await client.notes.createNote(title: 'a')).id; + final id = (await client.notes.createNote(title: 'a')).body.id; var response = await client.notes.getNotes(); - expect(response, hasLength(1)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body, hasLength(1)); await client.notes.deleteNote(id: id); response = await client.notes.getNotes(); - expect(response, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body, hasLength(0)); }); test('Get settings', () async { final response = await client.notes.getSettings(); - expect(response.notesPath, 'Notes'); - expect(response.fileSuffix, '.md'); - expect(response.noteMode, NotesSettings_NoteMode.rich); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.notesPath, 'Notes'); + expect(response.body.fileSuffix, '.md'); + expect(response.body.noteMode, NotesSettings_NoteMode.rich); }); test('Update settings', () async { @@ -129,14 +160,20 @@ void main() { ..noteMode = NotesSettings_NoteMode.preview, ), ); - expect(response.notesPath, 'Test Notes'); - expect(response.fileSuffix, '.txt'); - expect(response.noteMode, NotesSettings_NoteMode.preview); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.notesPath, 'Test Notes'); + expect(response.body.fileSuffix, '.txt'); + expect(response.body.noteMode, NotesSettings_NoteMode.preview); response = await client.notes.getSettings(); - expect(response.notesPath, 'Test Notes'); - expect(response.fileSuffix, '.txt'); - expect(response.noteMode, NotesSettings_NoteMode.preview); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.notesPath, 'Test Notes'); + expect(response.body.fileSuffix, '.txt'); + expect(response.body.noteMode, NotesSettings_NoteMode.preview); }); }, retry: retryCount, diff --git a/packages/nextcloud/test/notifications_test.dart b/packages/nextcloud/test/notifications_test.dart index 62f245be..4afc936f 100644 --- a/packages/nextcloud/test/notifications_test.dart +++ b/packages/nextcloud/test/notifications_test.dart @@ -37,7 +37,7 @@ void main() { await sendTestNotification(); final startTime = DateTime.now().toUtc(); - final response = (await client.notifications.endpoint.listNotifications()).data; + final response = (await client.notifications.endpoint.listNotifications()).body; expect(response.ocs.data, hasLength(2)); expect(response.ocs.data[0].notificationId, 2); expect(response.ocs.data[0].app, 'admin_notifications'); @@ -61,28 +61,31 @@ void main() { final startTime = DateTime.now().toUtc(); final response = await client.notifications.endpoint.getNotification(id: 2); - expect(response.ocs.data.notificationId, 2); - expect(response.ocs.data.app, 'admin_notifications'); - expect(response.ocs.data.user, 'admin'); - expectDateInReasonableTimeRange(DateTime.parse(response.ocs.data.datetime), startTime); - expect(response.ocs.data.objectType, 'admin_notifications'); - expect(response.ocs.data.objectId, isNotNull); - expect(response.ocs.data.subject, '123'); - expect(response.ocs.data.message, '456'); - expect(response.ocs.data.link, ''); - expect(response.ocs.data.subjectRich, ''); - expect(response.ocs.data.subjectRichParameters, isEmpty); - expect(response.ocs.data.messageRich, ''); - expect(response.ocs.data.messageRichParameters, isEmpty); - expect(response.ocs.data.icon, isNotEmpty); - expect(response.ocs.data.actions, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.notificationId, 2); + expect(response.body.ocs.data.app, 'admin_notifications'); + expect(response.body.ocs.data.user, 'admin'); + expectDateInReasonableTimeRange(DateTime.parse(response.body.ocs.data.datetime), startTime); + expect(response.body.ocs.data.objectType, 'admin_notifications'); + expect(response.body.ocs.data.objectId, isNotNull); + expect(response.body.ocs.data.subject, '123'); + expect(response.body.ocs.data.message, '456'); + expect(response.body.ocs.data.link, ''); + expect(response.body.ocs.data.subjectRich, ''); + expect(response.body.ocs.data.subjectRichParameters, isEmpty); + expect(response.body.ocs.data.messageRich, ''); + expect(response.body.ocs.data.messageRichParameters, isEmpty); + expect(response.body.ocs.data.icon, isNotEmpty); + expect(response.body.ocs.data.actions, hasLength(0)); }); test('Delete notification', () async { await sendTestNotification(); await client.notifications.endpoint.deleteNotification(id: 2); - final response = (await client.notifications.endpoint.listNotifications()).data; + final response = (await client.notifications.endpoint.listNotifications()).body; expect(response.ocs.data, hasLength(1)); }); @@ -91,7 +94,7 @@ void main() { await sendTestNotification(); await client.notifications.endpoint.deleteAllNotifications(); - final response = (await client.notifications.endpoint.listNotifications()).data; + final response = (await client.notifications.endpoint.listNotifications()).body; expect(response.ocs.data, hasLength(0)); }); }); @@ -126,6 +129,7 @@ void main() { devicePublicKey: keypair.publicKey.toFormattedPEM(), proxyServer: 'https://example.com/', )) + .body .ocs .data; expect(subscription.publicKey, hasLength(451)); diff --git a/packages/nextcloud/test/provisioning_api_test.dart b/packages/nextcloud/test/provisioning_api_test.dart index f214e807..0df22560 100644 --- a/packages/nextcloud/test/provisioning_api_test.dart +++ b/packages/nextcloud/test/provisioning_api_test.dart @@ -22,30 +22,40 @@ void main() { group('Users', () { test('Get current user', () async { - final user = await client.provisioningApi.users.getCurrentUser(); - expect(user.ocs.data.id, 'admin'); - expect(user.ocs.data.displayName, 'admin'); - expect(user.ocs.data.displaynameScope, 'v2-federated'); - expect(user.ocs.data.language, 'en'); + final response = await client.provisioningApi.users.getCurrentUser(); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.id, 'admin'); + expect(response.body.ocs.data.displayName, 'admin'); + expect(response.body.ocs.data.displaynameScope, 'v2-federated'); + expect(response.body.ocs.data.language, 'en'); }); test('Get user by username', () async { - final user = await client.provisioningApi.users.getUser(userId: 'user1'); - expect(user.ocs.data.id, 'user1'); - expect(user.ocs.data.displayname, 'User One'); - expect(user.ocs.data.displaynameScope, null); - expect(user.ocs.data.language, 'en'); + final response = await client.provisioningApi.users.getUser(userId: 'user1'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.id, 'user1'); + expect(response.body.ocs.data.displayname, 'User One'); + expect(response.body.ocs.data.displaynameScope, null); + expect(response.body.ocs.data.language, 'en'); }); }); group('Apps', () { test('Get apps', () async { final response = await client.provisioningApi.apps.getApps(); - expect(response.ocs.data.apps, hasLength(40)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + expect(response.body.ocs.data.apps, hasLength(40)); - for (final id in response.ocs.data.apps) { + for (final id in response.body.ocs.data.apps) { final app = await client.provisioningApi.apps.getAppInfo(app: id); - expect(app.ocs.data.id, isNotEmpty); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + expect(app.body.ocs.data.id, isNotEmpty); } }); }); diff --git a/packages/nextcloud/test/settings_test.dart b/packages/nextcloud/test/settings_test.dart index b6d27e22..dd6036ab 100644 --- a/packages/nextcloud/test/settings_test.dart +++ b/packages/nextcloud/test/settings_test.dart @@ -22,8 +22,9 @@ Future run(final DockerImage image) async { tearDown(() => container.destroy()); test('Download log file', () async { - final response = utf8.decode((await client.settings.logSettings.download()).data); - expect(response, await container.nextcloudLogs()); + final response = await client.settings.logSettings.download(); + final logs = utf8.decode(response.body); + expect(logs, await container.nextcloudLogs()); }); }); } diff --git a/packages/nextcloud/test/uppush_test.dart b/packages/nextcloud/test/uppush_test.dart index bdd98898..e521a5cc 100644 --- a/packages/nextcloud/test/uppush_test.dart +++ b/packages/nextcloud/test/uppush_test.dart @@ -22,43 +22,64 @@ void main() { test('Is installed', () async { final response = await client.uppush.check(); - expect(response.success, isTrue); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.success, isTrue); }); test('Set keepalive', () async { final response = await client.uppush.setKeepalive(keepalive: 10); - expect(response.success, isTrue); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.success, isTrue); }); test('Create device', () async { final response = await client.uppush.createDevice(deviceName: 'Test'); - expect(response.success, isTrue); - expect(response.deviceId, isNotEmpty); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.success, isTrue); + expect(response.body.deviceId, isNotEmpty); }); test('Delete device', () async { - final deviceId = (await client.uppush.createDevice(deviceName: 'Test')).deviceId; + final deviceId = (await client.uppush.createDevice(deviceName: 'Test')).body.deviceId; final response = await client.uppush.deleteDevice(deviceId: deviceId); - expect(response.success, isTrue); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.success, isTrue); }); test('Create app', () async { - final deviceId = (await client.uppush.createDevice(deviceName: 'Test')).deviceId; + final deviceId = (await client.uppush.createDevice(deviceName: 'Test')).body.deviceId; final response = await client.uppush.createApp(deviceId: deviceId, appName: 'Test'); - expect(response.success, isTrue); - expect(response.token, isNotEmpty); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.success, isTrue); + expect(response.body.token, isNotEmpty); }); test('UnifiedPush discovery', () async { final response = await client.uppush.unifiedpushDiscovery(token: 'example'); - expect(response.unifiedpush.version, 1); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.unifiedpush.version, 1); }); test('Matrix gateway discovery', () async { final response = await client.uppush.gatewayMatrixDiscovery(); - expect(response.unifiedpush.gateway, 'matrix'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.unifiedpush.gateway, 'matrix'); }); // Deleting an app, sending a notification (also via matrix gateway) or listening for notifications is not possible because redis is not set up diff --git a/packages/nextcloud/test/user_status_test.dart b/packages/nextcloud/test/user_status_test.dart index 7c4b55aa..4d11ec88 100644 --- a/packages/nextcloud/test/user_status_test.dart +++ b/packages/nextcloud/test/user_status_test.dart @@ -21,45 +21,50 @@ void main() { test('Find all predefined statuses', () async { final expectedStatusIDs = ['meeting', 'commuting', 'remote-work', 'sick-leave', 'vacationing']; final response = await client.userStatus.predefinedStatus.findAll(); - expect(response.ocs.data, hasLength(5)); - final responseIDs = response.ocs.data.map((final status) => status.id); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data, hasLength(5)); + final responseIDs = response.body.ocs.data.map((final status) => status.id); expect(expectedStatusIDs.map(responseIDs.contains).contains(false), false); - for (final status in response.ocs.data) { + for (final status in response.body.ocs.data) { expect(status.icon, isNotNull); expect(status.message, isNotNull); } - final meeting = response.ocs.data.singleWhere((final s) => s.id == 'meeting').clearAt!; + final meeting = response.body.ocs.data.singleWhere((final s) => s.id == 'meeting').clearAt!; expect(meeting.type, UserStatusClearAt_Type.period); expect(meeting.time.$int, 3600); - final commuting = response.ocs.data.singleWhere((final s) => s.id == 'commuting').clearAt!; + final commuting = response.body.ocs.data.singleWhere((final s) => s.id == 'commuting').clearAt!; expect(commuting.type, UserStatusClearAt_Type.period); expect(commuting.time.$int, 1800); - final remoteWork = response.ocs.data.singleWhere((final s) => s.id == 'remote-work').clearAt!; + final remoteWork = response.body.ocs.data.singleWhere((final s) => s.id == 'remote-work').clearAt!; expect(remoteWork.type, UserStatusClearAt_Type.endOf); expect(remoteWork.time.clearAtTimeType, UserStatusClearAtTimeType.day); - final sickLeave = response.ocs.data.singleWhere((final s) => s.id == 'sick-leave').clearAt!; + final sickLeave = response.body.ocs.data.singleWhere((final s) => s.id == 'sick-leave').clearAt!; expect(sickLeave.type, UserStatusClearAt_Type.endOf); expect(sickLeave.time.clearAtTimeType, UserStatusClearAtTimeType.day); - final vacationing = response.ocs.data.singleWhere((final s) => s.id == 'vacationing').clearAt; + final vacationing = response.body.ocs.data.singleWhere((final s) => s.id == 'vacationing').clearAt; expect(vacationing, null); }); test('Set status', () async { final response = await client.userStatus.userStatus.setStatus(statusType: 'online'); - - expect(response.ocs.data.userId, 'user1'); - expect(response.ocs.data.message, null); - expect(response.ocs.data.messageId, null); - expect(response.ocs.data.messageIsPredefined, false); - expect(response.ocs.data.icon, null); - expect(response.ocs.data.clearAt, null); - expect(response.ocs.data.status, 'online'); - expect(response.ocs.data.statusIsUserDefined, true); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.userId, 'user1'); + expect(response.body.ocs.data.message, null); + expect(response.body.ocs.data.messageId, null); + expect(response.body.ocs.data.messageIsPredefined, false); + expect(response.body.ocs.data.icon, null); + expect(response.body.ocs.data.clearAt, null); + expect(response.body.ocs.data.status, 'online'); + expect(response.body.ocs.data.statusIsUserDefined, true); }); test('Get status', () async { @@ -68,29 +73,36 @@ void main() { await client.userStatus.userStatus.setStatus(statusType: 'online'); final response = await client.userStatus.userStatus.getStatus(); - expect(response.ocs.data.userId, 'user1'); - expect(response.ocs.data.message, null); - expect(response.ocs.data.messageId, null); - expect(response.ocs.data.messageIsPredefined, false); - expect(response.ocs.data.icon, null); - expect(response.ocs.data.clearAt, null); - expect(response.ocs.data.status, 'online'); - expect(response.ocs.data.statusIsUserDefined, true); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.userId, 'user1'); + expect(response.body.ocs.data.message, null); + expect(response.body.ocs.data.messageId, null); + expect(response.body.ocs.data.messageIsPredefined, false); + expect(response.body.ocs.data.icon, null); + expect(response.body.ocs.data.clearAt, null); + expect(response.body.ocs.data.status, 'online'); + expect(response.body.ocs.data.statusIsUserDefined, true); }); test('Find all statuses', () async { var response = await client.userStatus.statuses.findAll(); - expect(response.ocs.data, hasLength(0)); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + expect(response.body.ocs.data, hasLength(0)); await client.userStatus.userStatus.setStatus(statusType: 'online'); response = await client.userStatus.statuses.findAll(); - expect(response.ocs.data, hasLength(1)); - expect(response.ocs.data[0].userId, 'user1'); - expect(response.ocs.data[0].message, null); - expect(response.ocs.data[0].icon, null); - expect(response.ocs.data[0].clearAt, null); - expect(response.ocs.data[0].status, 'online'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + expect(response.body.ocs.data, hasLength(1)); + expect(response.body.ocs.data[0].userId, 'user1'); + expect(response.body.ocs.data[0].message, null); + expect(response.body.ocs.data[0].icon, null); + expect(response.body.ocs.data[0].clearAt, null); + expect(response.body.ocs.data[0].status, 'online'); }); test('Find status', () async { @@ -98,11 +110,14 @@ void main() { await client.userStatus.userStatus.setStatus(statusType: 'online'); final response = await client.userStatus.statuses.find(userId: 'user1'); - expect(response.ocs.data.userId, 'user1'); - expect(response.ocs.data.message, null); - expect(response.ocs.data.icon, null); - expect(response.ocs.data.clearAt, null); - expect(response.ocs.data.status, 'online'); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.userId, 'user1'); + expect(response.body.ocs.data.message, null); + expect(response.body.ocs.data.icon, null); + expect(response.body.ocs.data.clearAt, null); + expect(response.body.ocs.data.status, 'online'); }); test('Set predefined message', () async { @@ -111,14 +126,17 @@ void main() { messageId: 'meeting', clearAt: clearAt, ); - expect(response.ocs.data.userId, 'user1'); - expect(response.ocs.data.message, null); - expect(response.ocs.data.messageId, 'meeting'); - expect(response.ocs.data.messageIsPredefined, true); - expect(response.ocs.data.icon, null); - expect(response.ocs.data.clearAt, clearAt); - expect(response.ocs.data.status, 'offline'); - expect(response.ocs.data.statusIsUserDefined, false); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.userId, 'user1'); + expect(response.body.ocs.data.message, null); + expect(response.body.ocs.data.messageId, 'meeting'); + expect(response.body.ocs.data.messageIsPredefined, true); + expect(response.body.ocs.data.icon, null); + expect(response.body.ocs.data.clearAt, clearAt); + expect(response.body.ocs.data.status, 'offline'); + expect(response.body.ocs.data.statusIsUserDefined, false); }); test('Set custom message', () async { @@ -128,14 +146,17 @@ void main() { message: 'bla', clearAt: clearAt, ); - expect(response.ocs.data.userId, 'user1'); - expect(response.ocs.data.message, 'bla'); - expect(response.ocs.data.messageId, null); - expect(response.ocs.data.messageIsPredefined, false); - expect(response.ocs.data.icon, '😀'); - expect(response.ocs.data.clearAt, clearAt); - expect(response.ocs.data.status, 'offline'); - expect(response.ocs.data.statusIsUserDefined, false); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.userId, 'user1'); + expect(response.body.ocs.data.message, 'bla'); + expect(response.body.ocs.data.messageId, null); + expect(response.body.ocs.data.messageIsPredefined, false); + expect(response.body.ocs.data.icon, '😀'); + expect(response.body.ocs.data.clearAt, clearAt); + expect(response.body.ocs.data.status, 'offline'); + expect(response.body.ocs.data.statusIsUserDefined, false); }); test('Clear message', () async { @@ -148,26 +169,32 @@ void main() { await client.userStatus.userStatus.clearMessage(); final response = await client.userStatus.userStatus.getStatus(); - expect(response.ocs.data.userId, 'user1'); - expect(response.ocs.data.message, null); - expect(response.ocs.data.messageId, null); - expect(response.ocs.data.messageIsPredefined, false); - expect(response.ocs.data.icon, null); - expect(response.ocs.data.clearAt, null); - expect(response.ocs.data.status, 'offline'); - expect(response.ocs.data.statusIsUserDefined, false); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.userId, 'user1'); + expect(response.body.ocs.data.message, null); + expect(response.body.ocs.data.messageId, null); + expect(response.body.ocs.data.messageIsPredefined, false); + expect(response.body.ocs.data.icon, null); + expect(response.body.ocs.data.clearAt, null); + expect(response.body.ocs.data.status, 'offline'); + expect(response.body.ocs.data.statusIsUserDefined, false); }); test('Heartbeat', () async { final response = await client.userStatus.heartbeat.heartbeat(status: 'online'); - expect(response.ocs.data.userId, 'user1'); - expect(response.ocs.data.message, null); - expect(response.ocs.data.messageId, null); - expect(response.ocs.data.messageIsPredefined, false); - expect(response.ocs.data.icon, null); - expect(response.ocs.data.clearAt, null); - expect(response.ocs.data.status, 'online'); - expect(response.ocs.data.statusIsUserDefined, false); + expect(response.statusCode, 200); + expect(() => response.headers, isA()); + + expect(response.body.ocs.data.userId, 'user1'); + expect(response.body.ocs.data.message, null); + expect(response.body.ocs.data.messageId, null); + expect(response.body.ocs.data.messageIsPredefined, false); + expect(response.body.ocs.data.icon, null); + expect(response.body.ocs.data.clearAt, null); + expect(response.body.ocs.data.status, 'online'); + expect(response.body.ocs.data.statusIsUserDefined, false); }); }, retry: retryCount,