Skip to content

fix(navigation): Missing logout entry #62416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CarlSchwan wants to merge 1 commit into from
Closed

fix(navigation): Missing logout entry #62416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions core/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,21 +170,23 @@ public function registerNavigationEntries(
IURLGenerator $urlGenerator,
IFactory $factory,
): void {
if (!$userSession->isLoggedIn()) {
return;
}

$l = $factory->get('core');

// Register the logout button in the user settings
$logoutUrl = $urlGenerator->getLogoutUrl();
$navigationManager->add([
'type' => 'settings',
'id' => 'logout',
'order' => 99999,
'href' => $logoutUrl,
'name' => $l->t('Log out'),
'icon' => $urlGenerator->imagePath('core', 'actions/logout.svg'),
]);
$navigationManager->add(function () use ($userSession, $factory, $urlGenerator): ?array {
if (!$userSession->isLoggedIn()) {
return null;
}

$l = $factory->get('core');

// Register the logout button in the user settings
$logoutUrl = $urlGenerator->getLogoutUrl();
return [
'type' => 'settings',
'id' => 'logout',
'order' => 99999,
'href' => $logoutUrl,
'name' => $l->t('Log out'),
'icon' => $urlGenerator->imagePath('core', 'actions/logout.svg'),
];
});
}
}
7 changes: 5 additions & 2 deletions lib/private/NavigationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
class NavigationManager implements INavigationManager {
/** @var array<string, NavigationEntryOutput> */
protected array $entries = [];
/** @var list<callable(): NavigationEntry> */
/** @var list<callable(): ?NavigationEntry> */
protected array $closureEntries = [];
protected ?string $activeEntry = null;
protected array $unreadCounters = [];
Expand Down Expand Up @@ -208,7 +208,10 @@ private function init(): void {
private function resolveAppNavigationEntries(): void {
// Resolve app navigation closures
while ($c = array_pop($this->closureEntries)) {
$this->add($c());
$entry = $c();
if ($entry !== null) {
$this->add($entry);
}
}

// Resolve dynamically added navigation entries via event listeners
Expand Down
6 changes: 3 additions & 3 deletions lib/public/INavigationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ interface INavigationManager {
/**
* Creates a new navigation entry
*
* @param NavigationEntry|callable():NavigationEntry $entry If a menu entry (type = 'link') is added, you shall also set app to the app that
* added the entry. The use of a closure is preferred, because it will avoid loading
* the routing of your app, unless required.
* @param NavigationEntry|callable():?NavigationEntry $entry If a menu entry (type = 'link') is added, you shall also set app to the app that
* added the entry. The use of a closure is preferred, because it will avoid loading
* the routing of your app, unless required.
* @return void
* @since 6.0.0
*/
Expand Down
Loading