refactor(share): DRY up expiration date validation and fix dispatchEvent() log message#59731
Open
joshtrichards wants to merge 1 commit into
Open
refactor(share): DRY up expiration date validation and fix dispatchEvent() log message#59731joshtrichards wants to merge 1 commit into
joshtrichards wants to merge 1 commit into
Conversation
Both `validateExpirationDateInternal()` and `validateExpirationDateLink()` implemented the same algorithm for: - skipping validation when no expiration date is allowed - rejecting past expiration dates - applying a default expiration date for new shares - enforcing the maximum allowed expiration date - running the `verifyExpirationDate` hook This change keeps the existing behavior but centralizes the logic so future fixes only need to be made in one place. This commit also fixes a tiny unrelated quoting bug in `dispatchEvent()` that caused garbled error-log output in `dispatchEvent()`. Signed-off-by: Josh <josh.t.richards@gmail.com>
joshtrichards
added
feature: sharing
bug
♻️ refactor
joshtrichards
changed the title
joshtrichards
requested review from
artonge,
leftybournes,
provokateurin and
salmart-dev
and removed request for
a team
Collaborator
|
I know @provokateurin is working on files_sharing currently, this might overlap or conflict. |
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
2 participants
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
Extracts the duplicated expiration-date validation logic in
Share20/Manager.phpinto a newvalidateExpirationDate()helper.Both
validateExpirationDateInternal()andvalidateExpirationDateLink()implemented the same algorithm for:verifyExpirationDatehookThe public-facing
validateExpirationDateInternal()andvalidateExpirationDateLink()are preserved as thin wrappers that resolve their share-type-specific policy values and delegate to the new helper, keeping the API unchanged.Also fixed (unrelated): A string interpolation bug in
dispatchEvent()caused the error log message to render literally asError while sending ' . $eventName . ' eventinstead ofError while sending 'EventName' event.No functional change intended
Checklist
3. to review, feature component)stable32)AI (if applicable)