Page MenuHomePhorge
Files F33305548

D11264.1768791225.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D11264.1768791225.diff
View Options

diff --git a/lib/keyserver-conn/recovery-utils.js b/lib/keyserver-conn/recovery-utils.js
--- a/lib/keyserver-conn/recovery-utils.js
+++ b/lib/keyserver-conn/recovery-utils.js
@@ -18,6 +18,7 @@
import {
type ClientSessionChange,
genericCookieInvalidation,
+ type PreRequestUserState,
} from '../types/session-types.js';
import callSingleKeyServerEndpoint from '../utils/call-single-keyserver-endpoint.js';
import type {
@@ -165,6 +166,24 @@
const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
+ const invalidateKeyserverSession = React.useCallback(
+ (
+ source: RecoveryActionSource,
+ sessionChange: ClientSessionChange,
+ userStateBeforeRecovery: PreRequestUserState,
+ ) => {
+ setNewSession(
+ dispatch,
+ sessionChange,
+ userStateBeforeRecovery,
+ null,
+ source,
+ keyserverID,
+ );
+ },
+ [dispatch, keyserverID],
+ );
+
return React.useCallback(
async (
source: RecoveryActionSource,
@@ -196,13 +215,10 @@
!sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=')
) {
- setNewSession(
- dispatch,
+ invalidateKeyserverSession(
+ source,
sessionChange,
userStateBeforeRecovery,
- null,
- source,
- keyserverID,
);
}
} catch (e) {
@@ -213,18 +229,15 @@
`Error during recovery login with keyserver ${keyserverID}`,
e,
);
- setNewSession(
- dispatch,
+ invalidateKeyserverSession(
+ source,
genericCookieInvalidation,
userStateBeforeRecovery,
- null,
- source,
- keyserverID,
);
throw e;
}
},
- [keyserverID, dispatch, cookie, urlPrefix],
+ [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 2:53 AM (3 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5954012
Default Alt Text
D11264.1768791225.diff (1 KB)

Event Timeline