Merge branch 'dev' of github.com:dbarzin/deming into dev

Author: dbarzin

.env.example

@@ -105,4 +105,5 @@ OIDC_ADDITIONAL_SCOPES="deming_role"
 OIDC_CLIENT_ID=deming
 OIDC_CLIENT_SECRET=deming
 OIDC_BASE_URL=http://auth.lan
+OIDC_SUFFIX=""
 OIDC_REDIRECT_URI=${APP_URL}auth/callback/oidc

app/Http/Controllers/SocialiteController.php

@@ -68,8 +68,8 @@ public function callback(Request $_request, string $provider)
         $allow_createUser = false;
         $allow_updateUser = false;
         if (config($config_name)) {
-            $allow_createUser = config($config_name.'.allow_create_User', $allow_createUser);
-            $allow_updateUser = config($config_name.'.allow_update_User', $allow_updateUser);
+            $allow_createUser = config($config_name.'.allow_create_user', $allow_createUser);
+            $allow_updateUser = config($config_name.'.allow_update_user', $allow_updateUser);
         }
         Log::debug('CONFIG: allow_createUser='.($allow_createUser ? 'true' : 'false'));
         Log::debug('CONFIG: allow_updateUser='.($allow_updateUser ? 'true' : 'false'));

app/Providers/Socialite/GenericSocialiteProvider.php

@@ -48,7 +48,7 @@ class GenericSocialiteProvider extends AbstractProvider implements ProviderInter
      */
     public function getOIDCUrl()
     {
-        return rtrim(config('services.oidc.host'), '/').'/oauth2';
+        return rtrim(config('services.oidc.host'), '/').config('services.oidc.suffix', '');
     }
 
     /**

config/services.php

@@ -66,6 +66,7 @@
         'client_id' => env('OIDC_CLIENT_ID'),  
         'client_secret' => env('OIDC_CLIENT_SECRET'),  
         'host' => env('OIDC_BASE_URL'),
+        'suffix' => env('OIDC_SUFFIX', null),
         'redirect' => env('OIDC_REDIRECT_URI', rtrim(env('APP_URL'), '/').'/auth/callback/oidc'),
         'authorize_endpoint' => env('OIDC_AUTHORIZE_ENDPOINT', null),
         'token_endpoint' => env('OIDC_TOKEN_ENDPOINT', null),