NOW MANAGED ON CODEBERG
Merge branch 'fix/oidc-logout' into development
Dan Browncc10d1ddfc65
diff --cc resources/views/layouts/parts/header-user-menu.blade.phpindex 0440e43d0,000000000..ff28f1cfbmode 100644,000000..100644--- a/resources/views/layouts/parts/header-user-menu.blade.php+++ b/resources/views/layouts/parts/header-user-menu.blade.php@@@ -1,42 -1,0 +1,56 @@@+<div class="dropdown-container" component="dropdown" option:dropdown:bubble-escapes="true">+ <span class="user-name py-s hide-under-l" refs="dropdown@toggle"+ aria-haspopup="true" aria-expanded="false" aria-label="{{ trans('common.profile_menu') }}" tabindex="0">+ <img class="avatar" src="{{$user->getAvatar(30)}}" alt="{{ $user->name }}">+ <span class="name">{{ $user->getShortName(9) }}</span> @icon('caret-down')+ </span>+ <ul refs="dropdown@menu" class="dropdown-menu" role="menu">+ <li>+ <a href="{{ url('/favourites') }}" data-shortcut="favourites_view" class="icon-item">+ @icon('star')+ <div>{{ trans('entities.my_favourites') }}</div>+ </a>+ </li>+ <li>+ <a href="{{ $user->getProfileUrl() }}" data-shortcut="profile_view" class="icon-item">+ @icon('user')+ <div>{{ trans('common.view_profile') }}</div>+ </a>+ </li>+ <li>+ <a href="{{ url('/my-account') }}" class="icon-item">+ @icon('user-preferences')+ <div>{{ trans('preferences.my_account') }}</div>+ </a>+ </li>+ <li><hr></li>+ <li>+ @include('common.dark-mode-toggle', ['classes' => 'icon-item'])+ </li>+ <li><hr></li>+ <li>- <form action="{{ url(config('auth.method') === 'saml2' ? '/saml2/logout' : '/logout') }}"- method="post">- {{ csrf_field() }}- <button class="icon-item" data-shortcut="logout">- @icon('logout')- <div>{{ trans('auth.logout') }}</div>- </button>- </form>++ <?php++// OIDC Logout Feature: Use /oidc/logout if authentication method is oidc.++ if (config('auth.method') === 'oidc') {++ ?>++ <form action="/oidc/logout"++ method="get">++ <?php++// OIDC Logout Feature: Use /oidc/logout if authentication method is oidc.++ } else {++ ?>++ <form action="{{ url(config('auth.method') === 'saml2' ? '/saml2/logout' : '/logout') }}"++ method="post">++ <?php++// OIDC Logout Feature: Use /oidc/logout if authentication method is oidc.++ }++ ?>++ {{ csrf_field() }}++ <button class="icon-item" data-shortcut="logout">++ @icon('logout')++ <div>{{ trans('auth.logout') }}</div>++ </button>++ </form>+ </li>+ </ul>+</div>