copilot/frosty
1
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

Change user/default token and first run keys

Browse source
This commit is contained in:
Tommy Chow 2022-01-25 02:07:08 -05:00
parent 6ac35bfd10
commit 17e9acb84a
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/core/auth/auth_store.dart
View file

@ -14,6 +14,12 @@ abstract class _AuthBase with Store {
/// Secure storage to store tokens.
static const _storage = FlutterSecureStorage();
/// The shared_preferences key for the default token.
static const _defaultTokenKey = 'default_token';
/// The shared_preferences key for the user token.
static const _userTokenKey = 'user_token';
final TwitchApi twitchApi;
/// Whether the token is valid or not.
@ -45,17 +51,17 @@ abstract class _AuthBase with Store {
Future<void> init() async {
try {
// Read and set the currently stored user token, if any.
_token = await _storage.read(key: 'USER_TOKEN');
_token = await _storage.read(key: _userTokenKey);
// If the token does not exist, get the default token.
// Otherwise, log in.
if (_token == null) {
// Retrieve the currently stored default token if it exists.
_token = await _storage.read(key: 'DEFAULT_TOKEN');
_token = await _storage.read(key: _defaultTokenKey);
// If the token does not exist, get a new token and store it.
if (_token == null) {
_token = await twitchApi.getDefaultToken();
await _storage.write(key: 'DEFAULT_TOKEN', value: _token);
await _storage.write(key: _defaultTokenKey, value: _token);
}
} else {
// Initialize the user store.
@ -113,7 +119,7 @@ abstract class _AuthBase with Store {
if (!_tokenIsValid) return;
// Store the user token.
await _storage.write(key: 'USER_TOKEN', value: customToken ?? _token);
await _storage.write(key: _userTokenKey, value: customToken ?? _token);
// Initialize the user with the new token.
await user.init(headers: headersTwitch);
@ -131,20 +137,20 @@ abstract class _AuthBase with Store {
try {
// Revoke the existing user token and delete it.
await twitchApi.revokeToken(token: _token!);
await _storage.delete(key: 'USER_TOKEN');
await _storage.delete(key: _userTokenKey);
_token = null;
// Clear the user info.
user.dispose();
// If the default token already exists, set it.
_token = await _storage.read(key: 'DEFAULT_TOKEN');
_token = await _storage.read(key: _defaultTokenKey);
// If the default token does not already exist, get the new default token and store it.
// Else, validate the existing token.
if (_token == null) {
_token = await twitchApi.getDefaultToken();
await _storage.write(key: 'DEFAULT_TOKEN', value: _token);
await _storage.write(key: _defaultTokenKey, value: _token);
_tokenIsValid = await twitchApi.validateToken(token: _token!);
} else {
// Validate the stored token.
@ -153,7 +159,7 @@ abstract class _AuthBase with Store {
// If the stored token is invalid, get a new default token and store it.
if (!_tokenIsValid) {
_token = await twitchApi.getDefaultToken();
await _storage.write(key: 'DEFAULT_TOKEN', value: _token);
await _storage.write(key: _defaultTokenKey, value: _token);
_tokenIsValid = await twitchApi.validateToken(token: _token!);
}
}

10
lib/main.dart
View file

@ -25,22 +25,22 @@ import 'package:shared_preferences/shared_preferences.dart';
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
// Get the shared preferences instance and obtain the existing user settings if it exists.
// If default settings don't exist, use an empty JSON string to use the default values.
final prefs = await SharedPreferences.getInstance();
final userSettings = prefs.getString('settings') ?? '{}';
// Workaround for clearing stored tokens on uninstall.
// If first time running app, will clear all tokens in the secure storage.
if (prefs.getBool('FIRST_RUN') ?? true) {
if (prefs.getBool('first_run') ?? true) {
debugPrint('Clearing secure storage...');
const storage = FlutterSecureStorage();
await storage.deleteAll();
prefs.setBool('FIRST_RUN', false);
prefs.setBool('first_run', false);
}
// With the shared preferences instance, obtain the existing user settings if it exists.
// If default settings don't exist, use an empty JSON string to use the default values.
final userSettings = prefs.getString('settings') ?? '{}';
// Initialize a settings store from the settings JSON string.
final settingsStore = SettingsStore.fromJson(jsonDecode(userSettings));