[stable29] fix(caldav): Do not load IMipPlugin before user auth and session is c…#47790
Merged
SebastianKrupinski merged 2 commits intostable29from Oct 2, 2024
Merged
[stable29] fix(caldav): Do not load IMipPlugin before user auth and session is c…#47790SebastianKrupinski merged 2 commits intostable29from
SebastianKrupinski merged 2 commits intostable29from
Conversation
miaulalala
requested changes
Sep 5, 2024
Contributor
miaulalala
left a comment
There was a problem hiding this comment.
Please remove the commented out code, otherwise it looks good!
Comment on lines
116
to
119
| /* | ||
| $this->user->method('getUID'); | ||
| $this->user->method('getDisplayName'); | ||
| */ |
Contributor
There was a problem hiding this comment.
Suggested change
| /* | |
| $this->user->method('getUID'); | |
| $this->user->method('getDisplayName'); | |
| */ |
| $senderName = $this->userManager->getDisplayName($this->userId); | ||
| // Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property | ||
| // If the iTIP message senderName is null or empty use the user session name as the senderName | ||
| if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) { |
Check notice
Code scanning / Psalm
PossiblyNullArgument
| // Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property | ||
| // If the iTIP message senderName is null or empty use the user session name as the senderName | ||
| if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) { | ||
| $senderName = trim($iTipMessage->senderName->getValue()); |
Check notice
Code scanning / Psalm
PossiblyNullArgument
| } elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) { | ||
| $senderName = trim($iTipMessage->senderName); | ||
| } elseif ($this->userSession->getUser() !== null) { | ||
| $senderName = trim($this->userSession->getUser()->getDisplayName()); |
Check notice
Code scanning / Psalm
PossiblyNullReference
|
|
||
| // calendar plugins | ||
| if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) { | ||
| $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig())); |
Check notice
Code scanning / Psalm
DeprecatedMethod
|
|
||
| // calendar plugins | ||
| if ($this->requestIsForSubtree(['calendars', 'public-calendars', 'system-calendars', 'principals'])) { | ||
| $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest(), \OC::$server->getConfig())); |
Check notice
Code scanning / Psalm
DeprecatedMethod
| \OC::$server->getCommentsManager(), | ||
| $userSession | ||
| )); | ||
| if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') { |
Check notice
Code scanning / Psalm
DeprecatedMethod
| \OC::$server->getCommentsManager(), | ||
| $userSession | ||
| )); | ||
| if (\OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes') { |
Check notice
Code scanning / Psalm
DeprecatedMethod
…reated Signed-off-by: SebastianKrupinski <[email protected]>
c7fa4da to
d18c6af
Compare
miaulalala
approved these changes
Sep 5, 2024
Altahrim
approved these changes
Oct 2, 2024
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
5 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.
Back port for #45081
Do not load IMipPlugin before user is authenticated and user session is initialized