Change property variable name

apache · Feb 26, 2021 · 82087eb · 82087eb
1 parent 127ab06
commit 82087eb
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/...c/main/java/org/apache/airavata/mft/secret/server/backend/custos/CustosSecretBackend.java b/...c/main/java/org/apache/airavata/mft/secret/server/backend/custos/CustosSecretBackend.java
@@ -113,7 +113,7 @@ public Optional<SCPSecret> getSCPSecret(SCPSecretGetRequest request) throws Exce
             case DELEGATEAUTH:
                 DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
                 ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
-                SSHCredential sshCredential = csClient.getSSHCredential(delegateAuth.getClientId(),
+                SSHCredential sshCredential = csClient.getSSHCredential(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
                         request.getSecretId(), false);
                 SCPSecret scpSecret = SCPSecret.newBuilder()
                         .setSecretId(sshCredential.getMetadata().getToken())
@@ -174,7 +174,7 @@ public Optional<S3Secret> getS3Secret(S3SecretGetRequest request) throws Excepti
             case DELEGATEAUTH:
                 DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
                 ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
-                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getClientId(),
+                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
                         request.getSecretId());
                 Map<String, String> secretValues = credentialMap.getCredentialMapMap();
                 S3Secret s3Secret = S3Secret.newBuilder()
@@ -233,7 +233,8 @@ public Optional<BoxSecret> getBoxSecret(BoxSecretGetRequest request) throws Exce
             case DELEGATEAUTH:
                 DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
                 ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
-                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getClientId(), request.getSecretId());
+                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+                        request.getSecretId());
                 Map<String, String> secretValues = credentialMap.getCredentialMapMap();
                 BoxSecret boxSecret = BoxSecret.newBuilder()
                         .setSecretId(secretValues.get("secretId"))
@@ -295,7 +296,8 @@ public Optional<AzureSecret> getAzureSecret(AzureSecretGetRequest request) throw
             case DELEGATEAUTH:
                 DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
                 ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
-                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getClientId(), request.getSecretId());
+                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+                        request.getSecretId());
                 Map<String, String> secretValues = credentialMap.getCredentialMapMap();
                 AzureSecret azureSecret = AzureSecret.newBuilder()
                         .setSecretId(secretValues.get("secretId"))
@@ -356,7 +358,8 @@ public Optional<GCSSecret> getGCSSecret(GCSSecretGetRequest request) throws Exce
             case DELEGATEAUTH:
                 DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
                 ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
-                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getClientId(), request.getSecretId());
+                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+                        request.getSecretId());
                 Map<String, String> secretValues = credentialMap.getCredentialMapMap();
                 GCSSecret gcsSecret = GCSSecret.newBuilder()
                         .setSecretId(secretValues.get("secretId"))
@@ -417,7 +420,8 @@ public Optional<DropboxSecret> getDropboxSecret(DropboxSecretGetRequest request)
             case DELEGATEAUTH:
                 DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
                 ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
-                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getClientId(), request.getSecretId());
+                CredentialMap credentialMap = csClient.getCredentialMap(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+                        request.getSecretId());
                 Map<String, String> secretValues = credentialMap.getCredentialMapMap();
                 DropboxSecret dropboxSecret = DropboxSecret.newBuilder()
                         .setSecretId(secretValues.get("secretId"))
@@ -480,8 +484,9 @@ public Optional<FTPSecret> getFTPSecret(FTPSecretGetRequest request) throws Exce
             case DELEGATEAUTH:
                 DelegateAuth delegateAuth = request.getAuthzToken().getDelegateAuth();
                 ResourceSecretManagementClient csClient = getTenantResourceSecretManagementClient(delegateAuth);
-                PasswordCredential passwordCredential = csClient.getPasswordCredential(delegateAuth.getClientId(),
-                        request.getSecretId());
+                PasswordCredential passwordCredential = csClient
+                        .getPasswordCredential(delegateAuth.getPropertiesMap().get("PORTAL_CUSTOS_ID"),
+                                request.getSecretId());
                 FTPSecret ftpSecret = FTPSecret.newBuilder()
                         .setSecretId(request.getSecretId())
                         .setPassword(passwordCredential.getPassword())
@@ -509,8 +514,8 @@ public boolean deleteFTPSecret(FTPSecretDeleteRequest request) throws Exception
 
 
     private ResourceSecretManagementClient getTenantResourceSecretManagementClient(DelegateAuth delegateAuth) throws IOException {
-        String adminCustosId = delegateAuth.getPropertiesMap().get("ADMIN_TENANT_CUSTOS_ID");
-        String adminCustosSecret = delegateAuth.getPropertiesMap().get("ADMIN_TENANT_CUSTOS_SECRET");
+        String adminCustosId = delegateAuth.getClientId();
+        String adminCustosSecret = delegateAuth.getClientSecret();
         CustosClientProvider custosClientProvider = custosClientsFactory
                 .getCustosClientProvider(adminCustosId, adminCustosSecret);
         return custosClientProvider