From 706ce7b55a61908c34e2d9b843759f3f5cfe47d3 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <ensiouel@gmail.com>
Date: Thu, 29 Feb 2024 16:40:30 +0300
Subject: [PATCH] fix

---
 id/system/system.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/id/system/system.go b/id/system/system.go
index 77084f5d..81006292 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -63,9 +63,11 @@ func Handler(obj any) *id.ObjectId {
 		i.UserID = val.GetID(context.TODO())
 		return id.MustObjectId(&i)
 	case *auth.ClientPrincipal:
-		var i id.ClientId
-		i.ClientID = val.GetID(context.TODO())
-		return id.MustObjectId(&i)
+		client, _ := val.Client(context.TODO())
+		if client == nil {
+			return id.MustObjectId(&id.ClientId{})
+		}
+		return Handler(client)
 	case *auth.SystemPrincipal:
 		return id.MustObjectId(&id.SystemId{})
 	case *auth.Anonymous:
-- 
GitLab