UHF-9458: Use Uuid:isValid()

City-of-Helsinki · Jan 9, 2024 · 45015e4 · 45015e4
1 parent a0597ce
commit 45015e4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/helfi_tunnistamo.module b/helfi_tunnistamo.module
@@ -7,6 +7,7 @@
 
 declare(strict_types = 1);
 
+use Drupal\Component\Uuid\Uuid;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\helfi_tunnistamo\Plugin\OpenIDConnectClient\Tunnistamo;
 use Drupal\openid_connect\Entity\OpenIDConnectClientEntity;
@@ -78,10 +79,7 @@ function helfi_tunnistamo_openid_connect_userinfo_alter(
 
   // Unset preferred_username if it is a UUID so that new users get their
   // name from `name` field instead.
-  if (
-    !empty($userinfo['preferred_username'])
-    && preg_match('/^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}$/', $userinfo['preferred_username'])
-  ) {
+  if (!empty($userinfo['preferred_username']) && Uuid::isValid($userinfo['preferred_username'])) {
     unset($userinfo['preferred_username']);
   }