Load server configuration
This commit is contained in:
@ -1,6 +1,7 @@
|
|||||||
import 'package:moneymgr_mobile/services/api/api_client.dart';
|
import 'package:moneymgr_mobile/services/api/api_client.dart';
|
||||||
import 'package:moneymgr_mobile/services/api/api_token.dart';
|
import 'package:moneymgr_mobile/services/api/api_token.dart';
|
||||||
import 'package:moneymgr_mobile/services/api/auth_api.dart';
|
import 'package:moneymgr_mobile/services/api/auth_api.dart';
|
||||||
|
import 'package:moneymgr_mobile/services/storage/prefs.dart';
|
||||||
import 'package:moneymgr_mobile/services/storage/secure_storage.dart';
|
import 'package:moneymgr_mobile/services/storage/secure_storage.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
@ -25,7 +26,10 @@ class CurrentAuthState extends _$CurrentAuthState {
|
|||||||
/// Will invalidate the state if success and throw an exception in case of failure
|
/// Will invalidate the state if success and throw an exception in case of failure
|
||||||
Future<void> setAuthToken(ApiToken token) async {
|
Future<void> setAuthToken(ApiToken token) async {
|
||||||
// Attempt to use provided token
|
// Attempt to use provided token
|
||||||
await ApiClient(token: token).authInfo();
|
await ApiClient(
|
||||||
|
token: token,
|
||||||
|
prefs: await ref.watch(prefsProvider.future),
|
||||||
|
).authInfo();
|
||||||
|
|
||||||
final secureStorage = ref.read(secureStorageProvider).requireValue;
|
final secureStorage = ref.read(secureStorageProvider).requireValue;
|
||||||
await secureStorage.setToken(token);
|
await secureStorage.setToken(token);
|
||||||
@ -37,19 +41,13 @@ class CurrentAuthState extends _$CurrentAuthState {
|
|||||||
|
|
||||||
/// Logs out, deletes the saved token and profile info from storage, and invalidates
|
/// Logs out, deletes the saved token and profile info from storage, and invalidates
|
||||||
/// the state.
|
/// the state.
|
||||||
void logout() {
|
Future<void> logout() async {
|
||||||
// TODO : implement logic
|
final secureStorage = ref.read(secureStorageProvider).requireValue;
|
||||||
/*final secureStorage = ref.read(secureStorageProvider).requireValue;
|
await secureStorage.removeToken();
|
||||||
|
|
||||||
// Delete the current [token] and [profile] from secure storage.
|
|
||||||
secureStorage.remove('token');
|
|
||||||
|
|
||||||
ref
|
ref
|
||||||
// Invalidate the state so the auth state will be updated to unauthenticated.
|
// Invalidate the state so the auth state will be updated to authenticated.
|
||||||
..invalidateSelf()
|
.invalidateSelf();
|
||||||
// Invalidate the token provider so the API service will no longer use the
|
|
||||||
// previous token.
|
|
||||||
..invalidate(tokenProvider);*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
14
moneymgr_mobile/lib/routes/profile/profile_screen.dart
Normal file
14
moneymgr_mobile/lib/routes/profile/profile_screen.dart
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
import 'package:moneymgr_mobile/services/storage/prefs.dart';
|
||||||
|
|
||||||
|
class ProfileScreen extends HookConsumerWidget {
|
||||||
|
const ProfileScreen({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
final data = ref.watch(prefsProvider);
|
||||||
|
if (data.value == null) return CircularProgressIndicator();
|
||||||
|
return Text("dd\n\n\n${data.value!.serverConfig()}");
|
||||||
|
}
|
||||||
|
}
|
@ -2,8 +2,11 @@ import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart';
|
|||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
import 'package:moneymgr_mobile/services/api/api_token.dart';
|
import 'package:moneymgr_mobile/services/api/api_token.dart';
|
||||||
|
import 'package:moneymgr_mobile/services/storage/prefs.dart';
|
||||||
|
import 'package:moneymgr_mobile/services/storage/secure_storage.dart';
|
||||||
import 'package:moneymgr_mobile/utils/string_utils.dart';
|
import 'package:moneymgr_mobile/utils/string_utils.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
part 'api_client.g.dart';
|
part 'api_client.g.dart';
|
||||||
|
|
||||||
@ -14,8 +17,9 @@ const apiTokenHeader = "X-Auth-Token";
|
|||||||
class ApiClient {
|
class ApiClient {
|
||||||
final ApiToken token;
|
final ApiToken token;
|
||||||
final Dio client;
|
final Dio client;
|
||||||
|
final SharedPreferencesWithCache prefs;
|
||||||
|
|
||||||
ApiClient({required this.token})
|
ApiClient({required this.token, required this.prefs})
|
||||||
: client = Dio(BaseOptions(baseUrl: token.apiUrl));
|
: client = Dio(BaseOptions(baseUrl: token.apiUrl));
|
||||||
|
|
||||||
/// Get Dio instance
|
/// Get Dio instance
|
||||||
@ -54,19 +58,14 @@ class ApiClient {
|
|||||||
/// The API client is kept alive to follow dio's recommendation to use the same
|
/// The API client is kept alive to follow dio's recommendation to use the same
|
||||||
/// client instance for the entire app.
|
/// client instance for the entire app.
|
||||||
@riverpod
|
@riverpod
|
||||||
ApiClient apiService(Ref ref) {
|
ApiClient? apiService(Ref ref) {
|
||||||
/*final token = ref.watch(currentAuthStateProvider);
|
final storage = ref.watch(secureStorageProvider);
|
||||||
|
final prefs = ref.watch(prefsProvider);
|
||||||
|
|
||||||
final ApiClient client;
|
final t = storage.value?.token();
|
||||||
|
if (t == null || prefs.value == null) return null;
|
||||||
|
|
||||||
const mock = bool.fromEnvironment('MOCK_API', defaultValue: false);
|
|
||||||
client = switch (mock) {
|
|
||||||
true =>
|
|
||||||
token != null ? MockedApiClient.withToken(token) : MockedApiClient(),
|
|
||||||
false => token != null ? ApiClient.withToken(token) : ApiClient(),
|
|
||||||
};
|
|
||||||
ref.keepAlive();
|
ref.keepAlive();
|
||||||
|
|
||||||
return client;*/
|
return ApiClient(token: t, prefs: prefs.value!);
|
||||||
throw Exception("TODO"); // TODO
|
|
||||||
}
|
}
|
||||||
|
72
moneymgr_mobile/lib/services/api/server_api.dart
Normal file
72
moneymgr_mobile/lib/services/api/server_api.dart
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
// ignore_for_file: non_constant_identifier_names
|
||||||
|
|
||||||
|
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||||
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
import 'package:logging/logging.dart';
|
||||||
|
import 'package:moneymgr_mobile/services/storage/prefs.dart';
|
||||||
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
|
import 'api_client.dart';
|
||||||
|
|
||||||
|
part 'server_api.freezed.dart';
|
||||||
|
part 'server_api.g.dart';
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
abstract class ServerConstraint with _$ServerConstraint {
|
||||||
|
const factory ServerConstraint({required int min, required int max}) =
|
||||||
|
_ServerConstraint;
|
||||||
|
|
||||||
|
factory ServerConstraint.fromJson(Map<String, dynamic> json) =>
|
||||||
|
_$ServerConstraintFromJson(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
abstract class ServerConstraints with _$ServerConstraints {
|
||||||
|
const factory ServerConstraints({required ServerConstraint inbox_entry_label}) =
|
||||||
|
_ServerConstraints;
|
||||||
|
|
||||||
|
factory ServerConstraints.fromJson(Map<String, dynamic> json) =>
|
||||||
|
_$ServerConstraintsFromJson(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
@freezed
|
||||||
|
abstract class ServerConfig with _$ServerConfig {
|
||||||
|
const factory ServerConfig({required ServerConstraints constraints}) =
|
||||||
|
_ServerConfig;
|
||||||
|
|
||||||
|
factory ServerConfig.fromJson(Map<String, dynamic> json) =>
|
||||||
|
_$ServerConfigFromJson(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Auth API
|
||||||
|
extension ServerApi on ApiClient {
|
||||||
|
/// Get authentication information from server
|
||||||
|
Future<ServerConfig> serverConfig() async {
|
||||||
|
final response = await execute("/server/config", method: "GET");
|
||||||
|
return ServerConfig.fromJson(response.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get authentication information from server, or retrieve cached information (if available, in
|
||||||
|
/// case of failure)
|
||||||
|
@riverpod
|
||||||
|
Future<ServerConfig> serverConfigOrCache(Ref ref) async {
|
||||||
|
final client = ref.watch(apiServiceProvider)!;
|
||||||
|
try {
|
||||||
|
final config = await client.serverConfig();
|
||||||
|
client.prefs.setServerConfig(config);
|
||||||
|
return config;
|
||||||
|
} catch (e, s) {
|
||||||
|
Logger.root.warning("Failed to fetch server configuration! $e $s");
|
||||||
|
}
|
||||||
|
|
||||||
|
final cached = client.prefs.serverConfig();
|
||||||
|
if (cached == null) {
|
||||||
|
throw Exception(
|
||||||
|
"Could not fetch server configuration, cached version is unavailable!",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return cached;
|
||||||
|
}
|
@ -5,8 +5,10 @@ import 'package:moneymgr_mobile/providers/auth_state.dart';
|
|||||||
import 'package:moneymgr_mobile/routes/login/login_screen.dart';
|
import 'package:moneymgr_mobile/routes/login/login_screen.dart';
|
||||||
import 'package:moneymgr_mobile/routes/login/manual_auth_screen.dart';
|
import 'package:moneymgr_mobile/routes/login/manual_auth_screen.dart';
|
||||||
import 'package:moneymgr_mobile/routes/login/qr_auth_screen.dart';
|
import 'package:moneymgr_mobile/routes/login/qr_auth_screen.dart';
|
||||||
|
import 'package:moneymgr_mobile/routes/profile/profile_screen.dart';
|
||||||
import 'package:moneymgr_mobile/routes/settings/settings_screen.dart';
|
import 'package:moneymgr_mobile/routes/settings/settings_screen.dart';
|
||||||
import 'package:moneymgr_mobile/services/router/routes_list.dart';
|
import 'package:moneymgr_mobile/services/router/routes_list.dart';
|
||||||
|
import 'package:moneymgr_mobile/widgets/loaders/load_server_config.dart';
|
||||||
import 'package:moneymgr_mobile/widgets/scaffold_with_navigation.dart';
|
import 'package:moneymgr_mobile/widgets/scaffold_with_navigation.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
@ -49,7 +51,7 @@ GoRouter router(Ref ref) {
|
|||||||
),
|
),
|
||||||
NavigationItem(
|
NavigationItem(
|
||||||
path: profilePage,
|
path: profilePage,
|
||||||
body: (_) => const Text("Profile"),
|
body: (_) => ProfileScreen(),
|
||||||
icon: Icons.person_outline,
|
icon: Icons.person_outline,
|
||||||
selectedIcon: Icons.person,
|
selectedIcon: Icons.person,
|
||||||
label: 'Profile',
|
label: 'Profile',
|
||||||
@ -79,10 +81,12 @@ GoRouter router(Ref ref) {
|
|||||||
GoRoute(
|
GoRoute(
|
||||||
path: item.path,
|
path: item.path,
|
||||||
pageBuilder: (context, _) => NoTransitionPage(
|
pageBuilder: (context, _) => NoTransitionPage(
|
||||||
child: ScaffoldWithNavigation(
|
child: LoadServerConfig(
|
||||||
selectedIndex: index,
|
child: ScaffoldWithNavigation(
|
||||||
navigationItems: navigationItems,
|
selectedIndex: index,
|
||||||
child: item.body(context),
|
navigationItems: navigationItems,
|
||||||
|
child: item.body(context),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
routes: item.routes,
|
routes: item.routes,
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
import 'package:moneymgr_mobile/services/api/server_api.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
@ -9,3 +12,19 @@ Future<SharedPreferencesWithCache> prefs(Ref ref) =>
|
|||||||
SharedPreferencesWithCache.create(
|
SharedPreferencesWithCache.create(
|
||||||
cacheOptions: const SharedPreferencesWithCacheOptions(),
|
cacheOptions: const SharedPreferencesWithCacheOptions(),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
extension MoneyMgrSharedPreferences on SharedPreferencesWithCache {
|
||||||
|
ServerConfig? serverConfig() {
|
||||||
|
final json = getString("serverConfig");
|
||||||
|
if (json != null) return ServerConfig.fromJson(jsonDecode(json));
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> setServerConfig(ServerConfig config) async {
|
||||||
|
await setString("serverConfig", jsonEncode(config));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> clearServerConfig() async {
|
||||||
|
await remove("serverConfig");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
49
moneymgr_mobile/lib/widgets/full_screen_error.dart
Normal file
49
moneymgr_mobile/lib/widgets/full_screen_error.dart
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class FullScreenError extends StatelessWidget {
|
||||||
|
final String message;
|
||||||
|
final String error;
|
||||||
|
final List<Widget>? actions;
|
||||||
|
|
||||||
|
const FullScreenError({
|
||||||
|
super.key,
|
||||||
|
required this.message,
|
||||||
|
required this.error,
|
||||||
|
this.actions,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(title: Text("Error")),
|
||||||
|
body: Padding(
|
||||||
|
padding: const EdgeInsets.all(8.0),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Card(
|
||||||
|
elevation: 2,
|
||||||
|
color: Colors.red,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(8.0),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
message,
|
||||||
|
style: TextStyle(color: Colors.white, fontSize: 20),
|
||||||
|
),
|
||||||
|
Text(error, style: TextStyle(color: Colors.white)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: actions ?? [],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
35
moneymgr_mobile/lib/widgets/loaders/load_server_config.dart
Normal file
35
moneymgr_mobile/lib/widgets/loaders/load_server_config.dart
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
import 'package:moneymgr_mobile/providers/auth_state.dart';
|
||||||
|
import 'package:moneymgr_mobile/services/api/server_api.dart';
|
||||||
|
import 'package:moneymgr_mobile/widgets/full_screen_error.dart';
|
||||||
|
|
||||||
|
class LoadServerConfig extends HookConsumerWidget {
|
||||||
|
final Widget child;
|
||||||
|
|
||||||
|
const LoadServerConfig({super.key, required this.child});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
final serverConfig = ref.watch(serverConfigOrCacheProvider);
|
||||||
|
|
||||||
|
handleSignOut() {
|
||||||
|
ref.watch(currentAuthStateProvider.notifier).logout();
|
||||||
|
}
|
||||||
|
|
||||||
|
return switch (serverConfig) {
|
||||||
|
AsyncData() => child,
|
||||||
|
AsyncError(:final error) => FullScreenError(
|
||||||
|
message: "Failed to load server configuration!",
|
||||||
|
error: error.toString(),
|
||||||
|
actions: [
|
||||||
|
MaterialButton(
|
||||||
|
onPressed: handleSignOut,
|
||||||
|
child: Text("Sign out".toUpperCase()),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
_ => const Scaffold(body: Center(child: CircularProgressIndicator())),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user