X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/b80b6ed942c0eddfc5591b0f6745a990322c8ee2..refs/pull/2270/head:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 775e2a984..651dedc0d 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -66,8 +66,8 @@ class UserController extends Controller { $this->checkPermission('users-manage'); $validationRules = [ - 'name' => 'required', - 'email' => 'required|email|unique:users,email' + 'name' => 'required', + 'email' => 'required|email|unique:users,email' ]; $authMethod = config('auth.method'); @@ -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'); }