From: Dan Brown <redacted>
Date: Sat, 25 Apr 2020 17:28:07 +0000 (+0100)
Subject: Updated user-create endpoint so saml and ldap is consistent.
X-Git-Tag: v0.29.1~1^2~13
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/07831df2d34249fa9ccb53579520e12137475b7e

Updated user-create endpoint so saml and ldap is consistent.
---

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 775e2a984..97ec31dcc 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -76,7 +76,7 @@ class UserController extends Controller
         if ($authMethod === 'standard' && !$sendInvite) {
             $validationRules['password'] = 'required|min:6';
             $validationRules['password-confirm'] = 'required|same:password';
-        } elseif ($authMethod === 'ldap') {
+        } elseif ($authMethod === 'ldap' || $authMethod === 'saml2') {
             $validationRules['external_auth_id'] = 'required';
         }
         $this->validate($request, $validationRules);
@@ -85,7 +85,7 @@ class UserController extends Controller
 
         if ($authMethod === 'standard') {
             $user->password = bcrypt($request->get('password', Str::random(32)));
-        } elseif ($authMethod === 'ldap') {
+        } elseif ($authMethod === 'ldap' || $authMethod === 'saml2') {
             $user->external_auth_id = $request->get('external_auth_id');
         }