diff --git a/CHANGELOG.md b/CHANGELOG.md index fa44d5b..1de79b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## [4.4.0] + +- Added opportunity to use `body` with `GET` requests +- Fixed a few typos in README and in comments +- Change mockito's `GenerateMocks` to `GenerateNiceMocks` in tests +- Bumped dependencies to rebuild mockito's nice mocks + ## [4.3.1] - Added export of `RefreshTokenException` diff --git a/README.md b/README.md index 7f4bd57..ffba851 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ class ApplicationApi extends ApiClient {
-**6)** Finally, you just need calling created network request from requred place of your app. +**6)** Finally, you just need calling created network request from required place of your app. ```dart class _MyHomePageState extends State { diff --git a/example/lib/api/application_api.dart b/example/lib/api/application_api.dart index c1b04cd..7d3e936 100644 --- a/example/lib/api/application_api.dart +++ b/example/lib/api/application_api.dart @@ -14,6 +14,7 @@ class ApplicationApi extends ApiClient { Future getUserList({int? page}) => get( path: 'users${page != null ? '?page=$page' : ''}', + body: {}, responseMapper: response_mappers.users, validate: false, receiveTimeout: const Duration(seconds: 30), diff --git a/example/pubspec.lock b/example/pubspec.lock index dc869a6..91d46c4 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,26 +5,31 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "64.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.7.0" args: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.6.0" async: dependency: transitive description: @@ -61,34 +66,34 @@ packages: dependency: transitive description: name: build_daemon - sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" build_resolvers: dependency: "direct dev" description: name: build_resolvers - sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8" + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.6" + version: "2.4.13" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185 + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.2.11" + version: "7.3.2" built_collection: dependency: "direct main" description: @@ -101,18 +106,18 @@ packages: dependency: "direct main" description: name: built_value - sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74 + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.6.3" + version: "8.9.2" built_value_generator: dependency: "direct main" description: name: built_value_generator - sha256: a7a20bd4a943316c46c6e89b1a5631a2dace50ca6742b73d0b719fd243a7da00 + sha256: bb06c5e9dbdbd35ed6de21520e2e5112582c964fa584e2a4bb59887fc7a169b0 url: "https://pub.dev" source: hosted - version: "8.6.3" + version: "8.9.2" characters: dependency: transitive description: @@ -141,10 +146,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.10.1" collection: dependency: transitive description: @@ -157,49 +162,57 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.8" dart_style: dependency: transitive description: name: dart_style - sha256: abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334 + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.3.7" dash_kit_network: dependency: "direct main" description: path: ".." relative: true source: path - version: "4.3.0" + version: "4.3.1" dio: dependency: transitive description: name: dio - sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5" + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + url: "https://pub.dev" + source: hosted + version: "5.7.0" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" url: "https://pub.dev" source: hosted - version: "5.4.3+1" + version: "2.0.0" fake_async: dependency: transitive description: @@ -212,26 +225,26 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.1" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -299,10 +312,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" glob: dependency: transitive description: @@ -315,10 +328,10 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" http_multi_server: dependency: transitive description: @@ -339,10 +352,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: @@ -355,18 +368,18 @@ packages: dependency: transitive description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct dev" description: name: json_serializable - sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c url: "https://pub.dev" source: hosted - version: "6.7.1" + version: "6.9.0" leak_tracker: dependency: transitive description: @@ -395,10 +408,18 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -427,10 +448,10 @@ packages: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" package_config: dependency: transitive description: @@ -451,26 +472,26 @@ packages: dependency: transitive description: name: path_provider - sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.15" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -483,34 +504,34 @@ packages: dependency: transitive description: name: path_provider_platform_interface - sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" platform: dependency: transitive description: name: platform - sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.8" pool: dependency: transitive description: @@ -531,10 +552,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" rxdart: dependency: transitive description: @@ -547,58 +568,58 @@ packages: dependency: transitive description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" shelf: dependency: transitive description: @@ -611,10 +632,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -624,10 +645,10 @@ packages: dependency: transitive description: name: source_gen - sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.5.0" source_helper: dependency: transitive description: @@ -704,10 +725,10 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" vector_math: dependency: transitive description: @@ -732,30 +753,46 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "3.0.1" win32: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69" url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.9.0" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.1.0" yaml: dependency: transitive description: @@ -765,5 +802,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/lib/src/api_client.dart b/lib/src/api_client.dart index 93e26b6..65178b5 100644 --- a/lib/src/api_client.dart +++ b/lib/src/api_client.dart @@ -53,8 +53,9 @@ abstract class ApiClient { required ResponseMapper responseMapper, bool? isAuthorisedRequest, bool? validate, - Map queryParams = const {}, List headers = const [], + Map queryParams = const {}, + dynamic body, Duration? receiveTimeout, Duration? sendTimeout, String contentType = Headers.jsonContentType, @@ -66,6 +67,7 @@ abstract class ApiClient { headers: headers, queryParams: _filterNullParams(queryParams), responseMapper: responseMapper, + body: body, validate: validate ?? environment.validateRequestsByDefault, isAuthorisedRequest: isAuthorisedRequest ?? environment.isRequestsAuthorisedByDefault, @@ -358,6 +360,7 @@ abstract class ApiClient { case HttpMethod.get: return dio.get( params.path, + data: params.body, queryParameters: params.queryParams, options: options, cancelToken: cancelToken, diff --git a/lib/src/refresh_tokens_delegate.dart b/lib/src/refresh_tokens_delegate.dart index f3c250d..ec70f2e 100644 --- a/lib/src/refresh_tokens_delegate.dart +++ b/lib/src/refresh_tokens_delegate.dart @@ -1,8 +1,8 @@ import 'package:dash_kit_network/src/models/token_pair.dart'; import 'package:dio/dio.dart'; -/// Delegete that provide a set methods for controlling -/// the process of refreshing authorisation tokens. +/// Delegate that provide a set methods for controlling +/// the process of refreshing authorization tokens. abstract class RefreshTokensDelegate { /// Load from storage already received and saved token pair /// for continuing a user session. diff --git a/pubspec.lock b/pubspec.lock index be01b5b..7dfb9dc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,26 +5,31 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "72.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.7.0" args: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.6.0" async: dependency: transitive description: @@ -61,34 +66,34 @@ packages: dependency: transitive description: name: build_daemon - sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.2" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8" + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.13" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185 + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.2.11" + version: "7.3.2" built_collection: dependency: transitive description: @@ -101,10 +106,10 @@ packages: dependency: transitive description: name: built_value - sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74 + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.6.3" + version: "8.9.2" characters: dependency: transitive description: @@ -133,10 +138,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.10.1" collection: dependency: transitive description: @@ -149,34 +154,34 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" coverage: dependency: transitive description: name: coverage - sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e" + sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.11.1" crypto: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" dart_style: dependency: transitive description: name: dart_style - sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.7" dash_kit_lints: dependency: "direct dev" description: @@ -189,10 +194,18 @@ packages: dependency: "direct main" description: name: dio - sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5" + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" + url: "https://pub.dev" + source: hosted + version: "5.7.0" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" url: "https://pub.dev" source: hosted - version: "5.4.3+1" + version: "2.0.0" fake_async: dependency: transitive description: @@ -205,26 +218,26 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.1" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -300,10 +313,10 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" glob: dependency: transitive description: @@ -316,10 +329,10 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" http_multi_server: dependency: transitive description: @@ -340,10 +353,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: @@ -356,10 +369,10 @@ packages: dependency: transitive description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" leak_tracker: dependency: transitive description: @@ -396,10 +409,18 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" matcher: dependency: transitive description: @@ -428,10 +449,10 @@ packages: dependency: transitive description: name: mime - sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" mockito: dependency: "direct dev" description: @@ -468,26 +489,26 @@ packages: dependency: transitive description: name: path_provider - sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.15" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -500,34 +521,34 @@ packages: dependency: transitive description: name: path_provider_platform_interface - sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" platform: dependency: transitive description: name: platform - sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.8" pool: dependency: transitive description: @@ -548,10 +569,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" rxdart: dependency: "direct main" description: @@ -564,58 +585,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" shelf: dependency: transitive description: @@ -636,18 +657,18 @@ packages: dependency: transitive description: name: shelf_static - sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3 url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -657,18 +678,18 @@ packages: dependency: transitive description: name: source_gen - sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.5.0" source_map_stack_trace: dependency: transitive description: name: source_map_stack_trace - sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" source_maps: dependency: transitive description: @@ -761,10 +782,10 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" vector_math: dependency: transitive description: @@ -789,14 +810,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + url: "https://pub.dev" + source: hosted + version: "0.1.6" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "3.0.1" webkit_inspection_protocol: dependency: transitive description: @@ -809,18 +846,18 @@ packages: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69" url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.9.0" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.1.0" yaml: dependency: transitive description: @@ -830,5 +867,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index d60b6e9..c28ce7d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dash_kit_network description: The DashKit plugin that provides basic network functionality including token refresh. -version: 4.3.1 +version: 4.4.0 homepage: https://github.com/Dash-Kit/dash-kit-network environment: diff --git a/test/api_client_test.dart b/test/api_client_test.dart index d0ea13e..7ac1492 100644 --- a/test/api_client_test.dart +++ b/test/api_client_test.dart @@ -10,7 +10,7 @@ import 'api_client_test_utils.dart'; import 'test_components/test_api_client.dart'; import 'test_components/test_refresh_tokens_delegate.dart'; -@GenerateMocks([TokenStorage, Dio]) +@GenerateNiceMocks([MockSpec(), MockSpec()]) void main() { late Dio dio; late BaseOptions dioBaseOptions; @@ -55,6 +55,7 @@ void main() { final usersRequest = apiClient.get( path: 'users', + body: {}, isAuthorisedRequest: true, responseMapper: (response) => response, ); diff --git a/test/api_client_test.mocks.dart b/test/api_client_test.mocks.dart index 505363e..15b9d75 100644 --- a/test/api_client_test.mocks.dart +++ b/test/api_client_test.mocks.dart @@ -1,4 +1,4 @@ -// Mocks generated by Mockito 5.3.2 from annotations +// Mocks generated by Mockito 5.4.4 from annotations // in dash_kit_network/test/api_client_test.dart. // Do not manually edit this file. @@ -20,6 +20,8 @@ import 'package:mockito/mockito.dart' as _i1; // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references +// ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member // ignore_for_file: prefer_const_constructors @@ -79,7 +81,7 @@ class _FakeInterceptors_4 extends _i1.SmartFake implements _i6.Interceptors { ); } -class _FakeResponse_5 extends _i1.SmartFake implements _i7.Response { +class _FakeResponse_5 extends _i1.SmartFake implements _i7.Response { _FakeResponse_5( Object parent, Invocation parentInvocation, @@ -93,10 +95,6 @@ class _FakeResponse_5 extends _i1.SmartFake implements _i7.Response { /// /// See the documentation for Mockito's code generation for more information. class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { - MockTokenStorage() { - _i1.throwOnMissingStub(this); - } - @override _i2.FlutterSecureStorage get storage => (super.noSuchMethod( Invocation.getter(#storage), @@ -104,7 +102,12 @@ class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { this, Invocation.getter(#storage), ), + returnValueForMissingStub: _FakeFlutterSecureStorage_0( + this, + Invocation.getter(#storage), + ), ) as _i2.FlutterSecureStorage); + @override _i9.Future isAuthorized() => (super.noSuchMethod( Invocation.method( @@ -112,7 +115,9 @@ class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { [], ), returnValue: _i9.Future.value(false), + returnValueForMissingStub: _i9.Future.value(false), ) as _i9.Future); + @override _i9.Future getAccessToken() => (super.noSuchMethod( Invocation.method( @@ -120,7 +125,9 @@ class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { [], ), returnValue: _i9.Future.value(), + returnValueForMissingStub: _i9.Future.value(), ) as _i9.Future); + @override _i9.Future getRefreshToken() => (super.noSuchMethod( Invocation.method( @@ -128,7 +135,9 @@ class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { [], ), returnValue: _i9.Future.value(), + returnValueForMissingStub: _i9.Future.value(), ) as _i9.Future); + @override _i9.Future saveTokens({ required String? accessToken, @@ -146,6 +155,7 @@ class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { returnValue: _i9.Future.value(), returnValueForMissingStub: _i9.Future.value(), ) as _i9.Future); + @override _i9.Future clearTokens() => (super.noSuchMethod( Invocation.method( @@ -155,6 +165,7 @@ class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { returnValue: _i9.Future.value(), returnValueForMissingStub: _i9.Future.value(), ) as _i9.Future); + @override _i9.Future clearAll() => (super.noSuchMethod( Invocation.method( @@ -170,10 +181,6 @@ class MockTokenStorage extends _i1.Mock implements _i8.TokenStorage { /// /// See the documentation for Mockito's code generation for more information. class MockDio extends _i1.Mock implements _i10.Dio { - MockDio() { - _i1.throwOnMissingStub(this); - } - @override _i3.BaseOptions get options => (super.noSuchMethod( Invocation.getter(#options), @@ -181,7 +188,12 @@ class MockDio extends _i1.Mock implements _i10.Dio { this, Invocation.getter(#options), ), + returnValueForMissingStub: _FakeBaseOptions_1( + this, + Invocation.getter(#options), + ), ) as _i3.BaseOptions); + @override set options(_i3.BaseOptions? _options) => super.noSuchMethod( Invocation.setter( @@ -190,6 +202,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), returnValueForMissingStub: null, ); + @override _i4.HttpClientAdapter get httpClientAdapter => (super.noSuchMethod( Invocation.getter(#httpClientAdapter), @@ -197,7 +210,12 @@ class MockDio extends _i1.Mock implements _i10.Dio { this, Invocation.getter(#httpClientAdapter), ), + returnValueForMissingStub: _FakeHttpClientAdapter_2( + this, + Invocation.getter(#httpClientAdapter), + ), ) as _i4.HttpClientAdapter); + @override set httpClientAdapter(_i4.HttpClientAdapter? _httpClientAdapter) => super.noSuchMethod( @@ -207,6 +225,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), returnValueForMissingStub: null, ); + @override _i5.Transformer get transformer => (super.noSuchMethod( Invocation.getter(#transformer), @@ -214,7 +233,12 @@ class MockDio extends _i1.Mock implements _i10.Dio { this, Invocation.getter(#transformer), ), + returnValueForMissingStub: _FakeTransformer_3( + this, + Invocation.getter(#transformer), + ), ) as _i5.Transformer); + @override set transformer(_i5.Transformer? _transformer) => super.noSuchMethod( Invocation.setter( @@ -223,6 +247,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), returnValueForMissingStub: null, ); + @override _i6.Interceptors get interceptors => (super.noSuchMethod( Invocation.getter(#interceptors), @@ -230,7 +255,12 @@ class MockDio extends _i1.Mock implements _i10.Dio { this, Invocation.getter(#interceptors), ), + returnValueForMissingStub: _FakeInterceptors_4( + this, + Invocation.getter(#interceptors), + ), ) as _i6.Interceptors); + @override void close({bool? force = false}) => super.noSuchMethod( Invocation.method( @@ -240,152 +270,201 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), returnValueForMissingStub: null, ); + @override - _i9.Future<_i7.Response> get( + _i9.Future<_i7.Response> head( String? path, { Object? data, Map? queryParameters, _i3.Options? options, _i11.CancelToken? cancelToken, - _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #get, + #head, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, - #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #get, + #head, + [path], + { + #data: data, + #queryParameters: queryParameters, + #options: options, + #cancelToken: cancelToken, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #head, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, - #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> getUri( + _i9.Future<_i7.Response> headUri( Uri? uri, { Object? data, _i3.Options? options, _i11.CancelToken? cancelToken, - _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #getUri, + #headUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, - #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #getUri, + #headUri, + [uri], + { + #data: data, + #options: options, + #cancelToken: cancelToken, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #headUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, - #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> post( + _i9.Future<_i7.Response> get( String? path, { Object? data, Map? queryParameters, _i3.Options? options, _i11.CancelToken? cancelToken, - _i3.ProgressCallback? onSendProgress, _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #post, + #get, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #post, + #get, + [path], + { + #data: data, + #queryParameters: queryParameters, + #options: options, + #cancelToken: cancelToken, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #get, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> postUri( + _i9.Future<_i7.Response> getUri( Uri? uri, { Object? data, _i3.Options? options, _i11.CancelToken? cancelToken, - _i3.ProgressCallback? onSendProgress, _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #postUri, + #getUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #postUri, + #getUri, + [uri], + { + #data: data, + #options: options, + #cancelToken: cancelToken, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #getUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> put( + _i9.Future<_i7.Response> post( String? path, { Object? data, Map? queryParameters, @@ -396,7 +475,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { }) => (super.noSuchMethod( Invocation.method( - #put, + #post, [path], { #data: data, @@ -410,7 +489,23 @@ class MockDio extends _i1.Mock implements _i10.Dio { returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #put, + #post, + [path], + { + #data: data, + #queryParameters: queryParameters, + #options: options, + #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #post, [path], { #data: data, @@ -423,8 +518,9 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> putUri( + _i9.Future<_i7.Response> postUri( Uri? uri, { Object? data, _i3.Options? options, @@ -434,7 +530,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { }) => (super.noSuchMethod( Invocation.method( - #putUri, + #postUri, [uri], { #data: data, @@ -447,7 +543,22 @@ class MockDio extends _i1.Mock implements _i10.Dio { returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #putUri, + #postUri, + [uri], + { + #data: data, + #options: options, + #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #postUri, [uri], { #data: data, @@ -459,207 +570,315 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> head( + _i9.Future<_i7.Response> put( String? path, { Object? data, Map? queryParameters, _i3.Options? options, _i11.CancelToken? cancelToken, + _i3.ProgressCallback? onSendProgress, + _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #head, + #put, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #head, + #put, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #put, + [path], + { + #data: data, + #queryParameters: queryParameters, + #options: options, + #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> headUri( + _i9.Future<_i7.Response> putUri( Uri? uri, { Object? data, _i3.Options? options, _i11.CancelToken? cancelToken, + _i3.ProgressCallback? onSendProgress, + _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #headUri, + #putUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #headUri, + #putUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #putUri, + [uri], + { + #data: data, + #options: options, + #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> delete( + _i9.Future<_i7.Response> patch( String? path, { Object? data, Map? queryParameters, _i3.Options? options, _i11.CancelToken? cancelToken, + _i3.ProgressCallback? onSendProgress, + _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #delete, + #patch, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #delete, + #patch, + [path], + { + #data: data, + #queryParameters: queryParameters, + #options: options, + #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #patch, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> deleteUri( + _i9.Future<_i7.Response> patchUri( Uri? uri, { Object? data, _i3.Options? options, _i11.CancelToken? cancelToken, + _i3.ProgressCallback? onSendProgress, + _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #deleteUri, + #patchUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #deleteUri, + #patchUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #patchUri, + [uri], + { + #data: data, + #options: options, + #cancelToken: cancelToken, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> patch( + _i9.Future<_i7.Response> delete( String? path, { Object? data, Map? queryParameters, _i3.Options? options, _i11.CancelToken? cancelToken, - _i3.ProgressCallback? onSendProgress, - _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #patch, + #delete, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, - #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #patch, + #delete, + [path], + { + #data: data, + #queryParameters: queryParameters, + #options: options, + #cancelToken: cancelToken, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #delete, [path], { #data: data, #queryParameters: queryParameters, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, - #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override - _i9.Future<_i7.Response> patchUri( + _i9.Future<_i7.Response> deleteUri( Uri? uri, { Object? data, _i3.Options? options, _i11.CancelToken? cancelToken, - _i3.ProgressCallback? onSendProgress, - _i3.ProgressCallback? onReceiveProgress, }) => (super.noSuchMethod( Invocation.method( - #patchUri, + #deleteUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, - #onReceiveProgress: onReceiveProgress, }, ), returnValue: _i9.Future<_i7.Response>.value(_FakeResponse_5( this, Invocation.method( - #patchUri, + #deleteUri, + [uri], + { + #data: data, + #options: options, + #cancelToken: cancelToken, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #deleteUri, [uri], { #data: data, #options: options, #cancelToken: cancelToken, - #onSendProgress: onSendProgress, - #onReceiveProgress: onReceiveProgress, }, ), )), ) as _i9.Future<_i7.Response>); + @override _i9.Future<_i7.Response> download( String? urlPath, @@ -709,7 +928,28 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #download, + [ + urlPath, + savePath, + ], + { + #onReceiveProgress: onReceiveProgress, + #queryParameters: queryParameters, + #cancelToken: cancelToken, + #deleteOnError: deleteOnError, + #lengthHeader: lengthHeader, + #data: data, + #options: options, + }, + ), + )), ) as _i9.Future<_i7.Response>); + @override _i9.Future<_i7.Response> downloadUri( Uri? uri, @@ -756,10 +996,30 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #downloadUri, + [ + uri, + savePath, + ], + { + #onReceiveProgress: onReceiveProgress, + #cancelToken: cancelToken, + #deleteOnError: deleteOnError, + #lengthHeader: lengthHeader, + #data: data, + #options: options, + }, + ), + )), ) as _i9.Future<_i7.Response>); + @override _i9.Future<_i7.Response> request( - String? path, { + String? url, { Object? data, Map? queryParameters, _i11.CancelToken? cancelToken, @@ -770,7 +1030,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { (super.noSuchMethod( Invocation.method( #request, - [path], + [url], { #data: data, #queryParameters: queryParameters, @@ -784,7 +1044,23 @@ class MockDio extends _i1.Mock implements _i10.Dio { this, Invocation.method( #request, - [path], + [url], + { + #data: data, + #queryParameters: queryParameters, + #cancelToken: cancelToken, + #options: options, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #request, + [url], { #data: data, #queryParameters: queryParameters, @@ -796,6 +1072,7 @@ class MockDio extends _i1.Mock implements _i10.Dio { ), )), ) as _i9.Future<_i7.Response>); + @override _i9.Future<_i7.Response> requestUri( Uri? uri, { @@ -831,7 +1108,23 @@ class MockDio extends _i1.Mock implements _i10.Dio { }, ), )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #requestUri, + [uri], + { + #data: data, + #cancelToken: cancelToken, + #options: options, + #onSendProgress: onSendProgress, + #onReceiveProgress: onReceiveProgress, + }, + ), + )), ) as _i9.Future<_i7.Response>); + @override _i9.Future<_i7.Response> fetch(_i3.RequestOptions? requestOptions) => (super.noSuchMethod( @@ -846,5 +1139,13 @@ class MockDio extends _i1.Mock implements _i10.Dio { [requestOptions], ), )), + returnValueForMissingStub: + _i9.Future<_i7.Response>.value(_FakeResponse_5( + this, + Invocation.method( + #fetch, + [requestOptions], + ), + )), ) as _i9.Future<_i7.Response>); } diff --git a/test/api_client_test_utils.dart b/test/api_client_test_utils.dart index 5387c98..c83c121 100644 --- a/test/api_client_test_utils.dart +++ b/test/api_client_test_utils.dart @@ -27,6 +27,7 @@ void onUserRequestAnswer(Dio dio, Future> Function() answer) { when( dio.get( 'users', + data: anyNamed('data'), queryParameters: anyNamed('queryParameters'), options: anyNamed('options'), cancelToken: anyNamed('cancelToken'), @@ -44,6 +45,7 @@ void onRefreshRequestAnswer( Future userRequest(Dio dio, {String accessToken = ''}) { return dio.get( 'users', + data: anyNamed('data'), queryParameters: anyNamed('queryParameters'), options: argThat( optionsWithAccessToken(accessToken),