Skip to content

Commit 08523f7

Browse files
committed
fix: auth header is now grabbed from the database
1 parent a0a4140 commit 08523f7

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

lib/client/client_regular_account.dart

+6-8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:pref/pref.dart';
66
import 'dart:async';
77
import "dart:math";
88
import 'package:quacker/constants.dart';
9+
import 'package:quacker/database/entities.dart';
910
import 'package:quacker/database/repository.dart';
1011
import 'package:quacker/generated/l10n.dart';
1112

@@ -17,8 +18,8 @@ Future<String> addAccount(BasePrefService prefs, String username, String passwor
1718
final authHeader = await model.GetAuthHeader(username: username, password: password, email: email);
1819

1920
if (authHeader != null) {
20-
database.insert(
21-
tableAccounts, {"id": username, "password": password, "email": email, "auth_header": jsonEncode(authHeader)});
21+
database.insert(tableAccounts,
22+
{"id": username, "password": password, "email": email, "auth_header": json.encode(authHeader)});
2223

2324
return L10n.current.login_success;
2425
} else {
@@ -42,15 +43,12 @@ Future<List<Map<String, Object?>>> getAccounts() async {
4243

4344
Future<Map<dynamic, dynamic>?> getAuthHeader(BasePrefService prefs) async {
4445
final accounts = await getAccounts();
45-
final model = XRegularAccount(prefs);
4646

4747
if (accounts.isNotEmpty) {
48-
Map<String, Object?> account = accounts[Random().nextInt(accounts.length)];
48+
Account account = Account.fromMap(accounts[Random().nextInt(accounts.length)]);
49+
final authHeader = Map.castFrom<String, dynamic, String, String>(json.decode(account.authHeader));
4950

50-
return await model.GetAuthHeader(
51-
username: account['id'].toString(),
52-
password: account['password'].toString(),
53-
email: account['email'].toString());
51+
return authHeader;
5452
} else {
5553
return null;
5654
}

0 commit comments

Comments
 (0)