Page MenuHomePhabricator
Differential D13807

[backup-service] use `username` instead of `userID` when downloading backup
ClosedPublic
Actions

Authored by kamil on Oct 29 2024, 9:07 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 30, 11:32 PM
Unknown Object (File)
Sun, Mar 23, 1:02 PM
Unknown Object (File)
Sun, Mar 23, 1:01 PM
Unknown Object (File)
Sun, Mar 23, 1:00 PM
Unknown Object (File)
Fri, Mar 7, 2:11 PM
Unknown Object (File)
Fri, Mar 7, 2:11 PM
Unknown Object (File)
Fri, Mar 7, 2:11 PM
Unknown Object (File)
Fri, Mar 7, 2:11 PM
View All 83 Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
bartek
Commits
rCOMMf10da684e155: [backup-service] use `username` instead of `userID` when downloading backup
Summary

ENG-6145.

Updating places where we had hardcoded userID

Depends on D13817

Test Plan

run commtest

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Oct 29 2024, 9:07 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptOct 29 2024, 9:07 AM
kamil added a child revision: D13808: [backup-service][backup-client] rename `username` -> `user_identifier`.Oct 29 2024, 9:19 AM
Harbormaster failed remote builds in B32406: Diff 45428!Oct 29 2024, 9:44 AM
kamil updated this revision to Diff 45453.Oct 30 2024, 2:27 AM

CI

Harbormaster failed remote builds in B32426: Diff 45453!Oct 30 2024, 2:52 AM
kamil updated this revision to Diff 45454.Oct 30 2024, 2:59 AM

CI v2

Harbormaster completed remote builds in B32427: Diff 45454.Oct 30 2024, 3:16 AM
kamil updated this revision to Diff 45456.Oct 30 2024, 3:28 AM
kamil added a child revision: D13817: [docker-compose] configure Identity endpoint for backup in commtest.

rebase

kamil edited the summary of this revision. (Show Details)Oct 30 2024, 3:30 AM
kamil removed a child revision: D13817: [docker-compose] configure Identity endpoint for backup in commtest.
kamil edited parent revisions, added: D13817: [docker-compose] configure Identity endpoint for backup in commtest; removed: D13806: [backup-service] implement calling `FindUserID` RPC from Backup.
kamil edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B32429: Diff 45456.Oct 30 2024, 3:47 AM
kamil published this revision for review.Oct 30 2024, 9:28 AM
varun accepted this revision.Nov 1 2024, 2:14 PM
varun added inline comments.
services/commtest/tests/backup_integration_test.rs
78 ↗(On Diff #45456)
80 ↗(On Diff #45456)
83 ↗(On Diff #45456)
services/commtest/tests/backup_performance_test.rs
91 ↗(On Diff #45456)

just curious, what do we use this descriptor for?

This revision is now accepted and ready to land.Nov 1 2024, 2:14 PM
bartek accepted this revision.Nov 4 2024, 4:59 AM
bartek added inline comments.
services/commtest/tests/backup_performance_test.rs
91 ↗(On Diff #45456)

we use it to determine what kind of backup we want to perform action on. It can be either:

  • Latest backup for given user
  • Backup with specific ID
kamil updated this revision to Diff 45603.Nov 5 2024, 4:14 AM

fix typo

Harbormaster completed remote builds in B32535: Diff 45603.Nov 5 2024, 4:34 AM
Closed by commit rCOMMf10da684e155: [backup-service] use `username` instead of `userID` when downloading backup (authored by kamil). · Explain WhyNov 7 2024, 4:07 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMf10da684e155: [backup-service] use `username` instead of `userID` when downloading backup.

Revision Contents
Changeset List

PathSize
services/
backup/
src/
http/
handlers/
7 lines
commtest/
tests/
24 lines
19 lines

Diff 45664

View Options

services/backup/src/http/handlers/backup.rs

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines (actionCurrentUserInfo === null ||
(actionCurrentUserInfo && actionCurrentUserInfo.anonymous)) && (actionCurrentUserInfo && actionCurrentUserInfo.anonymous)) &&
preRequestUserState && preRequestUserState &&
(preRequestUserState.currentUserInfo?.id !== currentCurrentUserInfo.id || (preRequestUserState.currentUserInfo?.id !== currentCurrentUserInfo.id ||
preRequestUserState.commServicesAccessToken !== preRequestUserState.commServicesAccessToken !==
currentReduxState.commServicesAccessToken) currentReduxState.commServicesAccessToken)
); );
} }
// actionCurrentUserInfo can either be the CurrentUserInfo at the time the
// recovery began (preRequestUserInfo), or the CurrentUserInfo in the action.
// We expect that for a recovery they should be the same. The intention is to
// make sure that the CurrentUserInfo in Redux at the time this action is
// processed is the same as the user from whom the recovery was attempted. If
// that user has since logged out, we should ignore the result of the recovery.
const actionSourcesCheckedForInvalidSessionRecovery = new Set([
recoveryActionSources.cookieInvalidationResolutionAttempt,
recoveryActionSources.socketAuthErrorResolutionAttempt,
recoveryActionSources.appStartCookieLoggedInButInvalidRedux,
recoveryActionSources.appStartReduxLoggedInButInvalidCookie,
recoveryActionSources.refetchUserDataAfterAcknowledgment,
recoveryActionSources.socketNotLoggedIn,
]);
function invalidSessionRecovery( function invalidSessionRecovery(
currentReduxState: AppState, currentReduxState: AppState,
actionCurrentUserInfo: ?CurrentUserInfo, actionCurrentUserInfo: ?CurrentUserInfo,
authActionSource: ?AuthActionSource, authActionSource: ?AuthActionSource,
): boolean { ): boolean {
if ( if (
authActionSource !== !authActionSource ||
recoveryActionSources.cookieInvalidationResolutionAttempt && !actionSourcesCheckedForInvalidSessionRecovery.has(authActionSource)
authActionSource !== recoveryActionSources.socketAuthErrorResolutionAttempt
) { ) {
return false; return false;
} }
invariant( invariant(
actionCurrentUserInfo, actionCurrentUserInfo,
'currentUserInfo (preRequestUserInfo) should be defined when ' + 'actionCurrentUserInfo should be passed to invalidSessionRecovery for ' +
'COOKIE_INVALIDATION_RESOLUTION_ATTEMPT or ' + `${authActionSource} login`,
'SOCKET_AUTH_ERROR_RESOLUTION_ATTEMPT login is dispatched',
); );
if (actionCurrentUserInfo.anonymous) { if (actionCurrentUserInfo.anonymous) {
// It's not a session recovery if the CurrentUserInfo is anonymous // It's not a session recovery if the CurrentUserInfo is anonymous
return false; return false;
} }
return ( return (
!currentReduxState.dataLoaded || !currentReduxState.dataLoaded ||
currentReduxState.currentUserInfo?.id !== actionCurrentUserInfo.id currentReduxState.currentUserInfo?.id !== actionCurrentUserInfo.id
); );
} }
export { export {
invalidSessionDowngrade, invalidSessionDowngrade,
identityInvalidSessionDowngrade, identityInvalidSessionDowngrade,
invalidSessionRecovery, invalidSessionRecovery,
}; };
View Options

services/commtest/tests/backup_integration_test.rs

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines (actionCurrentUserInfo === null ||
(actionCurrentUserInfo && actionCurrentUserInfo.anonymous)) && (actionCurrentUserInfo && actionCurrentUserInfo.anonymous)) &&
preRequestUserState && preRequestUserState &&
(preRequestUserState.currentUserInfo?.id !== currentCurrentUserInfo.id || (preRequestUserState.currentUserInfo?.id !== currentCurrentUserInfo.id ||
preRequestUserState.commServicesAccessToken !== preRequestUserState.commServicesAccessToken !==
currentReduxState.commServicesAccessToken) currentReduxState.commServicesAccessToken)
); );
} }
// actionCurrentUserInfo can either be the CurrentUserInfo at the time the
// recovery began (preRequestUserInfo), or the CurrentUserInfo in the action.
// We expect that for a recovery they should be the same. The intention is to
// make sure that the CurrentUserInfo in Redux at the time this action is
// processed is the same as the user from whom the recovery was attempted. If
// that user has since logged out, we should ignore the result of the recovery.
const actionSourcesCheckedForInvalidSessionRecovery = new Set([
recoveryActionSources.cookieInvalidationResolutionAttempt,
recoveryActionSources.socketAuthErrorResolutionAttempt,
recoveryActionSources.appStartCookieLoggedInButInvalidRedux,
recoveryActionSources.appStartReduxLoggedInButInvalidCookie,
recoveryActionSources.refetchUserDataAfterAcknowledgment,
recoveryActionSources.socketNotLoggedIn,
]);
function invalidSessionRecovery( function invalidSessionRecovery(
currentReduxState: AppState, currentReduxState: AppState,
actionCurrentUserInfo: ?CurrentUserInfo, actionCurrentUserInfo: ?CurrentUserInfo,
authActionSource: ?AuthActionSource, authActionSource: ?AuthActionSource,
): boolean { ): boolean {
if ( if (
authActionSource !== !authActionSource ||
recoveryActionSources.cookieInvalidationResolutionAttempt && !actionSourcesCheckedForInvalidSessionRecovery.has(authActionSource)
authActionSource !== recoveryActionSources.socketAuthErrorResolutionAttempt
) { ) {
return false; return false;
} }
invariant( invariant(
actionCurrentUserInfo, actionCurrentUserInfo,
'currentUserInfo (preRequestUserInfo) should be defined when ' + 'actionCurrentUserInfo should be passed to invalidSessionRecovery for ' +
'COOKIE_INVALIDATION_RESOLUTION_ATTEMPT or ' + `${authActionSource} login`,
'SOCKET_AUTH_ERROR_RESOLUTION_ATTEMPT login is dispatched',
); );
if (actionCurrentUserInfo.anonymous) { if (actionCurrentUserInfo.anonymous) {
// It's not a session recovery if the CurrentUserInfo is anonymous // It's not a session recovery if the CurrentUserInfo is anonymous
return false; return false;
} }
return ( return (
!currentReduxState.dataLoaded || !currentReduxState.dataLoaded ||
currentReduxState.currentUserInfo?.id !== actionCurrentUserInfo.id currentReduxState.currentUserInfo?.id !== actionCurrentUserInfo.id
); );
} }
export { export {
invalidSessionDowngrade, invalidSessionDowngrade,
identityInvalidSessionDowngrade, identityInvalidSessionDowngrade,
invalidSessionRecovery, invalidSessionRecovery,
}; };
View Options

services/commtest/tests/backup_performance_test.rs

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines (actionCurrentUserInfo === null ||
(actionCurrentUserInfo && actionCurrentUserInfo.anonymous)) && (actionCurrentUserInfo && actionCurrentUserInfo.anonymous)) &&
preRequestUserState && preRequestUserState &&
(preRequestUserState.currentUserInfo?.id !== currentCurrentUserInfo.id || (preRequestUserState.currentUserInfo?.id !== currentCurrentUserInfo.id ||
preRequestUserState.commServicesAccessToken !== preRequestUserState.commServicesAccessToken !==
currentReduxState.commServicesAccessToken) currentReduxState.commServicesAccessToken)
); );
} }
// actionCurrentUserInfo can either be the CurrentUserInfo at the time the
// recovery began (preRequestUserInfo), or the CurrentUserInfo in the action.
// We expect that for a recovery they should be the same. The intention is to
// make sure that the CurrentUserInfo in Redux at the time this action is
// processed is the same as the user from whom the recovery was attempted. If
// that user has since logged out, we should ignore the result of the recovery.
const actionSourcesCheckedForInvalidSessionRecovery = new Set([
recoveryActionSources.cookieInvalidationResolutionAttempt,
recoveryActionSources.socketAuthErrorResolutionAttempt,
recoveryActionSources.appStartCookieLoggedInButInvalidRedux,
recoveryActionSources.appStartReduxLoggedInButInvalidCookie,
recoveryActionSources.refetchUserDataAfterAcknowledgment,
recoveryActionSources.socketNotLoggedIn,
]);
function invalidSessionRecovery( function invalidSessionRecovery(
currentReduxState: AppState, currentReduxState: AppState,
actionCurrentUserInfo: ?CurrentUserInfo, actionCurrentUserInfo: ?CurrentUserInfo,
authActionSource: ?AuthActionSource, authActionSource: ?AuthActionSource,
): boolean { ): boolean {
if ( if (
authActionSource !== !authActionSource ||
recoveryActionSources.cookieInvalidationResolutionAttempt && !actionSourcesCheckedForInvalidSessionRecovery.has(authActionSource)
authActionSource !== recoveryActionSources.socketAuthErrorResolutionAttempt
) { ) {
return false; return false;
} }
invariant( invariant(
actionCurrentUserInfo, actionCurrentUserInfo,
'currentUserInfo (preRequestUserInfo) should be defined when ' + 'actionCurrentUserInfo should be passed to invalidSessionRecovery for ' +
'COOKIE_INVALIDATION_RESOLUTION_ATTEMPT or ' + `${authActionSource} login`,
'SOCKET_AUTH_ERROR_RESOLUTION_ATTEMPT login is dispatched',
); );
if (actionCurrentUserInfo.anonymous) { if (actionCurrentUserInfo.anonymous) {
// It's not a session recovery if the CurrentUserInfo is anonymous // It's not a session recovery if the CurrentUserInfo is anonymous
return false; return false;
} }
return ( return (
!currentReduxState.dataLoaded || !currentReduxState.dataLoaded ||
currentReduxState.currentUserInfo?.id !== actionCurrentUserInfo.id currentReduxState.currentUserInfo?.id !== actionCurrentUserInfo.id
); );
} }
export { export {
invalidSessionDowngrade, invalidSessionDowngrade,
identityInvalidSessionDowngrade, identityInvalidSessionDowngrade,
invalidSessionRecovery, invalidSessionRecovery,
}; };