fix(wysiwyg): preserves line feeds in code block mode

[bookstack] / app / Auth / Access / LdapService.php

diff --git a/app/Auth/Access/LdapService.php b/app/Auth/Access/LdapService.php
index 7bfdb5328d874e5296f0227253a45475b2baddd5..e529b80fdc5129ad326e82567ebb0b0a44a38404 100644 (file)
--- a/app/Auth/Access/LdapService.php
+++ b/app/Auth/Access/LdapService.php
@@ -13,9 +13,10 @@ use Illuminate\Support\Facades\Log;
  * Class LdapService
  * Handles any app-specific LDAP tasks.
  */
  * Class LdapService
  * Handles any app-specific LDAP tasks.
  */

-class LdapService extends ExternalAuthService
+class LdapService

 {
     protected $ldap;
 {
     protected $ldap;

+    protected $groupSyncService;

     protected $ldapConnection;
     protected $userAvatars;
     protected $config;
     protected $ldapConnection;
     protected $userAvatars;
     protected $config;


@@ -24,20 +25,19 @@ class LdapService extends ExternalAuthService
     /**
      * LdapService constructor.
      */
     /**
      * LdapService constructor.
      */

-    public function __construct(Ldap $ldap, UserAvatars $userAvatars)
+    public function __construct(Ldap $ldap, UserAvatars $userAvatars, GroupSyncService $groupSyncService)

     {
         $this->ldap = $ldap;
         $this->userAvatars = $userAvatars;
     {
         $this->ldap = $ldap;
         $this->userAvatars = $userAvatars;

+        $this->groupSyncService = $groupSyncService;

         $this->config = config('services.ldap');
         $this->enabled = config('auth.method') === 'ldap';
     }
 
     /**
      * Check if groups should be synced.
         $this->config = config('services.ldap');
         $this->enabled = config('auth.method') === 'ldap';
     }
 
     /**
      * Check if groups should be synced.

-     *
-     * @return bool

      */
      */

-    public function shouldSyncGroups()
+    public function shouldSyncGroups(): bool

     {
         return $this->enabled && $this->config['user_to_groups'] !== false;
     }
     {
         return $this->enabled && $this->config['user_to_groups'] !== false;
     }


@@ -165,7 +165,7 @@ class LdapService extends ExternalAuthService
      * Bind the system user to the LDAP connection using the given credentials
      * otherwise anonymous access is attempted.
      *
      * Bind the system user to the LDAP connection using the given credentials
      * otherwise anonymous access is attempted.
      *

-     * @param $connection
+     * @param resource $connection

      *
      * @throws LdapException
      */
      *
      * @throws LdapException
      */


@@ -285,9 +285,8 @@ class LdapService extends ExternalAuthService
         }
 
         $userGroups = $this->groupFilter($user);
         }
 
         $userGroups = $this->groupFilter($user);

-        $userGroups = $this->getGroupsRecursive($userGroups, []);

 
 

-        return $userGroups;
+        return $this->getGroupsRecursive($userGroups, []);

     }
 
     /**
     }
 
     /**


@@ -374,7 +373,7 @@ class LdapService extends ExternalAuthService
     public function syncGroups(User $user, string $username)
     {
         $userLdapGroups = $this->getUserGroups($username);
     public function syncGroups(User $user, string $username)
     {
         $userLdapGroups = $this->getUserGroups($username);

-        $this->syncWithGroups($user, $userLdapGroups);
+        $this->groupSyncService->syncUserWithFoundGroups($user, $userLdapGroups, $this->config['remove_from_groups']);

     }
 
     /**
     }
 
     /**