iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow password-less registration 

Introduce a configuration option that, when unset, causes registration
to not require setting a password. Users registered without a password
will not be able to login unless through SSO.
This commit is contained in:
Fabian Freyer 2021-10-24 19:55:56 +02:00 committed by msquare
parent b345bf4ea7
commit 63be666a67
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.default.php
View File

@ -249,6 +249,11 @@ return [
// The minimum length for passwords // The minimum length for passwords
'min_password_length' => env('PASSWORD_MINIMUM_LENGTH', 8), 'min_password_length' => env('PASSWORD_MINIMUM_LENGTH', 8),
// Whether the Password field should be enabled.
// If this is disabled, it means that no password can be set and the user will
// not be able to log in unless linked to an oauth provider.
'enable_password' => (bool)env('ENABLE_PASSWORD', true),
// Whether the DECT field should be enabled // Whether the DECT field should be enabled
'enable_dect' => (bool)env('ENABLE_DECT', true), 'enable_dect' => (bool)env('ENABLE_DECT', true),

17
includes/pages/guest_login.php
View File

@ -32,6 +32,7 @@ function guest_register()
$enable_dect = config('enable_dect'); $enable_dect = config('enable_dect');
$enable_planned_arrival = config('enable_planned_arrival'); $enable_planned_arrival = config('enable_planned_arrival');
$min_password_length = config('min_password_length'); $min_password_length = config('min_password_length');
$enable_password = config('enable_password');
$enable_pronoun = config('enable_pronoun'); $enable_pronoun = config('enable_pronoun');
$config = config(); $config = config();
$request = request(); $request = request();
@ -146,12 +147,12 @@ function guest_register()
} }
} }
if ($request->has('password') && strlen($request->postData('password')) >= $min_password_length) { if ($enable_password && $request->has('password') && strlen($request->postData('password')) >= $min_password_length) {
if ($request->postData('password') != $request->postData('password2')) { if ($request->postData('password') != $request->postData('password2')) {
$valid = false; $valid = false;
$msg .= error(__('Your passwords don\'t match.'), true); $msg .= error(__('Your passwords don\'t match.'), true);
} }
} else { } else if ($enable_password) {
$valid = false; $valid = false;
$msg .= error(sprintf( $msg .= error(sprintf(
__('Your password is too short (please use at least %s characters).'), __('Your password is too short (please use at least %s characters).'),
@ -272,7 +273,9 @@ function guest_register()
// Assign user-group and set password // Assign user-group and set password
DB::insert('INSERT INTO `UserGroups` (`uid`, `group_id`) VALUES (?, -20)', [$user->id]); DB::insert('INSERT INTO `UserGroups` (`uid`, `group_id`) VALUES (?, -20)', [$user->id]);
auth()->setPassword($user, $request->postData('password')); if ($enable_password) {
auth()->setPassword($user, $request->postData('password'));
}
// Assign angel-types // Assign angel-types
$user_angel_types_info = []; $user_angel_types_info = [];
@ -422,9 +425,9 @@ function guest_register()
]), ]),
div('row', [ div('row', [
div('col', [ $enable_password ? div('col', [
form_password('password', __('Password') . ' ' . entry_required()) form_password('password', __('Password') . ' ' . entry_required())
]), ]) : '',
$enable_planned_arrival ? div('col', [ $enable_planned_arrival ? div('col', [
form_date( form_date(
@ -436,9 +439,9 @@ function guest_register()
]), ]),
div('row', [ div('row', [
div('col', [ $enable_password ? div('col', [
form_password('password2', __('Confirm password') . ' ' . entry_required()) form_password('password2', __('Confirm password') . ' ' . entry_required())
]), ]) : '',
div('col', [ div('col', [
$enable_tshirt_size ? form_select('tshirt_size', $enable_tshirt_size ? form_select('tshirt_size',