From 1ae81794b1ee029fddf9d9bfd7a7346bc26fc76c Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Wed, 22 Oct 2025 22:51:51 +0800 Subject: [PATCH] :boom: Updated API routes --- ios/Podfile.lock | 14 +++--- lib/pods/activity/activity_rpc.dart | 4 +- lib/pods/event_calendar.dart | 2 +- lib/pods/event_calendar.g.dart | 2 +- lib/pods/userinfo.dart | 2 +- lib/screens/account.dart | 2 +- lib/screens/account/credits.dart | 4 +- lib/screens/account/credits.g.dart | 4 +- lib/screens/account/leveling.dart | 2 +- lib/screens/account/leveling.g.dart | 2 +- lib/screens/account/me/account_settings.dart | 10 ++--- .../account/me/account_settings.g.dart | 6 +-- lib/screens/account/me/profile_update.dart | 6 +-- .../account/me/settings_auth_factors.dart | 8 ++-- .../account/me/settings_connections.dart | 8 ++-- lib/screens/account/me/settings_contacts.dart | 12 +++--- lib/screens/account/profile.dart | 12 +++--- lib/screens/account/profile.g.dart | 6 +-- lib/screens/account/relationship.dart | 12 +++--- lib/screens/account/relationship.g.dart | 4 +- lib/screens/auth/create_account.dart | 2 +- lib/screens/auth/login.dart | 20 ++++----- lib/screens/auth/oidc.native.dart | 4 +- lib/screens/posts/pub_profile.dart | 4 +- lib/screens/posts/pub_profile.g.dart | 2 +- lib/screens/realm/realm_detail.dart | 20 ++++----- lib/screens/realm/realm_detail.g.dart | 6 +-- lib/screens/realm/realm_form.dart | 2 +- lib/screens/realm/realms.dart | 14 +++--- lib/screens/realm/realms.g.dart | 6 +-- lib/screens/wallet.dart | 24 ++++++----- lib/screens/wallet.dart.backup | 18 ++++---- lib/screens/wallet.g.dart | 12 +++--- lib/services/abuse_report_service.dart | 4 +- lib/widgets/account/account_devices.dart | 8 ++-- lib/widgets/account/account_devices.g.dart | 2 +- lib/widgets/account/account_picker.dart | 2 +- lib/widgets/account/account_picker.g.dart | 2 +- .../account/restore_purchase_sheet.dart | 2 +- lib/widgets/account/status.dart | 43 +++++++++++-------- lib/widgets/account/status.g.dart | 2 +- lib/widgets/account/status_creation.dart | 4 +- lib/widgets/account/stellar_program_tab.dart | 30 +++++++------ .../account/stellar_program_tab.g.dart | 8 ++-- lib/widgets/check_in.dart | 6 +-- lib/widgets/check_in.g.dart | 4 +- lib/widgets/payment/payment_overlay.dart | 2 +- lib/widgets/post/post_award_sheet.dart | 2 +- lib/widgets/safety/abuse_report_sheet.dart | 2 +- 49 files changed, 197 insertions(+), 182 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 052e58fd..f2e75fb6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -219,7 +219,7 @@ PODS: - irondash_engine_context (0.0.1): - Flutter - Kingfisher (8.6.0) - - livekit_client (2.5.0): + - livekit_client (2.5.2): - Flutter - flutter_webrtc - WebRTC-SDK (= 137.7151.04) @@ -517,10 +517,10 @@ SPEC CHECKSUMS: GoogleAppMeasurement: 1e718274b7e015cefd846ac1fcf7820c70dc017d GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 - image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a + image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486 Kingfisher: 64278f126a815d0e2d391cdf71311b85882c4de0 - livekit_client: a6f5fa86ac28ccd7ded53626a5379961db311ab4 + livekit_client: 10e5f01922529565a0967660ecb1a6181778cc32 local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854 media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474 @@ -529,8 +529,8 @@ SPEC CHECKSUMS: OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 - pointer_interceptor_ios: ec847ef8b0915778bed2b2cef636f4d177fa8eed + path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880 + pointer_interceptor_ios: da06a662d5bfd329602b45b2ab41bc0fb5fdb0f0 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00 @@ -538,7 +538,7 @@ SPEC CHECKSUMS: SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a - shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418 sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b @@ -546,7 +546,7 @@ SPEC CHECKSUMS: super_native_extensions: b763c02dc3a8fd078389f410bf15149179020cb4 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 syncfusion_flutter_pdfviewer: 90dc48305d2e33d4aa20681d1e98ddeda891bc14 - url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12 wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556 WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e diff --git a/lib/pods/activity/activity_rpc.dart b/lib/pods/activity/activity_rpc.dart index 9cfb6ec5..003ef285 100644 --- a/lib/pods/activity/activity_rpc.dart +++ b/lib/pods/activity/activity_rpc.dart @@ -433,7 +433,7 @@ Future setRemoteActivityStatus( ) async { final apiClient = ref.read(apiClientProvider); await apiClient.post( - '/id/accounts/me/statuses', + '/pass/accounts/me/statuses', data: { 'is_invisible': false, 'is_not_disturb': false, @@ -448,7 +448,7 @@ Future setRemoteActivityStatus( Future unsetRemoteActivityStatus(Ref ref, String appId) async { final apiClient = ref.read(apiClientProvider); await apiClient.delete( - '/id/accounts/me/statuses', + '/pass/accounts/me/statuses', queryParameters: {'app': appId}, ); } diff --git a/lib/pods/event_calendar.dart b/lib/pods/event_calendar.dart index 1f07c7d1..dba89aa5 100644 --- a/lib/pods/event_calendar.dart +++ b/lib/pods/event_calendar.dart @@ -44,7 +44,7 @@ Future> eventCalendar( ) async { final client = ref.watch(apiClientProvider); final resp = await client.get( - '/id/accounts/${query.uname ?? 'me'}/calendar', + '/pass/accounts/${query.uname ?? 'me'}/calendar', queryParameters: {'year': query.year, 'month': query.month}, ); return resp.data diff --git a/lib/pods/event_calendar.g.dart b/lib/pods/event_calendar.g.dart index bf466f5a..d48c1f13 100644 --- a/lib/pods/event_calendar.g.dart +++ b/lib/pods/event_calendar.g.dart @@ -6,7 +6,7 @@ part of 'event_calendar.dart'; // RiverpodGenerator // ************************************************************************** -String _$eventCalendarHash() => r'72232fc044ac3c99b855dca37ff2f06a64be0afb'; +String _$eventCalendarHash() => r'3a33581c28bcd44bc5eb3abdb770171b4d275a5d'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/pods/userinfo.dart b/lib/pods/userinfo.dart index 23cb1b93..2bdc8a45 100644 --- a/lib/pods/userinfo.dart +++ b/lib/pods/userinfo.dart @@ -26,7 +26,7 @@ class UserInfoNotifier extends StateNotifier> { } try { final client = _ref.read(apiClientProvider); - final response = await client.get('/id/accounts/me'); + final response = await client.get('/pass/accounts/me'); final user = SnAccount.fromJson(response.data); state = AsyncValue.data(user); diff --git a/lib/screens/account.dart b/lib/screens/account.dart index 0f6f2301..451746af 100644 --- a/lib/screens/account.dart +++ b/lib/screens/account.dart @@ -383,7 +383,7 @@ class AccountScreen extends HookConsumerWidget { onTap: () async { final apiClient = ref.watch(apiClientProvider); showLoadingModal(context); - await apiClient.delete('/id/accounts/me/sessions/current'); + await apiClient.delete('/pass/accounts/me/sessions/current'); if (!context.mounted) return; hideLoadingModal(context); final userNotifier = ref.read(userInfoProvider.notifier); diff --git a/lib/screens/account/credits.dart b/lib/screens/account/credits.dart index 71b3284e..384b764b 100644 --- a/lib/screens/account/credits.dart +++ b/lib/screens/account/credits.dart @@ -14,7 +14,7 @@ part 'credits.g.dart'; @riverpod Future socialCredits(Ref ref) async { final client = ref.watch(apiClientProvider); - final response = await client.get('/id/accounts/me/credits'); + final response = await client.get('/pass/accounts/me/credits'); if (response.statusCode != 200) { throw Exception('Failed to load social credits'); } @@ -39,7 +39,7 @@ class SocialCreditHistoryNotifier extends _$SocialCreditHistoryNotifier final queryParams = {'offset': offset, 'take': _pageSize}; final response = await client.get( - '/id/accounts/me/credits/history', + '/pass/accounts/me/credits/history', queryParameters: queryParams, ); final total = int.parse(response.headers.value('X-Total') ?? '0'); diff --git a/lib/screens/account/credits.g.dart b/lib/screens/account/credits.g.dart index 988167a0..9bedeb36 100644 --- a/lib/screens/account/credits.g.dart +++ b/lib/screens/account/credits.g.dart @@ -6,7 +6,7 @@ part of 'credits.dart'; // RiverpodGenerator // ************************************************************************** -String _$socialCreditsHash() => r'2599844e892127ee4d315caced5c10e4dbaea142'; +String _$socialCreditsHash() => r'a0284583e94bc97285c689ac2bc018536932da69'; /// See also [socialCredits]. @ProviderFor(socialCredits) @@ -25,7 +25,7 @@ final socialCreditsProvider = AutoDisposeFutureProvider.internal( // ignore: unused_element typedef SocialCreditsRef = AutoDisposeFutureProviderRef; String _$socialCreditHistoryNotifierHash() => - r'950db020754160f835c64cedf3fa2175e61e4d64'; + r'3e87af246cc5dc72a1f3a87b81d1c87169bdfb5b'; /// See also [SocialCreditHistoryNotifier]. @ProviderFor(SocialCreditHistoryNotifier) diff --git a/lib/screens/account/leveling.dart b/lib/screens/account/leveling.dart index 590e244b..e64b151a 100644 --- a/lib/screens/account/leveling.dart +++ b/lib/screens/account/leveling.dart @@ -34,7 +34,7 @@ class LevelingHistoryNotifier extends _$LevelingHistoryNotifier final queryParams = {'offset': offset, 'take': _pageSize}; final response = await client.get( - '/id/accounts/me/leveling', + '/pass/accounts/me/leveling', queryParameters: queryParams, ); final total = int.parse(response.headers.value('X-Total') ?? '0'); diff --git a/lib/screens/account/leveling.g.dart b/lib/screens/account/leveling.g.dart index 6a418c19..a0c58fd7 100644 --- a/lib/screens/account/leveling.g.dart +++ b/lib/screens/account/leveling.g.dart @@ -7,7 +7,7 @@ part of 'leveling.dart'; // ************************************************************************** String _$levelingHistoryNotifierHash() => - r'e795f9b7911c9e50f15c095ea237cb0e87bf1e89'; + r'de51012e1590ac46388b6f3f2050b21cb96698d1'; /// See also [LevelingHistoryNotifier]. @ProviderFor(LevelingHistoryNotifier) diff --git a/lib/screens/account/me/account_settings.dart b/lib/screens/account/me/account_settings.dart index 651bc3a2..6699ca81 100644 --- a/lib/screens/account/me/account_settings.dart +++ b/lib/screens/account/me/account_settings.dart @@ -28,14 +28,14 @@ part 'account_settings.g.dart'; @riverpod Future> authFactors(Ref ref) async { final client = ref.read(apiClientProvider); - final res = await client.get('/id/accounts/me/factors'); + final res = await client.get('/pass/accounts/me/factors'); return res.data.map((e) => SnAuthFactor.fromJson(e)).toList(); } @riverpod Future> contactMethods(Ref ref) async { final client = ref.read(apiClientProvider); - final resp = await client.get('/id/accounts/me/contacts'); + final resp = await client.get('/pass/accounts/me/contacts'); return resp.data .map((e) => SnContactMethod.fromJson(e)) .toList(); @@ -44,7 +44,7 @@ Future> contactMethods(Ref ref) async { @riverpod Future> accountConnections(Ref ref) async { final client = ref.read(apiClientProvider); - final resp = await client.get('/id/accounts/me/connections'); + final resp = await client.get('/pass/accounts/me/connections'); return resp.data .map((e) => SnAccountConnection.fromJson(e)) .toList(); @@ -67,7 +67,7 @@ class AccountSettingsScreen extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.delete('/id/accounts/me'); + await client.delete('/pass/accounts/me'); if (context.mounted) { showSnackBar('accountDeletionSent'.tr()); } @@ -93,7 +93,7 @@ class AccountSettingsScreen extends HookConsumerWidget { final userInfo = ref.read(userInfoProvider); final client = ref.read(apiClientProvider); await client.post( - '/id/accounts/recovery/password', + '/pass/accounts/recovery/password', data: {'account': userInfo.value!.name, 'captcha_token': captchaTk}, ); if (context.mounted) { diff --git a/lib/screens/account/me/account_settings.g.dart b/lib/screens/account/me/account_settings.g.dart index 0c4fb887..cff6b17f 100644 --- a/lib/screens/account/me/account_settings.g.dart +++ b/lib/screens/account/me/account_settings.g.dart @@ -6,7 +6,7 @@ part of 'account_settings.dart'; // RiverpodGenerator // ************************************************************************** -String _$authFactorsHash() => r'24fe2f7b375b019d87fc3b85cbedbe857f399c0f'; +String _$authFactorsHash() => r'ed87d7dbd421fef0a5620416727c3dc598c97ef5'; /// See also [authFactors]. @ProviderFor(authFactors) @@ -25,7 +25,7 @@ final authFactorsProvider = @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element typedef AuthFactorsRef = AutoDisposeFutureProviderRef>; -String _$contactMethodsHash() => r'76a1a93f61c51c44b32b4821f5112d58406155f0'; +String _$contactMethodsHash() => r'1d3d03e9ffbf36126236558ead22cb7d88bb9cb2'; /// See also [contactMethods]. @ProviderFor(contactMethods) @@ -45,7 +45,7 @@ final contactMethodsProvider = // ignore: unused_element typedef ContactMethodsRef = AutoDisposeFutureProviderRef>; String _$accountConnectionsHash() => - r'9f69e7f23e3e53c528d38b93d76f0c9efc9a83db'; + r'33c10b98962ede6c428d4028c0d5f2f12ff0eb22'; /// See also [accountConnections]. @ProviderFor(accountConnections) diff --git a/lib/screens/account/me/profile_update.dart b/lib/screens/account/me/profile_update.dart index 2ee7c38e..fe440fdc 100644 --- a/lib/screens/account/me/profile_update.dart +++ b/lib/screens/account/me/profile_update.dart @@ -87,7 +87,7 @@ class UpdateProfileScreen extends HookConsumerWidget { } final client = ref.watch(apiClientProvider); await client.patch( - '/id/accounts/me/profile', + '/pass/accounts/me/profile', data: {'${position}_id': cloudFile.id}, ); final userNotifier = ref.read(userInfoProvider.notifier); @@ -114,7 +114,7 @@ class UpdateProfileScreen extends HookConsumerWidget { try { final client = ref.watch(apiClientProvider); await client.patch( - '/id/accounts/me', + '/pass/accounts/me', data: { 'name': usernameController.text, 'nick': nicknameController.text, @@ -194,7 +194,7 @@ class UpdateProfileScreen extends HookConsumerWidget { }; await client.patch( - '/id/accounts/me/profile', + '/pass/accounts/me/profile', data: { 'bio': bioController.text, 'first_name': firstNameController.text, diff --git a/lib/screens/account/me/settings_auth_factors.dart b/lib/screens/account/me/settings_auth_factors.dart index 246c02dd..4a33a07c 100644 --- a/lib/screens/account/me/settings_auth_factors.dart +++ b/lib/screens/account/me/settings_auth_factors.dart @@ -31,7 +31,7 @@ class AuthFactorSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.delete('/id/accounts/me/factors/${factor.id}'); + await client.delete('/pass/accounts/me/factors/${factor.id}'); if (context.mounted) Navigator.pop(context, true); } catch (err) { showErrorAlert(err); @@ -49,7 +49,7 @@ class AuthFactorSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.post('/id/accounts/me/factors/${factor.id}/disable'); + await client.post('/pass/accounts/me/factors/${factor.id}/disable'); if (context.mounted) Navigator.pop(context, true); } catch (err) { showErrorAlert(err); @@ -106,7 +106,7 @@ class AuthFactorSheet extends HookConsumerWidget { showLoadingModal(context); final client = ref.read(apiClientProvider); await client.post( - '/id/accounts/me/factors/${factor.id}/enable', + '/pass/accounts/me/factors/${factor.id}/enable', data: jsonEncode(password), ); if (context.mounted) Navigator.pop(context, true); @@ -193,7 +193,7 @@ class AuthFactorNewSheet extends HookConsumerWidget { showLoadingModal(context); final apiClient = ref.read(apiClientProvider); final resp = await apiClient.post( - '/id/accounts/me/factors', + '/pass/accounts/me/factors', data: {'type': factorType.value, 'secret': secretController.text}, ); final factor = SnAuthFactor.fromJson(resp.data); diff --git a/lib/screens/account/me/settings_connections.dart b/lib/screens/account/me/settings_connections.dart index b024bf49..d7e768d2 100644 --- a/lib/screens/account/me/settings_connections.dart +++ b/lib/screens/account/me/settings_connections.dart @@ -77,7 +77,7 @@ class AccountConnectionSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.delete('/id/accounts/me/connections/${connection.id}'); + await client.delete('/pass/accounts/me/connections/${connection.id}'); if (context.mounted) Navigator.pop(context, true); } catch (err) { showErrorAlert(err); @@ -175,7 +175,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget { if (context.mounted) showLoadingModal(context); await client.post( - '/id/auth/connect/apple/mobile', + '/pass/auth/connect/apple/mobile', data: { 'identity_token': credential.identityToken!, 'authorization_code': credential.authorizationCode, @@ -200,7 +200,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget { final serverUrl = ref.watch(serverUrlProvider); final accessToken = ref.watch(tokenProvider); launchUrlString( - '$serverUrl/id/auth/login/${selectedProvider.value}?tk=${accessToken!.token}', + '$serverUrl/pass/auth/login/${selectedProvider.value}?tk=${accessToken!.token}', ); } else { await Navigator.of(context, rootNavigator: true).push( @@ -345,7 +345,7 @@ class AccountConnectionsSheet extends HookConsumerWidget { try { final client = ref.read(apiClientProvider); await client.delete( - '/id/accounts/me/connections/${connection.id}', + '/pass/accounts/me/connections/${connection.id}', ); ref.invalidate(accountConnectionsProvider); return true; diff --git a/lib/screens/account/me/settings_contacts.dart b/lib/screens/account/me/settings_contacts.dart index 88a4e5b7..c8923854 100644 --- a/lib/screens/account/me/settings_contacts.dart +++ b/lib/screens/account/me/settings_contacts.dart @@ -25,7 +25,7 @@ class ContactMethodSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.delete('/id/accounts/me/contacts/${contact.id}'); + await client.delete('/pass/accounts/me/contacts/${contact.id}'); if (context.mounted) Navigator.pop(context, true); } catch (err) { showErrorAlert(err); @@ -38,7 +38,7 @@ class ContactMethodSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.post('/id/accounts/me/contacts/${contact.id}/verify'); + await client.post('/pass/accounts/me/contacts/${contact.id}/verify'); if (context.mounted) { showSnackBar('contactMethodVerificationSent'.tr()); } @@ -53,7 +53,7 @@ class ContactMethodSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.post('/id/accounts/me/contacts/${contact.id}/primary'); + await client.post('/pass/accounts/me/contacts/${contact.id}/primary'); if (context.mounted) Navigator.pop(context, true); } catch (err) { showErrorAlert(err); @@ -66,7 +66,7 @@ class ContactMethodSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.post('/id/accounts/me/contacts/${contact.id}/public'); + await client.post('/pass/accounts/me/contacts/${contact.id}/public'); if (context.mounted) Navigator.pop(context, true); } catch (err) { showErrorAlert(err); @@ -79,7 +79,7 @@ class ContactMethodSheet extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.read(apiClientProvider); - await client.delete('/id/accounts/me/contacts/${contact.id}/public'); + await client.delete('/pass/accounts/me/contacts/${contact.id}/public'); if (context.mounted) Navigator.pop(context, true); } catch (err) { showErrorAlert(err); @@ -221,7 +221,7 @@ class ContactMethodNewSheet extends HookConsumerWidget { showLoadingModal(context); final apiClient = ref.read(apiClientProvider); await apiClient.post( - '/id/accounts/me/contacts', + '/pass/accounts/me/contacts', data: {'type': contactType.value, 'content': contentController.text}, ); if (context.mounted) { diff --git a/lib/screens/account/profile.dart b/lib/screens/account/profile.dart index ecfc7c72..844e57ac 100644 --- a/lib/screens/account/profile.dart +++ b/lib/screens/account/profile.dart @@ -561,14 +561,14 @@ Future account(Ref ref, String uname) async { } } final apiClient = ref.watch(apiClientProvider); - final resp = await apiClient.get("/id/accounts/$uname"); + final resp = await apiClient.get("/pass/accounts/$uname"); return SnAccount.fromJson(resp.data); } @riverpod Future> accountBadges(Ref ref, String uname) async { final apiClient = ref.watch(apiClientProvider); - final resp = await apiClient.get("/id/accounts/$uname/badges"); + final resp = await apiClient.get("/pass/accounts/$uname/badges"); return List.from( resp.data.map((x) => SnAccountBadge.fromJson(x)), ); @@ -617,7 +617,7 @@ Future accountRelationship(Ref ref, String uname) async { final account = await ref.watch(accountProvider(uname).future); final apiClient = ref.watch(apiClientProvider); try { - final resp = await apiClient.get("/id/relationships/${account.id}"); + final resp = await apiClient.get("/pass/relationships/${account.id}"); return SnRelationship.fromJson(resp.data); } catch (err) { if (err is DioException && err.response?.statusCode == 404) { @@ -690,7 +690,7 @@ class AccountProfileScreen extends HookConsumerWidget { showLoadingModal(context); try { final client = ref.watch(apiClientProvider); - await client.post('/id/relationships/${account.value!.id}/friends'); + await client.post('/pass/relationships/${account.value!.id}/friends'); ref.invalidate(accountRelationshipProvider(name)); } catch (err) { showErrorAlert(err); @@ -704,9 +704,9 @@ class AccountProfileScreen extends HookConsumerWidget { try { final client = ref.watch(apiClientProvider); if (accountRelationship.value == null) { - await client.post('/id/relationships/${account.value!.id}/block'); + await client.post('/pass/relationships/${account.value!.id}/block'); } else { - await client.delete('/id/relationships/${account.value!.id}/block'); + await client.delete('/pass/relationships/${account.value!.id}/block'); } ref.invalidate(accountRelationshipProvider(name)); } catch (err) { diff --git a/lib/screens/account/profile.g.dart b/lib/screens/account/profile.g.dart index 318d54da..183b187d 100644 --- a/lib/screens/account/profile.g.dart +++ b/lib/screens/account/profile.g.dart @@ -6,7 +6,7 @@ part of 'profile.dart'; // RiverpodGenerator // ************************************************************************** -String _$accountHash() => r'ce7264a04f69e32a5cb07bc10ca5fa47ae1fddaa'; +String _$accountHash() => r'5e2b7bd59151b4638a5561f495537c259f767123'; /// Copied from Dart SDK class _SystemHash { @@ -145,7 +145,7 @@ class _AccountProviderElement String get uname => (origin as AccountProvider).uname; } -String _$accountBadgesHash() => r'1de05e122c23ff2c6ac6d318977165761e2ad177'; +String _$accountBadgesHash() => r'68db63f49827020beecbdbf20529520d0cd14a7d'; /// See also [accountBadges]. @ProviderFor(accountBadges) @@ -517,7 +517,7 @@ class _AccountDirectChatProviderElement } String _$accountRelationshipHash() => - r'9a3a4e8c6c6706f73df95feccb86736fcad33f30'; + r'319f743261b113a1d3c6a397d48d13c858312669'; /// See also [accountRelationship]. @ProviderFor(accountRelationship) diff --git a/lib/screens/account/relationship.dart b/lib/screens/account/relationship.dart index 7dd3ef3b..dcdaabf6 100644 --- a/lib/screens/account/relationship.dart +++ b/lib/screens/account/relationship.dart @@ -21,7 +21,7 @@ part 'relationship.g.dart'; @riverpod Future> sentFriendRequest(Ref ref) async { final client = ref.read(apiClientProvider); - final resp = await client.get('/id/relationships/requests'); + final resp = await client.get('/pass/relationships/requests'); return resp.data .map((e) => SnRelationship.fromJson(e)) .cast() @@ -43,7 +43,7 @@ class RelationshipListNotifier extends _$RelationshipListNotifier final take = 20; final response = await client.get( - '/id/relationships', + '/pass/relationships', queryParameters: {'offset': offset, 'take': take}, ); @@ -226,7 +226,7 @@ class RelationshipScreen extends HookConsumerWidget { if (result == null) return; final client = ref.read(apiClientProvider); - await client.post('/id/relationships/${result.id}/friends'); + await client.post('/pass/relationships/${result.id}/friends'); ref.invalidate(sentFriendRequestProvider); } @@ -240,7 +240,7 @@ class RelationshipScreen extends HookConsumerWidget { submitting.value = true; final client = ref.read(apiClientProvider); await client.post( - '/id/relationships/${relationship.accountId}/friends/${isAccept ? 'accept' : 'decline'}', + '/pass/relationships/${relationship.accountId}/friends/${isAccept ? 'accept' : 'decline'}', ); relationshipNotifier.forceRefresh(); if (!context.mounted) return; @@ -267,7 +267,7 @@ class RelationshipScreen extends HookConsumerWidget { ) async { final client = ref.read(apiClientProvider); await client.patch( - '/id/relationships/${relationship.accountId}', + '/pass/relationships/${relationship.accountId}', data: {'status': newStatus}, ); relationshipNotifier.forceRefresh(); @@ -350,7 +350,7 @@ class _SentFriendRequestsSheet extends HookConsumerWidget { Future cancelRequest(SnRelationship request) async { try { final client = ref.read(apiClientProvider); - await client.delete('/id/relationships/${request.relatedId}/friends'); + await client.delete('/pass/relationships/${request.relatedId}/friends'); ref.invalidate(sentFriendRequestProvider); } catch (err) { showErrorAlert(err); diff --git a/lib/screens/account/relationship.g.dart b/lib/screens/account/relationship.g.dart index 3fa16831..c08e463b 100644 --- a/lib/screens/account/relationship.g.dart +++ b/lib/screens/account/relationship.g.dart @@ -6,7 +6,7 @@ part of 'relationship.dart'; // RiverpodGenerator // ************************************************************************** -String _$sentFriendRequestHash() => r'dc02ace6cb755a01ab862c9fcff3b26de7f946cb'; +String _$sentFriendRequestHash() => r'0c52813eb6f86c05f6e0b1e4e840d0d9c350aa9e'; /// See also [sentFriendRequest]. @ProviderFor(sentFriendRequest) @@ -27,7 +27,7 @@ final sentFriendRequestProvider = typedef SentFriendRequestRef = AutoDisposeFutureProviderRef>; String _$relationshipListNotifierHash() => - r'0a134ce69489a4f2002d2223853855b6f22e4e9f'; + r'fc46920256f7c48445c00652165e879890f2c9a3'; /// See also [RelationshipListNotifier]. @ProviderFor(RelationshipListNotifier) diff --git a/lib/screens/auth/create_account.dart b/lib/screens/auth/create_account.dart index 0b5021da..e9f8a280 100644 --- a/lib/screens/auth/create_account.dart +++ b/lib/screens/auth/create_account.dart @@ -49,7 +49,7 @@ class CreateAccountScreen extends HookConsumerWidget { showLoadingModal(context); final client = ref.watch(apiClientProvider); await client.post( - '/id/accounts', + '/pass/accounts', data: { 'name': usernameController.text, 'nick': nicknameController.text, diff --git a/lib/screens/auth/login.dart b/lib/screens/auth/login.dart index bd57ffe3..ff00dc33 100644 --- a/lib/screens/auth/login.dart +++ b/lib/screens/auth/login.dart @@ -175,7 +175,7 @@ class _LoginCheckScreen extends HookConsumerWidget { // Get token if challenge is completed final client = ref.watch(apiClientProvider); final tokenResp = await client.post( - '/id/auth/token', + '/pass/auth/token', data: { 'grant_type': 'authorization_code', 'code': code ?? challenge!.id, @@ -241,7 +241,7 @@ class _LoginCheckScreen extends HookConsumerWidget { // Pass challenge final client = ref.watch(apiClientProvider); final resp = await client.patch( - '/id/auth/challenge/${challenge!.id}', + '/pass/auth/challenge/${challenge!.id}', data: {'factor_id': factor!.id, 'password': pwd}, ); final result = SnAuthChallenge.fromJson(resp.data); @@ -388,7 +388,7 @@ class _LoginPickerScreen extends HookConsumerWidget { try { await client.post( - '/id/auth/challenge/${challenge!.id}/factors/${factorPicked.value!.id}', + '/pass/auth/challenge/${challenge!.id}/factors/${factorPicked.value!.id}', data: hintController.text.isNotEmpty ? jsonEncode(hintController.text) @@ -531,7 +531,7 @@ class _LoginLookupScreen extends HookConsumerWidget { try { final client = ref.watch(apiClientProvider); await client.post( - '/id/accounts/recovery/password', + '/pass/accounts/recovery/password', data: {'account': uname, 'captcha_token': captchaTk}, ); showInfoAlert('loginResetPasswordSent'.tr(), 'done'.tr()); @@ -549,7 +549,7 @@ class _LoginLookupScreen extends HookConsumerWidget { try { final client = ref.watch(apiClientProvider); final resp = await client.post( - '/id/auth/challenge', + '/pass/auth/challenge', data: { 'account': uname, 'device_id': await getUdid(), @@ -570,7 +570,7 @@ class _LoginLookupScreen extends HookConsumerWidget { final result = SnAuthChallenge.fromJson(resp.data); onChallenge(result); final factorResp = await client.get( - '/id/auth/challenge/${result.id}/factors', + '/pass/auth/challenge/${result.id}/factors', ); onFactor( List.from( @@ -599,7 +599,7 @@ class _LoginLookupScreen extends HookConsumerWidget { if (context.mounted) showLoadingModal(context); final resp = await client.post( - '/id/auth/login/apple/mobile', + '/pass/auth/login/apple/mobile', data: { 'identity_token': credential.identityToken!, 'authorization_code': credential.authorizationCode, @@ -611,7 +611,7 @@ class _LoginLookupScreen extends HookConsumerWidget { final challenge = SnAuthChallenge.fromJson(resp.data); onChallenge(challenge); final factorResp = await client.get( - '/id/auth/challenge/${challenge.id}/factors', + '/pass/auth/challenge/${challenge.id}/factors', ); onFactor( List.from( @@ -636,11 +636,11 @@ class _LoginLookupScreen extends HookConsumerWidget { final client = ref.watch(apiClientProvider); try { - final resp = await client.get('/id/auth/challenge/$challengeId'); + final resp = await client.get('/pass/auth/challenge/$challengeId'); final challenge = SnAuthChallenge.fromJson(resp.data); onChallenge(challenge); final factorResp = await client.get( - '/id/auth/challenge/${challenge.id}/factors', + '/pass/auth/challenge/${challenge.id}/factors', ); onFactor( List.from( diff --git a/lib/screens/auth/oidc.native.dart b/lib/screens/auth/oidc.native.dart index c9fdde5f..311b1250 100644 --- a/lib/screens/auth/oidc.native.dart +++ b/lib/screens/auth/oidc.native.dart @@ -80,7 +80,9 @@ class _OidcScreenState extends ConsumerState { : 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36', ), initialUrlRequest: URLRequest( - url: WebUri('$serverUrl/id/auth/login/${widget.provider}'), + url: WebUri( + '$serverUrl/pass/auth/login/${widget.provider}', + ), headers: { if (token?.token.isNotEmpty ?? false) 'Authorization': 'AtField ${token!.token}', diff --git a/lib/screens/posts/pub_profile.dart b/lib/screens/posts/pub_profile.dart index b0cab2a1..3536025e 100644 --- a/lib/screens/posts/pub_profile.dart +++ b/lib/screens/posts/pub_profile.dart @@ -285,7 +285,9 @@ Future> publisherBadges(Ref ref, String pubName) async { final pub = await ref.watch(publisherProvider(pubName).future); if (pub.type != 0 || pub.account == null) return []; final apiClient = ref.watch(apiClientProvider); - final resp = await apiClient.get("/id/accounts/${pub.account!.name}/badges"); + final resp = await apiClient.get( + "/pass/accounts/${pub.account!.name}/badges", + ); return List.from( resp.data.map((x) => SnAccountBadge.fromJson(x)), ); diff --git a/lib/screens/posts/pub_profile.g.dart b/lib/screens/posts/pub_profile.g.dart index f340e956..76d4e702 100644 --- a/lib/screens/posts/pub_profile.g.dart +++ b/lib/screens/posts/pub_profile.g.dart @@ -145,7 +145,7 @@ class _PublisherProviderElement String get uname => (origin as PublisherProvider).uname; } -String _$publisherBadgesHash() => r'527efad74225fbacf558ac5db160ecce53a60c62'; +String _$publisherBadgesHash() => r'26776fd6cb611953f52bdb6a7dfa004c34d5cd8e'; /// See also [publisherBadges]. @ProviderFor(publisherBadges) diff --git a/lib/screens/realm/realm_detail.dart b/lib/screens/realm/realm_detail.dart index bda9f203..672b7e93 100644 --- a/lib/screens/realm/realm_detail.dart +++ b/lib/screens/realm/realm_detail.dart @@ -47,9 +47,7 @@ Future realmAppbarForegroundColor(Ref ref, String realmSlug) async { Future realmIdentity(Ref ref, String realmSlug) async { try { final apiClient = ref.watch(apiClientProvider); - final response = await apiClient.get( - '/sphere/realms/$realmSlug/members/me', - ); + final response = await apiClient.get('/pass/realms/$realmSlug/members/me'); return SnRealmMember.fromJson(response.data); } catch (err) { if (err is DioException && err.response?.statusCode == 404) { @@ -117,7 +115,7 @@ class RealmDetailScreen extends HookConsumerWidget { onPressed: () async { try { final apiClient = ref.read(apiClientProvider); - await apiClient.post('/sphere/realms/$slug/members/me'); + await apiClient.post('/pass/realms/$slug/members/me'); ref.invalidate(realmIdentityProvider(slug)); ref.invalidate(realmsJoinedProvider); showSnackBar('realmJoinSuccess'.tr()); @@ -432,7 +430,7 @@ class _RealmActionMenu extends HookConsumerWidget { ).then((confirm) { if (confirm) { final client = ref.watch(apiClientProvider); - client.delete('/sphere/realms/$realmSlug'); + client.delete('/pass/realms/$realmSlug'); ref.invalidate(realmsJoinedProvider); if (context.mounted) { context.pop(true); @@ -465,7 +463,7 @@ class _RealmActionMenu extends HookConsumerWidget { if (confirm) { final client = ref.watch(apiClientProvider); await client.delete( - '/sphere/realms/$realmSlug/members/me', + '/pass/realms/$realmSlug/members/me', ); ref.invalidate(realmsJoinedProvider); if (context.mounted) { @@ -505,7 +503,7 @@ class _RealmActionMenu extends HookConsumerWidget { if (confirm) { final client = ref.watch(apiClientProvider); await client.delete( - '/sphere/realms/$realmSlug/members/me', + '/pass/realms/$realmSlug/members/me', ); ref.invalidate(realmsJoinedProvider); if (context.mounted) { @@ -539,7 +537,7 @@ class RealmMemberListNotifier extends _$RealmMemberListNotifier final offset = cursor != null ? int.parse(cursor) : 0; final response = await apiClient.get( - '/sphere/realms/$realmSlug/members', + '/pass/realms/$realmSlug/members', queryParameters: { 'offset': offset, 'take': _pageSize, @@ -592,7 +590,7 @@ class _RealmMemberListSheet extends HookConsumerWidget { try { final apiClient = ref.watch(apiClientProvider); await apiClient.post( - '/sphere/realms/invites/$realmSlug', + '/pass/realms/invites/$realmSlug', data: {'related_user_id': result.id, 'role': 0}, ); // Refresh the provider @@ -729,7 +727,7 @@ class _RealmMemberListSheet extends HookConsumerWidget { try { final apiClient = ref.watch(apiClientProvider); await apiClient.delete( - '/sphere/realms/$realmSlug/members/${member.accountId}', + '/pass/realms/$realmSlug/members/${member.accountId}', ); // Refresh the provider ref.invalidate(memberListProvider); @@ -860,7 +858,7 @@ class _RealmMemberRoleSheet extends HookConsumerWidget { final apiClient = ref.read(apiClientProvider); await apiClient.patch( - '/sphere/realms/$realmSlug/members/${member.accountId}/role', + '/pass/realms/$realmSlug/members/${member.accountId}/role', data: newRole, ); diff --git a/lib/screens/realm/realm_detail.g.dart b/lib/screens/realm/realm_detail.g.dart index 75494f99..e6e5c849 100644 --- a/lib/screens/realm/realm_detail.g.dart +++ b/lib/screens/realm/realm_detail.g.dart @@ -155,7 +155,7 @@ class _RealmAppbarForegroundColorProviderElement (origin as RealmAppbarForegroundColorProvider).realmSlug; } -String _$realmIdentityHash() => r'c5e2977d243260947b919bc27146c134e34f0db1'; +String _$realmIdentityHash() => r'd5a3ecc6eeec291cebbfc9a45d8aac7195366381'; /// See also [realmIdentity]. @ProviderFor(realmIdentity) @@ -276,7 +276,7 @@ class _RealmIdentityProviderElement String get realmSlug => (origin as RealmIdentityProvider).realmSlug; } -String _$realmChatRoomsHash() => r'5f199906fb287b109e2a2d2a81dcb6675bdcb816'; +String _$realmChatRoomsHash() => r'54d36010221cd298f5ee0059259059f8b8aaff7b'; /// See also [realmChatRooms]. @ProviderFor(realmChatRooms) @@ -399,7 +399,7 @@ class _RealmChatRoomsProviderElement } String _$realmMemberListNotifierHash() => - r'db1fd8a6741dfb3d5bb921d5d965f0cfdc0e7bcc'; + r'ab38c550c43cbf93d4c3e92e6658d76f40252c1f'; abstract class _$RealmMemberListNotifier extends BuildlessAutoDisposeAsyncNotifier> { diff --git a/lib/screens/realm/realm_form.dart b/lib/screens/realm/realm_form.dart index de4d9650..79ed768f 100644 --- a/lib/screens/realm/realm_form.dart +++ b/lib/screens/realm/realm_form.dart @@ -122,7 +122,7 @@ class EditRealmScreen extends HookConsumerWidget { try { final client = ref.watch(apiClientProvider); final resp = await client.request( - '/sphere${slug == null ? '/realms' : '/realms/$slug'}', + '/pass${slug == null ? '/realms' : '/realms/$slug'}', data: { 'slug': slugController.text, 'name': nameController.text, diff --git a/lib/screens/realm/realms.dart b/lib/screens/realm/realms.dart index a47fae63..e1354cc0 100644 --- a/lib/screens/realm/realms.dart +++ b/lib/screens/realm/realms.dart @@ -21,7 +21,7 @@ part 'realms.g.dart'; @riverpod Future> realmsJoined(Ref ref) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/sphere/realms'); + final resp = await client.get('/pass/realms'); return resp.data.map((e) => SnRealm.fromJson(e)).cast().toList(); } @@ -29,7 +29,7 @@ Future> realmsJoined(Ref ref) async { Future realm(Ref ref, String? identifier) async { if (identifier == null) return null; final client = ref.watch(apiClientProvider); - final resp = await client.get('/sphere/realms/$identifier'); + final resp = await client.get('/pass/realms/$identifier'); return SnRealm.fromJson(resp.data); } @@ -128,7 +128,7 @@ class RealmListScreen extends HookConsumerWidget { @riverpod Future> realmInvites(Ref ref) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/sphere/realms/invites'); + final resp = await client.get('/pass/realms/invites'); return resp.data .map((e) => SnRealmMember.fromJson(e)) .cast() @@ -145,9 +145,7 @@ class _RealmInviteSheet extends HookConsumerWidget { Future acceptInvite(SnRealmMember invite) async { try { final client = ref.read(apiClientProvider); - await client.post( - '/sphere/realms/invites/${invite.realm!.slug}/accept', - ); + await client.post('/pass/realms/invites/${invite.realm!.slug}/accept'); ref.invalidate(realmInvitesProvider); ref.invalidate(realmsJoinedProvider); } catch (err) { @@ -158,9 +156,7 @@ class _RealmInviteSheet extends HookConsumerWidget { Future declineInvite(SnRealmMember invite) async { try { final client = ref.read(apiClientProvider); - await client.post( - '/sphere/realms/invites/${invite.realm!.slug}/decline', - ); + await client.post('/pass/realms/invites/${invite.realm!.slug}/decline'); ref.invalidate(realmInvitesProvider); } catch (err) { showErrorAlert(err); diff --git a/lib/screens/realm/realms.g.dart b/lib/screens/realm/realms.g.dart index e2f08be3..a57a7383 100644 --- a/lib/screens/realm/realms.g.dart +++ b/lib/screens/realm/realms.g.dart @@ -6,7 +6,7 @@ part of 'realms.dart'; // RiverpodGenerator // ************************************************************************** -String _$realmsJoinedHash() => r'e8083f02ffae450bba2470c31757675b4df32cd0'; +String _$realmsJoinedHash() => r'b15029acd38f03bbbb8708adb78f25ac357a0421'; /// See also [realmsJoined]. @ProviderFor(realmsJoined) @@ -22,7 +22,7 @@ final realmsJoinedProvider = AutoDisposeFutureProvider>.internal( @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element typedef RealmsJoinedRef = AutoDisposeFutureProviderRef>; -String _$realmHash() => r'4650b17608a9ee14170ef20295eb14d295e909c9'; +String _$realmHash() => r'71a126ab2810566646e1629290c1ce9ffa0839e3'; /// Copied from Dart SDK class _SystemHash { @@ -156,7 +156,7 @@ class _RealmProviderElement extends AutoDisposeFutureProviderElement String? get identifier => (origin as RealmProvider).identifier; } -String _$realmInvitesHash() => r'ed73443c6423b92ed72982be2a93b7dcc7ce3945'; +String _$realmInvitesHash() => r'92cce0978c7ca8813e27ae42fc6f3a93a09a8962'; /// See also [realmInvites]. @ProviderFor(realmInvites) diff --git a/lib/screens/wallet.dart b/lib/screens/wallet.dart index 83bd0173..2eafd7f7 100644 --- a/lib/screens/wallet.dart +++ b/lib/screens/wallet.dart @@ -28,7 +28,7 @@ part 'wallet.g.dart'; Future walletCurrent(Ref ref) async { try { final apiClient = ref.watch(apiClientProvider); - final resp = await apiClient.get('/id/wallets'); + final resp = await apiClient.get('/pass/wallets'); return SnWallet.fromJson(resp.data); } catch (err) { if (err is DioException && err.response?.statusCode == 404) { @@ -41,7 +41,7 @@ Future walletCurrent(Ref ref) async { @riverpod Future walletStats(Ref ref) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/wallets/stats'); + final resp = await client.get('/pass/wallets/stats'); return SnWalletStats.fromJson(resp.data); } @@ -1021,7 +1021,7 @@ class TransactionListNotifier extends _$TransactionListNotifier final queryParams = {'offset': offset, 'take': _pageSize}; final response = await client.get( - '/id/wallets/transactions', + '/pass/wallets/transactions', queryParameters: queryParams, ); final total = int.parse(response.headers.value('X-Total') ?? '0'); @@ -1048,7 +1048,9 @@ Future> walletFunds( int take = 20, }) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/wallets/funds?offset=$offset&take=$take'); + final resp = await client.get( + '/pass/wallets/funds?offset=$offset&take=$take', + ); return (resp.data as List).map((e) => SnWalletFund.fromJson(e)).toList(); } @@ -1060,7 +1062,7 @@ Future> walletFundRecipients( }) async { final client = ref.watch(apiClientProvider); final resp = await client.get( - '/id/wallets/funds/recipients?offset=$offset&take=$take', + '/pass/wallets/funds/recipients?offset=$offset&take=$take', ); return (resp.data as List) .map((e) => SnWalletFundRecipient.fromJson(e)) @@ -1070,7 +1072,7 @@ Future> walletFundRecipients( @riverpod Future walletFund(Ref ref, String fundId) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/wallets/funds/$fundId'); + final resp = await client.get('/pass/wallets/funds/$fundId'); return SnWalletFund.fromJson(resp.data); } @@ -1262,7 +1264,7 @@ class WalletScreen extends HookConsumerWidget { Future createWallet() async { final client = ref.read(apiClientProvider); try { - await client.post('/id/wallets'); + await client.post('/pass/wallets'); ref.invalidate(walletCurrentProvider); } catch (err) { showErrorAlert(err); @@ -1762,14 +1764,16 @@ class WalletScreen extends HookConsumerWidget { try { showLoadingModal(context); final resp = await client.post( - '/id/wallets/funds', + '/pass/wallets/funds', data: fundData, options: Options(headers: {'X-Noop': true}), ); final fund = SnWalletFund.fromJson(resp.data); if (fund.status == 0) return; // Already created - final orderResp = await client.post('/id/wallets/funds/${fund.id}/order'); + final orderResp = await client.post( + '/pass/wallets/funds/${fund.id}/order', + ); final order = SnWalletOrder.fromJson(orderResp.data); if (context.mounted) hideLoadingModal(context); @@ -1808,7 +1812,7 @@ class WalletScreen extends HookConsumerWidget { final client = ref.read(apiClientProvider); try { showLoadingModal(context); - await client.post('/id/wallets/transfer', data: transferData); + await client.post('/pass/wallets/transfer', data: transferData); if (context.mounted) hideLoadingModal(context); diff --git a/lib/screens/wallet.dart.backup b/lib/screens/wallet.dart.backup index e6b62709..2926ed49 100644 --- a/lib/screens/wallet.dart.backup +++ b/lib/screens/wallet.dart.backup @@ -26,7 +26,7 @@ part 'wallet.g.dart'; Future walletCurrent(Ref ref) async { try { final apiClient = ref.watch(apiClientProvider); - final resp = await apiClient.get('/id/wallets'); + final resp = await apiClient.get('/pass/wallets'); return SnWallet.fromJson(resp.data); } catch (err) { if (err is DioException && err.response?.statusCode == 404) { @@ -491,7 +491,7 @@ class TransactionListNotifier extends _$TransactionListNotifier final queryParams = {'offset': offset, 'take': _pageSize}; final response = await client.get( - '/id/wallets/transactions', + '/pass/wallets/transactions', queryParameters: queryParams, ); final total = int.parse(response.headers.value('X-Total') ?? '0'); @@ -518,7 +518,7 @@ Future> walletFunds( int take = 20, }) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/wallets/funds?offset=$offset&take=$take'); + final resp = await client.get('/pass/wallets/funds?offset=$offset&take=$take'); return (resp.data as List).map((e) => SnWalletFund.fromJson(e)).toList(); } @@ -530,7 +530,7 @@ Future> walletFundRecipients( }) async { final client = ref.watch(apiClientProvider); final resp = await client.get( - '/id/wallets/funds/recipients?offset=$offset&take=$take', + '/pass/wallets/funds/recipients?offset=$offset&take=$take', ); return (resp.data as List) .map((e) => SnWalletFundRecipient.fromJson(e)) @@ -540,14 +540,14 @@ Future> walletFundRecipients( @riverpod Future walletFund(Ref ref, String fundId) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/wallets/funds/$fundId'); + final resp = await client.get('/pass/wallets/funds/$fundId'); return SnWalletFund.fromJson(resp.data); } @riverpod Future> walletFundStats(Ref ref) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/wallets/funds/stats'); + final resp = await client.get('/pass/wallets/funds/stats'); return resp.data as Map; } @@ -563,7 +563,7 @@ class WalletScreen extends HookConsumerWidget { Future createWallet() async { final client = ref.read(apiClientProvider); try { - await client.post('/id/wallets'); + await client.post('/pass/wallets'); ref.invalidate(walletCurrentProvider); } catch (err) { showErrorAlert(err); @@ -941,14 +941,14 @@ class WalletScreen extends HookConsumerWidget { try { showLoadingModal(context); final resp = await client.post( - '/id/wallets/funds', + '/pass/wallets/funds', data: fundData, options: Options(headers: {'X-Noop': true}), ); final fund = SnWalletFund.fromJson(resp.data); if (fund.status == 0) return; // Already created - final orderResp = await client.post('/id/wallets/funds/${fund.id}/order'); + final orderResp = await client.post('/pass/wallets/funds/${fund.id}/order'); final order = SnWalletOrder.fromJson(orderResp.data); if (context.mounted) hideLoadingModal(context); diff --git a/lib/screens/wallet.g.dart b/lib/screens/wallet.g.dart index 841c1ae4..ce0eedc7 100644 --- a/lib/screens/wallet.g.dart +++ b/lib/screens/wallet.g.dart @@ -6,7 +6,7 @@ part of 'wallet.dart'; // RiverpodGenerator // ************************************************************************** -String _$walletCurrentHash() => r'088505ce1a78901016a3bda05217f813ed3b44c6'; +String _$walletCurrentHash() => r'bdc7cb27ce2286b561a03522085cc4efc884faad'; /// See also [walletCurrent]. @ProviderFor(walletCurrent) @@ -24,7 +24,7 @@ final walletCurrentProvider = AutoDisposeFutureProvider.internal( @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element typedef WalletCurrentRef = AutoDisposeFutureProviderRef; -String _$walletStatsHash() => r'23d692a922c2388135be6a46afa73c018762eb57'; +String _$walletStatsHash() => r'2243011937b377a66cdf44cae144021cee69e82f'; /// See also [walletStats]. @ProviderFor(walletStats) @@ -40,7 +40,7 @@ final walletStatsProvider = AutoDisposeFutureProvider.internal( @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element typedef WalletStatsRef = AutoDisposeFutureProviderRef; -String _$walletFundsHash() => r'7ceb415f64fcadab2b10461e27b95bf92352c707'; +String _$walletFundsHash() => r'f60718c01ca5b7618a02682a0417669f750644a3'; /// Copied from Dart SDK class _SystemHash { @@ -195,7 +195,7 @@ class _WalletFundsProviderElement } String _$walletFundRecipientsHash() => - r'18eb815eb709449dd5c545d81fc0ee43ca667578'; + r'3a5e32b2d20700edd5944885693aff127b58adb1'; /// See also [walletFundRecipients]. @ProviderFor(walletFundRecipients) @@ -339,7 +339,7 @@ class _WalletFundRecipientsProviderElement int get take => (origin as WalletFundRecipientsProvider).take; } -String _$walletFundHash() => r'a690b0def8f4293b4a8f244e44f8bb735687e5dd'; +String _$walletFundHash() => r'459efdee5e2775eedaa4312e0d317c218fa7e1fa'; /// See also [walletFund]. @ProviderFor(walletFund) @@ -460,7 +460,7 @@ class _WalletFundProviderElement } String _$transactionListNotifierHash() => - r'7b777cd44f3351f68f7bd1dd76bfe8b388381bdb'; + r'74d3c15f45a6e55b36150ab38e98475a508fc932'; /// See also [TransactionListNotifier]. @ProviderFor(TransactionListNotifier) diff --git a/lib/services/abuse_report_service.dart b/lib/services/abuse_report_service.dart index a7d825a9..ef69f933 100644 --- a/lib/services/abuse_report_service.dart +++ b/lib/services/abuse_report_service.dart @@ -13,14 +13,14 @@ class AbuseReportService { Future getReport(String id) async { final response = await ref .read(apiClientProvider) - .get('/id/safety/reports/me/$id'); + .get('/pass/safety/reports/me/$id'); return SnAbuseReport.fromJson(response.data); } Future> getReports() async { final response = await ref .read(apiClientProvider) - .get('/id/safety/reports/me'); + .get('/pass/safety/reports/me'); return (response.data as List) .map((json) => SnAbuseReport.fromJson(json)) .toList(); diff --git a/lib/widgets/account/account_devices.dart b/lib/widgets/account/account_devices.dart index ed9070c3..cb14826e 100644 --- a/lib/widgets/account/account_devices.dart +++ b/lib/widgets/account/account_devices.dart @@ -22,7 +22,7 @@ part 'account_devices.g.dart'; Future> authDevices(Ref ref) async { final resp = await ref .watch(apiClientProvider) - .get('/id/accounts/me/devices'); + .get('/pass/accounts/me/devices'); final currentId = await getUdid(); final data = resp.data.map((e) { @@ -154,7 +154,7 @@ class AccountSessionSheet extends HookConsumerWidget { if (!confirm || !context.mounted) return; try { final apiClient = ref.watch(apiClientProvider); - await apiClient.delete('/id/accounts/me/devices/$sessionId'); + await apiClient.delete('/pass/accounts/me/devices/$sessionId'); ref.invalidate(authDevicesProvider); } catch (err) { showErrorAlert(err); @@ -193,7 +193,7 @@ class AccountSessionSheet extends HookConsumerWidget { try { final apiClient = ref.watch(apiClientProvider); await apiClient.patch( - '/id/accounts/me/devices/$sessionId/label', + '/pass/accounts/me/devices/$sessionId/label', data: jsonEncode(label), ); ref.invalidate(authDevicesProvider); @@ -284,7 +284,7 @@ class AccountSessionSheet extends HookConsumerWidget { apiClientProvider, ); await apiClient.delete( - '/id/accounts/me/devices/${device.deviceId}', + '/pass/accounts/me/devices/${device.deviceId}', ); ref.invalidate(authDevicesProvider); } catch (err) { diff --git a/lib/widgets/account/account_devices.g.dart b/lib/widgets/account/account_devices.g.dart index 359f3bea..8191cfcf 100644 --- a/lib/widgets/account/account_devices.g.dart +++ b/lib/widgets/account/account_devices.g.dart @@ -6,7 +6,7 @@ part of 'account_devices.dart'; // RiverpodGenerator // ************************************************************************** -String _$authDevicesHash() => r'feb19238f759921e51c888f8b443a3d7761e68da'; +String _$authDevicesHash() => r'35735af4ed75b73fe80c8942e53b3bc26a569c01'; /// See also [authDevices]. @ProviderFor(authDevices) diff --git a/lib/widgets/account/account_picker.dart b/lib/widgets/account/account_picker.dart index 92b81441..396d3553 100644 --- a/lib/widgets/account/account_picker.dart +++ b/lib/widgets/account/account_picker.dart @@ -19,7 +19,7 @@ Future> searchAccounts(Ref ref, {required String query}) async { final apiClient = ref.watch(apiClientProvider); final response = await apiClient.get( - '/id/accounts/search', + '/pass/accounts/search', queryParameters: {'query': query}, ); diff --git a/lib/widgets/account/account_picker.g.dart b/lib/widgets/account/account_picker.g.dart index 00ad44e5..ee142f81 100644 --- a/lib/widgets/account/account_picker.g.dart +++ b/lib/widgets/account/account_picker.g.dart @@ -6,7 +6,7 @@ part of 'account_picker.dart'; // RiverpodGenerator // ************************************************************************** -String _$searchAccountsHash() => r'fa3b8b7d51e14cf40d4116ba0ff0b6955fa0ff54'; +String _$searchAccountsHash() => r'3b4aa4d7970a1e406c1a0a1dfac2c686e05bc533'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/widgets/account/restore_purchase_sheet.dart b/lib/widgets/account/restore_purchase_sheet.dart index e67a7ada..91fba223 100644 --- a/lib/widgets/account/restore_purchase_sheet.dart +++ b/lib/widgets/account/restore_purchase_sheet.dart @@ -31,7 +31,7 @@ class RestorePurchaseSheet extends HookConsumerWidget { try { final client = ref.read(apiClientProvider); await client.post( - '/id/subscriptions/order/restore/${selectedProvider.value!}', + '/pass/subscriptions/order/restore/${selectedProvider.value!}', data: {'order_id': orderIdController.text.trim()}, ); diff --git a/lib/widgets/account/status.dart b/lib/widgets/account/status.dart index b002e7f1..18917c36 100644 --- a/lib/widgets/account/status.dart +++ b/lib/widgets/account/status.dart @@ -27,14 +27,18 @@ class CurrentAccountStatusNotifier extends StateNotifier { } } -final currentAccountStatusProvider = StateNotifierProvider((ref) { - return CurrentAccountStatusNotifier(); -}); +final currentAccountStatusProvider = + StateNotifierProvider(( + ref, + ) { + return CurrentAccountStatusNotifier(); + }); @riverpod Future accountStatus(Ref ref, String uname) async { final userInfo = ref.watch(userInfoProvider); - if (uname == 'me' || (userInfo.value != null && uname == userInfo.value!.name)) { + if (uname == 'me' || + (userInfo.value != null && uname == userInfo.value!.name)) { final local = ref.watch(currentAccountStatusProvider); if (local != null) { return local; @@ -42,7 +46,7 @@ Future accountStatus(Ref ref, String uname) async { } final apiClient = ref.watch(apiClientProvider); try { - final resp = await apiClient.get('/id/accounts/$uname/statuses'); + final resp = await apiClient.get('/pass/accounts/$uname/statuses'); return SnAccountStatus.fromJson(resp.data); } catch (err) { if (err is DioException) { @@ -137,9 +141,13 @@ class AccountStatusWidget extends HookConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { final userInfo = ref.watch(userInfoProvider); final localStatus = ref.watch(currentAccountStatusProvider); - final status = (uname == 'me' || (userInfo.value != null && uname == userInfo.value!.name && localStatus != null)) - ? AsyncValue.data(localStatus) - : ref.watch(accountStatusProvider(uname)); + final status = + (uname == 'me' || + (userInfo.value != null && + uname == userInfo.value!.name && + localStatus != null)) + ? AsyncValue.data(localStatus) + : ref.watch(accountStatusProvider(uname)); final account = ref.watch(accountProvider(uname)); return Padding( @@ -166,16 +174,17 @@ class AccountStatusWidget extends HookConsumerWidget { onLongPress: () { showDialog( context: context, - builder: (context) => AlertDialog( - title: Text('Activity Details'), - content: buildActivityDetails(status.value), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: Text('Close'), + builder: + (context) => AlertDialog( + title: Text('Activity Details'), + content: buildActivityDetails(status.value), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: Text('Close'), + ), + ], ), - ], - ), ); }, child: Tooltip( diff --git a/lib/widgets/account/status.g.dart b/lib/widgets/account/status.g.dart index f4ab4ffc..06399470 100644 --- a/lib/widgets/account/status.g.dart +++ b/lib/widgets/account/status.g.dart @@ -6,7 +6,7 @@ part of 'status.dart'; // RiverpodGenerator // ************************************************************************** -String _$accountStatusHash() => r'abc2f11f0fbaf637efc182cf85ab838936c4d875'; +String _$accountStatusHash() => r'4cac809808e6f1345dab06dc32d759cfcea13315'; /// Copied from Dart SDK class _SystemHash { diff --git a/lib/widgets/account/status_creation.dart b/lib/widgets/account/status_creation.dart index d6c0e32e..0888c02e 100644 --- a/lib/widgets/account/status_creation.dart +++ b/lib/widgets/account/status_creation.dart @@ -33,7 +33,7 @@ class AccountStatusCreationSheet extends HookConsumerWidget { submitting.value = true; final user = ref.watch(userInfoProvider); final apiClient = ref.read(apiClientProvider); - await apiClient.delete('/id/accounts/me/statuses'); + await apiClient.delete('/pass/accounts/me/statuses'); if (!context.mounted) return; ref.invalidate(accountStatusProvider(user.value!.name)); Navigator.pop(context); @@ -50,7 +50,7 @@ class AccountStatusCreationSheet extends HookConsumerWidget { final user = ref.watch(userInfoProvider); final apiClient = ref.read(apiClientProvider); await apiClient.request( - '/id/accounts/me/statuses', + '/pass/accounts/me/statuses', data: { 'attitude': attitude.value, 'is_invisible': isInvisible.value, diff --git a/lib/widgets/account/stellar_program_tab.dart b/lib/widgets/account/stellar_program_tab.dart index 515e4aec..b851c3ee 100644 --- a/lib/widgets/account/stellar_program_tab.dart +++ b/lib/widgets/account/stellar_program_tab.dart @@ -30,7 +30,7 @@ part 'stellar_program_tab.g.dart'; Future accountStellarSubscription(Ref ref) async { try { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/subscriptions/fuzzy/solian.stellar'); + final resp = await client.get('/pass/subscriptions/fuzzy/solian.stellar'); return SnWalletSubscription.fromJson(resp.data); } catch (err) { if (err is DioException && err.response?.statusCode == 404) return null; @@ -46,7 +46,7 @@ Future> accountSentGifts( }) async { final client = ref.watch(apiClientProvider); final resp = await client.get( - '/id/subscriptions/gifts/sent?offset=$offset&take=$take', + '/pass/subscriptions/gifts/sent?offset=$offset&take=$take', ); return (resp.data as List).map((e) => SnWalletGift.fromJson(e)).toList(); } @@ -59,7 +59,7 @@ Future> accountReceivedGifts( }) async { final client = ref.watch(apiClientProvider); final resp = await client.get( - '/id/subscriptions/gifts/received?offset=$offset&take=$take', + '/pass/subscriptions/gifts/received?offset=$offset&take=$take', ); return (resp.data as List).map((e) => SnWalletGift.fromJson(e)).toList(); } @@ -67,7 +67,7 @@ Future> accountReceivedGifts( @riverpod Future accountGift(Ref ref, String giftId) async { final client = ref.watch(apiClientProvider); - final resp = await client.get('/id/subscriptions/gifts/$giftId'); + final resp = await client.get('/pass/subscriptions/gifts/$giftId'); return SnWalletGift.fromJson(resp.data); } @@ -388,7 +388,9 @@ class StellarProgramTab extends HookConsumerWidget { try { showLoadingModal(context); final client = ref.watch(apiClientProvider); - await client.post('/id/subscriptions/${membership.identifier}/cancel'); + await client.post( + '/pass/subscriptions/${membership.identifier}/cancel', + ); ref.invalidate(accountStellarSubscriptionProvider); ref.read(userInfoProvider.notifier).fetchUser(); if (context.mounted) { @@ -698,7 +700,7 @@ class StellarProgramTab extends HookConsumerWidget { try { showLoadingModal(context); final resp = await client.post( - '/id/subscriptions', + '/pass/subscriptions', data: { 'identifier': tierId, 'payment_method': 'solian.wallet', @@ -710,7 +712,7 @@ class StellarProgramTab extends HookConsumerWidget { final subscription = SnWalletSubscription.fromJson(resp.data); if (subscription.status == 1) return; final orderResp = await client.post( - '/id/subscriptions/${subscription.identifier}/order', + '/pass/subscriptions/${subscription.identifier}/order', ); final order = SnWalletOrder.fromJson(orderResp.data); @@ -1221,7 +1223,7 @@ class StellarProgramTab extends HookConsumerWidget { try { showLoadingModal(context); final resp = await client.post( - '/id/subscriptions/gifts/purchase', + '/pass/subscriptions/gifts/purchase', data: { 'subscription_identifier': subscriptionId, if (recipientId != null) 'recipient_id': recipientId, @@ -1237,7 +1239,7 @@ class StellarProgramTab extends HookConsumerWidget { if (gift.status == 1) return; // Already paid final orderResp = await client.post( - '/id/subscriptions/gifts/${gift.id}/order', + '/pass/subscriptions/gifts/${gift.id}/order', ); final order = SnWalletOrder.fromJson(orderResp.data); @@ -1258,7 +1260,9 @@ class StellarProgramTab extends HookConsumerWidget { await Future.delayed(const Duration(seconds: 1)); // Get the updated gift - final giftResp = await client.get('/id/subscriptions/gifts/${gift.id}'); + final giftResp = await client.get( + '/pass/subscriptions/gifts/${gift.id}', + ); final updatedGift = SnWalletGift.fromJson(giftResp.data); if (context.mounted) hideLoadingModal(context); @@ -1367,7 +1371,7 @@ class StellarProgramTab extends HookConsumerWidget { // First check if gift can be redeemed final checkResp = await client.get( - '/id/subscriptions/gifts/check/$giftCode', + '/pass/subscriptions/gifts/check/$giftCode', ); final checkData = checkResp.data as Map; @@ -1379,7 +1383,7 @@ class StellarProgramTab extends HookConsumerWidget { // Redeem the gift await client.post( - '/id/subscriptions/gifts/redeem', + '/pass/subscriptions/gifts/redeem', data: {'gift_code': giftCode}, ); @@ -1424,7 +1428,7 @@ class StellarProgramTab extends HookConsumerWidget { final client = ref.watch(apiClientProvider); try { showLoadingModal(context); - await client.post('/id/subscriptions/gifts/${gift.id}/cancel'); + await client.post('/pass/subscriptions/gifts/${gift.id}/cancel'); ref.invalidate(accountSentGiftsProvider); if (context.mounted) { hideLoadingModal(context); diff --git a/lib/widgets/account/stellar_program_tab.g.dart b/lib/widgets/account/stellar_program_tab.g.dart index 8c1cc959..2d33182e 100644 --- a/lib/widgets/account/stellar_program_tab.g.dart +++ b/lib/widgets/account/stellar_program_tab.g.dart @@ -7,7 +7,7 @@ part of 'stellar_program_tab.dart'; // ************************************************************************** String _$accountStellarSubscriptionHash() => - r'80abcdefb3868775fd8fe3c980215713efff5948'; + r'7cdfc7ca29aac240fc8704f4493498d87f307400'; /// See also [accountStellarSubscription]. @ProviderFor(accountStellarSubscription) @@ -27,7 +27,7 @@ final accountStellarSubscriptionProvider = // ignore: unused_element typedef AccountStellarSubscriptionRef = AutoDisposeFutureProviderRef; -String _$accountSentGiftsHash() => r'36fdf4e2be3805e8501cca1657d8be27aa891ef4'; +String _$accountSentGiftsHash() => r'460af8d22e16dc402848cb94e9b8a8a26d023c41'; /// Copied from Dart SDK class _SystemHash { @@ -187,7 +187,7 @@ class _AccountSentGiftsProviderElement } String _$accountReceivedGiftsHash() => - r'15f6f7e27aa0277b67b02dd72875ba3efd147dfd'; + r'1208c27cca49e154af073071a197b37a2703f56d'; /// See also [accountReceivedGifts]. @ProviderFor(accountReceivedGifts) @@ -328,7 +328,7 @@ class _AccountReceivedGiftsProviderElement int get take => (origin as AccountReceivedGiftsProvider).take; } -String _$accountGiftHash() => r'598c5071fff3cc1dd7eb867df48d69fef04543db'; +String _$accountGiftHash() => r'70ca553e0b84cba9dfbee428f9bf44207138713a'; /// See also [accountGift]. @ProviderFor(accountGift) diff --git a/lib/widgets/check_in.dart b/lib/widgets/check_in.dart index 4acf0f6f..8d1d3a77 100644 --- a/lib/widgets/check_in.dart +++ b/lib/widgets/check_in.dart @@ -26,7 +26,7 @@ part 'check_in.g.dart'; Future checkInResultToday(Ref ref) async { final client = ref.watch(apiClientProvider); try { - final resp = await client.get('/id/accounts/me/check-in'); + final resp = await client.get('/pass/accounts/me/check-in'); return SnCheckInResult.fromJson(resp.data); } catch (err) { if (err is DioException) { @@ -42,7 +42,7 @@ Future checkInResultToday(Ref ref) async { Future nextNotableDay(Ref ref) async { final client = ref.watch(apiClientProvider); try { - final resp = await client.get('/id/notable/me/next'); + final resp = await client.get('/pass/notable/me/next'); return SnNotableDay.fromJson(resp.data); } catch (err) { return null; @@ -94,7 +94,7 @@ class CheckInWidget extends HookConsumerWidget { final client = ref.read(apiClientProvider); try { await client.post( - '/id/accounts/me/check-in', + '/pass/accounts/me/check-in', data: captchatTk == null ? null : jsonEncode(captchatTk), ); ref.invalidate(checkInResultTodayProvider); diff --git a/lib/widgets/check_in.g.dart b/lib/widgets/check_in.g.dart index 84a76b2b..529f293b 100644 --- a/lib/widgets/check_in.g.dart +++ b/lib/widgets/check_in.g.dart @@ -7,7 +7,7 @@ part of 'check_in.dart'; // ************************************************************************** String _$checkInResultTodayHash() => - r'402e3a3be0d441ae12b2370d19d09bf81326933f'; + r'b4dc97b2243f542b36c295dc5cce3fe6097cb308'; /// See also [checkInResultToday]. @ProviderFor(checkInResultToday) @@ -26,7 +26,7 @@ final checkInResultTodayProvider = @Deprecated('Will be removed in 3.0. Use Ref instead') // ignore: unused_element typedef CheckInResultTodayRef = AutoDisposeFutureProviderRef; -String _$nextNotableDayHash() => r'698370bec4be28774d332412c5a701f914064c90'; +String _$nextNotableDayHash() => r'c8404308f6b0f581cc7df251bce8f3c5ac130245'; /// See also [nextNotableDay]. @ProviderFor(nextNotableDay) diff --git a/lib/widgets/payment/payment_overlay.dart b/lib/widgets/payment/payment_overlay.dart index 564c2bb6..92256f26 100644 --- a/lib/widgets/payment/payment_overlay.dart +++ b/lib/widgets/payment/payment_overlay.dart @@ -241,7 +241,7 @@ class _PaymentContentState extends ConsumerState<_PaymentContent> { try { final client = ref.read(apiClientProvider); final response = await client.post( - '/id/orders/${widget.order.id}/pay', + '/pass/orders/${widget.order.id}/pay', data: {'pin_code': pin}, ); diff --git a/lib/widgets/post/post_award_sheet.dart b/lib/widgets/post/post_award_sheet.dart index 06b187e6..cfcbbf2c 100644 --- a/lib/widgets/post/post_award_sheet.dart +++ b/lib/widgets/post/post_award_sheet.dart @@ -259,7 +259,7 @@ class PostAwardSheet extends HookConsumerWidget { final orderId = awardResponse.data['order_id'] as String; // Fetch order details - final orderResponse = await client.get('/id/orders/$orderId'); + final orderResponse = await client.get('/pass/orders/$orderId'); final order = SnWalletOrder.fromJson(orderResponse.data); if (context.mounted) { diff --git a/lib/widgets/safety/abuse_report_sheet.dart b/lib/widgets/safety/abuse_report_sheet.dart index 126417f5..3b39a90c 100644 --- a/lib/widgets/safety/abuse_report_sheet.dart +++ b/lib/widgets/safety/abuse_report_sheet.dart @@ -43,7 +43,7 @@ class AbuseReportSheet extends HookConsumerWidget { try { final client = ref.read(apiClientProvider); await client.post( - '/id/safety/reports', + '/pass/safety/reports', data: { 'resource_identifier': resourceIdentifier, 'type': selectedType.value,