set default_role when registering instead of at every login (#16235)

This commit is contained in:
Markus Viitamäki
2024-07-22 16:58:34 +02:00
committed by GitHub
parent a81a9f3cfc
commit 5fc7055d54

View File

@@ -147,13 +147,17 @@ class SocialiteController extends Controller
$user->realname = $this->buildRealName();
$user->save();
$default_role = LibreNMSConfig::get('auth.socialite.default_role');
if ($default_role !== null && $default_role != 'none') {
$user->setRoles([$default_role], true);
}
}
private function setRolesFromClaim(string $provider, $user): bool
{
$scopes = LibreNMSConfig::get('auth.socialite.scopes');
$claims = LibreNMSConfig::get('auth.socialite.claims');
$default_role = LibreNMSConfig::get('auth.socialite.default_role');
if (is_array($scopes) &&
$this->socialite_user instanceof \Laravel\Socialite\AbstractUser &&
@@ -174,12 +178,6 @@ class SocialiteController extends Controller
}
}
if ($default_role !== null && $default_role != 'none') {
$user->setRoles([$default_role], false);
return true;
}
return false;
}