unique secret id

dbeaver · Feb 20, 2024 · 85f540f · 85f540f
1 parent fc85582
commit 85f540f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 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
@@ -16,7 +16,6 @@
  */
 package io.cloudbeaver.model;
 
-import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.secret.DBSSecretValue;
 
@@ -34,10 +33,6 @@ public String getDisplayName() {
 
     @Property
     public String getSecretId() {
-        return buildComplexSecretId(secretValue);
-    }
-
-    public static String buildComplexSecretId(@NotNull DBSSecretValue secretValue) {
-        return secretValue.getId() + "_" + secretValue.getSubjectId();
+        return secretValue.getUniqueId();
     }
 }
diff --git a/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
@@ -338,7 +338,7 @@ public WebConnectionInfo initConnection(
             }
             DBSSecretValue selectedSecret =
                 allSecrets.stream()
-                    .filter(secret -> selectedSecretId.equals(WebSecretInfo.buildComplexSecretId(secret)))
+                    .filter(secret -> selectedSecretId.equals(secret.getUniqueId()))
                     .findFirst().orElse(null);
             if (selectedSecret == null) {
                 throw new DBWebException("Secret not found:" + selectedSecretId);