From 5182ea1238f2b8c3838806465de547445ef53009 Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Tue, 20 Feb 2024 23:03:57 +0400
Subject: [PATCH] complex secret id (#2401)

* complex secret id

* unique secret id
---
 .../src/io/cloudbeaver/model/WebSecretInfo.java                 | 2 +-
 .../src/io/cloudbeaver/service/core/impl/WebServiceCore.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java
index ee412bde07..627947a358 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java
@@ -33,6 +33,6 @@ public class WebSecretInfo {
 
     @Property
     public String getSecretId() {
-        return secretValue.getSubjectId();
+        return secretValue.getUniqueId();
     }
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
index e814113d04..5707ac37ca 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
@@ -338,7 +338,7 @@ public class WebServiceCore implements DBWServiceCore {
             }
             DBSSecretValue selectedSecret =
                 allSecrets.stream()
-                    .filter(secret -> selectedSecretId.equals(secret.getSubjectId()))
+                    .filter(secret -> selectedSecretId.equals(secret.getUniqueId()))
                     .findFirst().orElse(null);
             if (selectedSecret == null) {
                 throw new DBWebException("Secret not found:" + selectedSecretId);