Merge branch 'release/0.2.5'

tiki-deprecated · Sep 24, 2021 · 03058cc · 03058cc
2 parents 52b80f9 + c9f5ad8
commit 03058cc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/lib/src/slices/api_app_data/api_app_data_service.dart b/lib/src/slices/api_app_data/api_app_data_service.dart
@@ -23,6 +23,11 @@ class ApiAppDataService {
         : await _repository.update(dataToInsert);
   }
 
+  Future<void> delete(ApiAppDataKey key) async {
+    ApiAppDataModel? data = await this.getByKey(key);
+    if (data != null) await _repository.delete(data.id!);
+  }
+
   Future<void> logout() async {
     List<ApiAppDataKey> keysToDelete = [
       ApiAppDataKey.userReferCode,
@@ -31,7 +36,7 @@ class ApiAppDataService {
       ApiAppDataKey.emailIndexPage,
     ];
     keysToDelete.forEach((key) async {
-      await _repository.deleteByKey(key);
+      await _repository.deleteByKey(key.value!);
     });
   }
 }
diff --git a/lib/src/slices/api_app_data/repository/api_app_data_repository.dart b/lib/src/slices/api_app_data/repository/api_app_data_repository.dart
@@ -1,6 +1,5 @@
 import 'package:sqflite_sqlcipher/sqlite_api.dart';
 
-import '../api_app_data_key.dart';
 import '../model/api_app_data_model.dart';
 
 class ApiAppDataRepository {
@@ -47,7 +46,7 @@ class ApiAppDataRepository {
     return ApiAppDataModel.fromMap(rows[0]);
   }
 
-  deleteByKey(ApiAppDataKey key) async {
+  deleteByKey(String key) async {
     await _database.delete(_table, where: "key = ?", whereArgs: [key]);
   }
 }
diff --git a/lib/src/slices/api_oauth/api_oauth_service.dart b/lib/src/slices/api_oauth/api_oauth_service.dart
@@ -5,6 +5,7 @@
 
 import 'dart:convert';
 
+import 'package:app/src/slices/api_app_data/api_app_data_key.dart';
 import 'package:app/src/slices/api_oauth/model/api_oauth_model.dart';
 import 'package:flutter_appauth/flutter_appauth.dart';
 import 'package:http/http.dart';
@@ -77,6 +78,9 @@ class ApiOAuthService {
         _model.interfaceProviders[account.provider];
     if (provider != null) await provider.revokeToken(account);
     await _apiAuthRepositoryAccount.delete(account);
+    await _apiAppDataService.delete(ApiAppDataKey.emailIndexEpoch);
+    await _apiAppDataService.delete(ApiAppDataKey.emailIndexPage);
+    await _apiAppDataService.delete(ApiAppDataKey.emailIndexLabel);
   }
 
   Future<Map?> getUserInfo(

diff --git a/pubspec.lock b/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.2"
+    version: "1.7.1"
   android_intent:
     dependency: "direct main"
     description:
@@ -56,7 +56,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.6.1"
   barcode_scan2:
     dependency: "direct main"
     description:
@@ -147,7 +147,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.2.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -496,7 +496,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.3.0"
   mime:
     dependency: transitive
     description:
@@ -881,7 +881,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.3.0"
   time:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: app
 description: It's your data. Take back control.
-version: 0.2.5+1
+version: 0.2.5+5
 publish_to: 'none'
 
 environment: