Fixes for CodeStyle vol.2

[bookstack] / app / Config / auth.php

diff --git a/app/Config/auth.php b/app/Config/auth.php
index b3e22c7e1817d185e8950607ea1ed98b7ff86688..404b5352dcc2b45537d4407a634171cee7a6c69e 100644 (file)
--- a/app/Config/auth.php
+++ b/app/Config/auth.php
@@ -11,14 +11,14 @@
 return [
 
     // Method of authentication to use
 return [
 
     // Method of authentication to use

-    // Options: standard, ldap
+    // Options: standard, ldap, saml2

     'method' => env('AUTH_METHOD', 'standard'),
 
     // Authentication Defaults
     // This option controls the default authentication "guard" and password
     // reset options for your application.
     'defaults' => [
     'method' => env('AUTH_METHOD', 'standard'),
 
     // Authentication Defaults
     // This option controls the default authentication "guard" and password
     // reset options for your application.
     'defaults' => [

-        'guard' => 'web',
+        'guard'     => env('AUTH_METHOD', 'standard'),

         'passwords' => 'users',
     ],
 
         'passwords' => 'users',
     ],
 


@@ -26,13 +26,20 @@ return [
     // All authentication drivers have a user provider. This defines how the
     // users are actually retrieved out of your database or other storage
     // mechanisms used by this application to persist your user's data.
     // All authentication drivers have a user provider. This defines how the
     // users are actually retrieved out of your database or other storage
     // mechanisms used by this application to persist your user's data.

-    // Supported: "session", "token"
+    // Supported drivers: "session", "api-token", "ldap-session"

     'guards' => [
     'guards' => [

-        'web' => [
-            'driver' => 'session',
+        'standard' => [
+            'driver'   => 'session',

             'provider' => 'users',
         ],
             'provider' => 'users',
         ],

-
+        'ldap' => [
+            'driver'   => 'ldap-session',
+            'provider' => 'external',
+        ],
+        'saml2' => [
+            'driver'   => 'saml2-session',
+            'provider' => 'external',
+        ],

         'api' => [
             'driver' => 'api-token',
         ],
         'api' => [
             'driver' => 'api-token',
         ],


@@ -42,17 +49,15 @@ return [
     // All authentication drivers have a user provider. This defines how the
     // users are actually retrieved out of your database or other storage
     // mechanisms used by this application to persist your user's data.
     // All authentication drivers have a user provider. This defines how the
     // users are actually retrieved out of your database or other storage
     // mechanisms used by this application to persist your user's data.

-    // Supported: database, eloquent, ldap

     'providers' => [
         'users' => [
     'providers' => [
         'users' => [

-            'driver' => env('AUTH_METHOD', 'standard') === 'standard' ? 'eloquent' : env('AUTH_METHOD'),
-            'model' => \BookStack\Auth\User::class,
+            'driver' => 'eloquent',
+            'model'  => \BookStack\Auth\User::class,
+        ],
+        'external' => [
+            'driver' => 'external-users',
+            'model'  => \BookStack\Auth\User::class,

         ],
         ],

-
-        // 'users' => [
-        //     'driver' => 'database',
-        //     'table' => 'users',
-        // ],

     ],
 
     // Resetting Passwords
     ],
 
     // Resetting Passwords


@@ -62,9 +67,9 @@ return [
     'passwords' => [
         'users' => [
             'provider' => 'users',
     'passwords' => [
         'users' => [
             'provider' => 'users',

-            'email' => 'emails.password',
-            'table' => 'password_resets',
-            'expire' => 60,
+            'email'    => 'emails.password',
+            'table'    => 'password_resets',
+            'expire'   => 60,

         ],
     ],
 
         ],
     ],