Page MenuHomePhorge
Files F33259295

D11227.1768595335.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D11227.1768595335.diff
View Options

diff --git a/native/data/sqlite-data-handler.js b/native/data/sqlite-data-handler.js
--- a/native/data/sqlite-data-handler.js
+++ b/native/data/sqlite-data-handler.js
@@ -5,17 +5,12 @@
import { setClientDBStoreActionType } from 'lib/actions/client-db-store-actions.js';
import { MediaCacheContext } from 'lib/components/media-cache-provider.react.js';
-import { useStaffContext } from 'lib/components/staff-provider.react.js';
import type { CallKeyserverEndpoint } from 'lib/keyserver-conn/keyserver-conn-types.js';
-import { resolveKeyserverSessionInvalidation } from 'lib/keyserver-conn/recovery-utils.js';
+import { useKeyserverRecoveryLogIn } from 'lib/keyserver-conn/recovery-utils.js';
import { keyserverStoreOpsHandlers } from 'lib/ops/keyserver-store-ops.js';
import { reportStoreOpsHandlers } from 'lib/ops/report-store-ops.js';
import { threadStoreOpsHandlers } from 'lib/ops/thread-store-ops.js';
import { userStoreOpsHandlers } from 'lib/ops/user-store-ops.js';
-import {
- cookieSelector,
- urlPrefixSelector,
-} from 'lib/selectors/keyserver-selectors.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
import { useInitialNotificationsEncryptedMessage } from 'lib/shared/crypto-utils.js';
import {
@@ -46,6 +41,8 @@
}
}
+const returnsFalseSinceDoesntNeedToSupportCancellation = () => false;
+
function SQLiteDataHandler(): React.Node {
const storeLoaded = useSelector(state => state.storeLoaded);
@@ -55,11 +52,7 @@
const rehydrateConcluded = useSelector(
state => !!(state._persist && state._persist.rehydrated),
);
- const cookie = useSelector(cookieSelector(authoritativeKeyserverID));
- const urlPrefix = useSelector(urlPrefixSelector(authoritativeKeyserverID));
- invariant(urlPrefix, "missing urlPrefix for ashoat's keyserver");
const staffCanSee = useStaffCanSee();
- const { staffUserHasBeenLoggedIn } = useStaffContext();
const loggedIn = useSelector(isLoggedIn);
const currentLoggedInUserID = useSelector(state =>
state.currentUserInfo?.anonymous ? undefined : state.currentUserInfo?.id,
@@ -75,6 +68,9 @@
'resolveKeyserverSessionInvalidationUsingNativeCredentials should be set ' +
'on native',
);
+ const keyserverRecoveryLogIn = useKeyserverRecoveryLogIn(
+ authoritativeKeyserverID,
+ );
const recoverDataFromAuthoritativeKeyserver = React.useCallback(
async (source: RecoveryActionSource) => {
const innerRecoverDataFromAuthoritativeKeyserver = (
@@ -88,16 +84,13 @@
source,
authoritativeKeyserverID,
getInitialNotificationsEncryptedMessage,
- () => false,
+ returnsFalseSinceDoesntNeedToSupportCancellation,
);
try {
- await resolveKeyserverSessionInvalidation(
- dispatch,
- cookie,
- urlPrefix,
+ await keyserverRecoveryLogIn(
source,
- authoritativeKeyserverID,
innerRecoverDataFromAuthoritativeKeyserver,
+ returnsFalseSinceDoesntNeedToSupportCancellation,
);
dispatch({ type: setStoreLoadedActionType });
} catch (fetchCookieException) {
@@ -115,11 +108,10 @@
},
[
resolveKeyserverSessionInvalidationUsingNativeCredentials,
- cookie,
dispatch,
dispatchActionPromise,
+ keyserverRecoveryLogIn,
staffCanSee,
- urlPrefix,
getInitialNotificationsEncryptedMessage,
],
);
@@ -249,13 +241,10 @@
currentLoggedInUserID,
handleSensitiveData,
loggedIn,
- cookie,
dispatch,
rehydrateConcluded,
staffCanSee,
storeLoaded,
- urlPrefix,
- staffUserHasBeenLoggedIn,
recoverDataFromAuthoritativeKeyserver,
callClearSensitiveData,
mediaCacheContext,

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 16, 8:28 PM (12 h, 43 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5945938
Default Alt Text
D11227.1768595335.diff (3 KB)

Event Timeline