CB-5274. Added new link for download metadata file (#2900)

* CB-5274. Added new link for download metadata file * CB-5274. Refactor after review * CB-5274 add entityIdLink field * CB-5274. Rename property --------- Co-authored-by: naumov <[email protected]> Co-authored-by: Evgenia Bezborodova <[email protected]> Co-authored-by: Alexander Skoblikov <[email protected]>
dbeaver · Sep 16, 2024 · e998a6c · e998a6c
1 parent 83fe4e8
commit e998a6c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 0 deletions.
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderFederated.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderFederated.java
@@ -46,6 +46,9 @@ default String getUserSignOutLink(
     @Nullable
     String getAcsLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
 
+    @Nullable
+    String getEntityIdLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+
     @Nullable
     default String getRedirectLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException {
         return null;

diff --git a/...undles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebAuthProviderConfiguration.java b/...undles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebAuthProviderConfiguration.java
@@ -109,6 +109,14 @@ public String getAcsLink() throws DBException {
         return instance instanceof SMAuthProviderFederated ? ((SMAuthProviderFederated) instance).getAcsLink(getId(), config.getParameters()) : null;
     }
 
+    @Property
+    public String getEntityIdLink() throws  DBException {
+        SMAuthProvider<?> instance = providerDescriptor.getInstance();
+        return instance instanceof SMAuthProviderFederated
+            ? ((SMAuthProviderFederated) instance).getEntityIdLink(getId(), config.getParameters())
+            : null;
+    }
+
     @Override
     public String toString() {
         return getDisplayName();

diff --git a/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls b/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls
@@ -89,6 +89,7 @@ type AdminAuthProviderConfiguration {
     redirectLink: String
     metadataLink: String
     acsLink: String
+    entityIdLink: String @since(version: "24.2.1")
 }
 
 type WebFeatureSet {

diff --git a/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls b/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls
@@ -42,6 +42,7 @@ type AuthProviderConfiguration {
     signOutLink: String
     metadataLink: String
     acsLink: String
+    entityIdLink: String @since(version: "24.2.1")
 }
 
 type AuthProviderCredentialsProfile {

diff --git a/webapp/packages/core-sdk/src/queries/authentication/getAuthProviderConfigurations.gql b/webapp/packages/core-sdk/src/queries/authentication/getAuthProviderConfigurations.gql
@@ -12,5 +12,6 @@ query getAuthProviderConfigurations($providerId: ID) {
     redirectLink
     metadataLink
     acsLink
+    entityIdLink
   }
 }
diff --git a/webapp/packages/core-sdk/src/queries/authentication/saveAuthProviderConfiguration.gql b/webapp/packages/core-sdk/src/queries/authentication/saveAuthProviderConfiguration.gql
@@ -28,5 +28,6 @@ query saveAuthProviderConfiguration(
     redirectLink
     metadataLink
     acsLink
+    entityIdLink
   }
 }
diff --git a/webapp/packages/core-sdk/src/queries/fragments/AuthProviderConfigurationInfo.gql b/webapp/packages/core-sdk/src/queries/fragments/AuthProviderConfigurationInfo.gql
@@ -8,4 +8,5 @@ fragment AuthProviderConfigurationInfo on AuthProviderConfiguration {
   signOutLink
   metadataLink
   acsLink
+  entityIdLink
 }