KC-1315, KC-1329: Fix share-folder record expiration and ROE handling#2168
Open
sshrushanth-ks wants to merge 5 commits into
Open
KC-1315, KC-1329: Fix share-folder record expiration and ROE handling#2168sshrushanth-ks wants to merge 5 commits into
sshrushanth-ks wants to merge 5 commits into
Conversation
This comment has been minimized.
This comment has been minimized.
sali-ks
reviewed
Jun 25, 2026
| ro.expiration = -1 | ||
|
|
||
| def build_shared_record(email, record_uid, rec, existing=None): | ||
| # type: (str, str, dict, Optional[dict]) -> Optional[record_pb2.SharedRecord] |
sali-ks
approved these changes
Jun 25, 2026
sali-ks
approved these changes
Jun 25, 2026
242f85f to
0c51824
Compare
…g re-shares When share-folder was used with -r and --expire-in, expiration was applied to SharedFolderUpdateRecord, which caused the record to be removed from the owner's vault when the timer expired. Route per-record expiration and -roe through the record share API (revoke then re-grant) instead, keep folder user updates for access only, sync before granting, and skip redundant user updates when sharing additional records to the same recipient.
dab69fd to
7e06b51
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes share-folder when used with -r, --expire-in/--expire-at, and -roe. Expiration is no longer set on SharedFolderUpdateRecord (which removed records from the owner’s vault). Timers are applied to both folder user access and per-record shares via the record share API, with revoke/re-grant when needed. Success logs now show folder and record expiration times.
Changes