]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'fix/oidc-logout' into development
authorDan Brown <redacted>
Wed, 6 Dec 2023 12:14:43 +0000 (12:14 +0000)
committerDan Brown <redacted>
Wed, 6 Dec 2023 12:14:43 +0000 (12:14 +0000)
1  2 
.env.example.complete
app/Access/Oidc/OidcService.php
app/Config/oidc.php
resources/views/layouts/parts/header-user-menu.blade.php
routes/web.php

Simple merge
Simple merge
Simple merge
index 0440e43d037cbf2e3f29e2140379e104dd074958,0000000000000000000000000000000000000000..ff28f1cfb911bdd216728d08430319a26a428f23
mode 100644,000000..100644
--- /dev/null
@@@ -1,42 -1,0 +1,56 @@@
-             <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>
 +<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>
++            <?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>
diff --cc routes/web.php
Simple merge
Morty Proxy This is a proxified and sanitized view of the page, visit original site.