Search auth identifer support UUID, ULID, GLID (#1544)

* Search auth identifer support UUID, ULID, GLID

Co-authored-by: Pavel Bychko <[email protected]>

* user->getKey() instead of user->id

---------

Co-authored-by: Pavel Bychko <[email protected]>

Author: erikn69

src/DataCollector/GateCollector.php

@@ -47,7 +47,7 @@ public function addCheck($user, $ability, $result, $arguments = [])
 
         if ($user) {
             $userKey = Str::snake(class_basename($user));
-            $userId = $user instanceof Authenticatable ? $user->getAuthIdentifier() : $user->id;
+            $userId = $user instanceof Authenticatable ? $user->getAuthIdentifier() : $user->getKey();
         }
 
         $label = $result ? 'success' : 'error';

src/DataCollector/MultiAuthCollector.php

@@ -113,14 +113,16 @@ protected function getUserInformation($user = null)
         }
 
         // The default auth identifer is the ID number, which isn't all that
-        // useful. Try username and email.
-        $identifier = $user instanceof Authenticatable ? $user->getAuthIdentifier() : $user->id;
-        if (is_numeric($identifier)) {
+        // useful. Try username, email and name.
+        $identifier = $user instanceof Authenticatable ? $user->getAuthIdentifier() : $user->getKey();
+        if (is_numeric($identifier) || Str::isUuid($identifier) || Str::isUlid($identifier)) {
             try {
                 if (isset($user->username)) {
                     $identifier = $user->username;
                 } elseif (isset($user->email)) {
                     $identifier = $user->email;
+                } elseif (isset($user->name)) {
+                    $identifier = Str::limit($user->name, 24);
                 }
             } catch (\Throwable $e) {
             }