Added shelve icon, improved migration, added role permission

[bookstack] / app / Http / Controllers / Auth / LoginController.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 21c9dc4c56b36c3ebde8412f95647dede1223c48..e011c642fcc3b0b047b643ea262b3e34c1b667b5 100644 (file)
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -5,7 +5,7 @@ namespace BookStack\Http\Controllers\Auth;
 use BookStack\Exceptions\AuthException;
 use BookStack\Http\Controllers\Controller;
 use BookStack\Repos\UserRepo;
 use BookStack\Exceptions\AuthException;
 use BookStack\Http\Controllers\Controller;
 use BookStack\Repos\UserRepo;

-use BookStack\Repos\LdapRepo;
+use BookStack\Services\LdapService;

 use BookStack\Services\SocialAuthService;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use BookStack\Services\SocialAuthService;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;


@@ -37,18 +37,21 @@ class LoginController extends Controller
     protected $redirectAfterLogout = '/login';
 
     protected $socialAuthService;
     protected $redirectAfterLogout = '/login';
 
     protected $socialAuthService;

+    protected $ldapService;

     protected $userRepo;
 
     /**
      * Create a new controller instance.
      *
      * @param SocialAuthService $socialAuthService
     protected $userRepo;
 
     /**
      * Create a new controller instance.
      *
      * @param SocialAuthService $socialAuthService

+     * @param LdapService $ldapService

      * @param UserRepo $userRepo
      */
      * @param UserRepo $userRepo
      */

-    public function __construct(SocialAuthService $socialAuthService, UserRepo $userRepo)
+    public function __construct(SocialAuthService $socialAuthService, LdapService $ldapService, UserRepo $userRepo)

     {
         $this->middleware('guest', ['only' => ['getLogin', 'postLogin']]);
         $this->socialAuthService = $socialAuthService;
     {
         $this->middleware('guest', ['only' => ['getLogin', 'postLogin']]);
         $this->socialAuthService = $socialAuthService;

+        $this->ldapService = $ldapService;

         $this->userRepo = $userRepo;
         $this->redirectPath = baseUrl('/');
         $this->redirectAfterLogout = baseUrl('/login');
         $this->userRepo = $userRepo;
         $this->redirectPath = baseUrl('/');
         $this->redirectAfterLogout = baseUrl('/login');


@@ -97,13 +100,11 @@ class LoginController extends Controller
             auth()->login($user);
         }
 
             auth()->login($user);
         }
 

-        // ldap groups refresh
-        if (config('services.ldap.user_to_groups') !== false && $request->filled('username')) {
-            $ldapRepo = new LdapRepo($this->userRepo);
-            $ldapRepo->syncGroups($user, $request->input('username'));
+        // Sync LDAP groups if required
+        if ($this->ldapService->shouldSyncGroups()) {
+            $this->ldapService->syncGroups($user);

         }
 
         }
 

-

         $path = session()->pull('url.intended', '/');
         $path = baseUrl($path, true);
         return redirect($path);
         $path = session()->pull('url.intended', '/');
         $path = baseUrl($path, true);
         return redirect($path);


@@ -133,6 +134,7 @@ class LoginController extends Controller
      * Redirect to the relevant social site.
      * @param $socialDriver
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      * Redirect to the relevant social site.
      * @param $socialDriver
      * @return \Symfony\Component\HttpFoundation\RedirectResponse

+     * @throws \BookStack\Exceptions\SocialDriverNotConfigured

      */
     public function getSocialLogin($socialDriver)
     {
      */
     public function getSocialLogin($socialDriver)
     {