Fix sso disabled password inconsistencies

config/config.default.php

@@ -250,8 +250,8 @@ return [
     'min_password_length'     => env('PASSWORD_MINIMUM_LENGTH', 8),
 
     // Whether the Password field should be enabled on registration.
-    // If this is disabled, it means that no password can be set on registration so the user will
+    // This is useful when using oauth, disabling it also disables normal
-    // not be able to log in unless linked to an oauth provider.
+    // registration without oauth.
     'enable_password'         => (bool)env('ENABLE_PASSWORD', true),
 
     // Whether the DECT field should be enabled

includes/pages/guest_login.php

@@ -37,6 +37,7 @@ function guest_register()
     $config = config();
     $request = request();
     $session = session();
+    $is_oauth = $session->has('oauth2_connect_provider');
 
     $msg = '';
     $nick = '';
@@ -76,8 +77,10 @@ function guest_register()
     }
 
     if (
-        !auth()->can('register')
+        !auth()->can('register') // No registration permission
-        || (!$authUser && !config('registration_enabled') && !$session->get('oauth2_allow_registration'))
+        // Not authenticated and
+        || (!$authUser && !config('registration_enabled') && !$session->get('oauth2_allow_registration')) // Registration disabled
+        || (!$authUser && !$enable_password && !$is_oauth) // Password disabled and not oauth
     ) {
         error(__('Registration is disabled.'));
 

resources/lang/de_DE/default.po

@@ -188,6 +188,9 @@ msgstr "Passwort vergessen"
 msgid "Please sign up, if you want to help us!"
 msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
 
+msgid "Registration is only available via external login."
+msgstr "Die Registrierung ist nur über einen externen Login möglich."
+
 #: resources/views/pages/login.twig:90 includes/pages/guest_login.php:61
 msgid "Registration is disabled."
 msgstr "Registrierung ist abgeschaltet."

resources/views/pages/login.twig

@@ -100,8 +100,12 @@
             <div class="col-sm-6 text-center">
                 <h2>{{ __('Register') }}</h2>
                 {% if has_permission_to('register') and config('registration_enabled') %}
+                    {% if config('enable_password') %}
                         <p>{{ __('Please sign up, if you want to help us!') }}</p>
                         <a href="{{ url('register') }}" class="btn btn-primary">{{ __('Register') }} &raquo;</a>
+                    {% else %}
+                        <p>{{ __('Registration is only available via external login.') }}</p>
+                    {% endif %}
                 {% else %}
                     {{ m.alert(__('Registration is disabled.'), 'danger') }}
                 {% endif %}