From 95ccaa66bee6d7d61a83c84e50b3c069d3c7d3a6 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 23 Feb 2021 15:58:54 +0200
Subject: [PATCH] Oauth refactor

---
 lib/redux/document/document_middleware.dart | 4 ++--
 lib/redux/settings/settings_middleware.dart | 3 ++-
 lib/redux/token/token_middleware.dart       | 3 ++-
 lib/redux/user/user_middleware.dart         | 9 +++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/redux/document/document_middleware.dart b/lib/redux/document/document_middleware.dart
index 463f24a91..cc32292c3 100644
--- a/lib/redux/document/document_middleware.dart
+++ b/lib/redux/document/document_middleware.dart
@@ -111,8 +111,8 @@ Middleware<AppState> _deleteDocument(DocumentRepository repository) {
     final action = dynamicAction as DeleteDocumentRequest;
 
     repository
-        .delete(
-            store.state.credentials, action.documentIds.first, action.password)
+        .delete(store.state.credentials, action.documentIds.first,
+            action.password, action.idToken)
         .then((value) {
       store.dispatch(DeleteDocumentSuccess());
       if (action.completer != null) {
diff --git a/lib/redux/settings/settings_middleware.dart b/lib/redux/settings/settings_middleware.dart
index 6587fbfd6..8d9e1bf07 100644
--- a/lib/redux/settings/settings_middleware.dart
+++ b/lib/redux/settings/settings_middleware.dart
@@ -101,7 +101,8 @@ Middleware<AppState> _saveAuthUser(SettingsRepository settingsRepository) {
     final action = dynamicAction as SaveAuthUserRequest;
 
     settingsRepository
-        .saveAuthUser(store.state.credentials, action.user, action.password)
+        .saveAuthUser(store.state.credentials, action.user, action.password,
+            action.idToken)
         .then((user) {
       store.dispatch(SaveAuthUserSuccess(user));
       store.dispatch(UserVerifiedPassword());
diff --git a/lib/redux/token/token_middleware.dart b/lib/redux/token/token_middleware.dart
index 2eb3ddf4e..ca7d60c05 100644
--- a/lib/redux/token/token_middleware.dart
+++ b/lib/redux/token/token_middleware.dart
@@ -166,7 +166,8 @@ Middleware<AppState> _saveToken(TokenRepository repository) {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as SaveTokenRequest;
     repository
-        .saveData(store.state.credentials, action.token, action.password)
+        .saveData(store.state.credentials, action.token, action.password,
+            action.idToken)
         .then((TokenEntity token) {
       if (action.token.isNew) {
         store.dispatch(AddTokenSuccess(token));
diff --git a/lib/redux/user/user_middleware.dart b/lib/redux/user/user_middleware.dart
index 770faaf93..4faf5d41b 100644
--- a/lib/redux/user/user_middleware.dart
+++ b/lib/redux/user/user_middleware.dart
@@ -97,7 +97,7 @@ Middleware<AppState> _archiveUser(UserRepository repository) {
 
     repository
         .bulkAction(store.state.credentials, action.userIds,
-            EntityAction.archive, action.password)
+            EntityAction.archive, action.password, action.idToken)
         .then((List<UserEntity> users) {
       store.dispatch(ArchiveUserSuccess(users));
       store.dispatch(UserVerifiedPassword());
@@ -127,7 +127,7 @@ Middleware<AppState> _deleteUser(UserRepository repository) {
 
     repository
         .bulkAction(store.state.credentials, action.userIds,
-            EntityAction.delete, action.password)
+            EntityAction.delete, action.password, action.idToken)
         .then((List<UserEntity> users) {
       store.dispatch(DeleteUserSuccess(users));
       store.dispatch(UserVerifiedPassword());
@@ -157,7 +157,7 @@ Middleware<AppState> _restoreUser(UserRepository repository) {
 
     repository
         .bulkAction(store.state.credentials, action.userIds,
-            EntityAction.restore, action.password)
+            EntityAction.restore, action.password, action.idToken)
         .then((List<UserEntity> users) {
       store.dispatch(RestoreUserSuccess(users));
       store.dispatch(UserVerifiedPassword());
@@ -206,7 +206,8 @@ Middleware<AppState> _saveUser(UserRepository repository) {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as SaveUserRequest;
     repository
-        .saveData(store.state.credentials, action.user, action.password)
+        .saveData(store.state.credentials, action.user, action.password,
+            action.idToken)
         .then((UserEntity user) {
       if (action.user.isNew) {
         store.dispatch(AddUserSuccess(user));