You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/09/26 23:39:17 UTC

[airavata] branch develop updated (e59e627 -> f8dcbf7)

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from e59e627  AIRAVATA-2840 Set username in CredentialSummary to portal username
     new 6bf1caf  AIRAVATA-2840 Removing unnecessary parameters from API
     new f590d0a  AIRAVATA-2840 Regenerate Thrift stubs
     new f8dcbf7  AIRAVATA-2840 Update handlers for API changes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../api/server/handler/AiravataServerHandler.java  |  12 +-
 .../java/org/apache/airavata/api/Airavata.java     | 420 ++-------------------
 .../main/resources/lib/Airavata/API/Airavata.php   | 112 +-----
 .../lib/Airavata/Model/Credential/Store/Types.php  |   3 +
 .../resources/lib/airavata/api/Airavata-remote     |  24 +-
 .../main/resources/lib/airavata/api/Airavata.py    | 113 +-----
 .../lib/airavata/model/credential/store/ttypes.py  |   3 +-
 .../store/server/CredentialStoreServerHandler.java |  39 +-
 .../store/cpi/CredentialStoreService.java          | 156 +-------
 .../airavata-apis/airavata_api.thrift              |  19 +-
 .../component-cpis/credential-store-cpi.thrift     |   8 +-
 11 files changed, 152 insertions(+), 757 deletions(-)


[airavata] 03/03: AIRAVATA-2840 Update handlers for API changes

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit f8dcbf7df1d04bcbf54ebac23ce363b76ce41a64
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Sep 26 19:23:56 2018 -0400

    AIRAVATA-2840 Update handlers for API changes
---
 .../api/server/handler/AiravataServerHandler.java  | 12 ++++---
 .../store/server/CredentialStoreServerHandler.java | 39 ++++++++++++++++++----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index a2f8bbd..b883acd 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -723,7 +723,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public CredentialSummary getCredentialSummary(AuthzToken authzToken, SummaryType type, String tokenId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+    public CredentialSummary getCredentialSummary(AuthzToken authzToken, String tokenId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         CredentialStoreService.Client csClient = csClientPool.getResource();
         SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
         String gatewayId = authzToken.getClaimsMap().get(Constants.GATEWAY_ID);
@@ -731,7 +731,7 @@ public class AiravataServerHandler implements Airavata.Iface {
             if (!userHasAccessInternal(sharingClient, authzToken, tokenId, ResourcePermissionType.READ)) {
                 throw new AuthorizationException("User does not have permission to access this resource");
             }
-            CredentialSummary credentialSummary = csClient.getCredentialSummary(type, tokenId, gatewayId);
+            CredentialSummary credentialSummary = csClient.getCredentialSummary(tokenId, gatewayId);
             csClientPool.returnResource(csClient);
             sharingClientPool.returnResource(sharingClient);
             return credentialSummary;
@@ -742,7 +742,7 @@ public class AiravataServerHandler implements Airavata.Iface {
             sharingClientPool.returnResource(sharingClient);
             throw ae;
         } catch (Exception e) {
-            String msg = "Error retrieving credential summary of type " + type + " for token " + tokenId + ". GatewayId: "+ gatewayId;
+            String msg = "Error retrieving credential summary for token " + tokenId + ". GatewayId: "+ gatewayId;
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
             exception.setMessage(msg+" More info : " + e.getMessage());
@@ -787,9 +787,10 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public boolean deleteSSHPubKey(AuthzToken authzToken, String airavataCredStoreToken, String gatewayId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+    public boolean deleteSSHPubKey(AuthzToken authzToken, String airavataCredStoreToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
         CredentialStoreService.Client csClient = csClientPool.getResource();
         SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+        String gatewayId = authzToken.getClaimsMap().get(Constants.GATEWAY_ID);
         try {
             if (!userHasAccessInternal(sharingClient, authzToken, airavataCredStoreToken, ResourcePermissionType.WRITE)) {
                 throw new AuthorizationException("User does not have permission to delete this resource.");
@@ -818,9 +819,10 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public boolean deletePWDCredential(AuthzToken authzToken, String airavataCredStoreToken, String gatewayId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+    public boolean deletePWDCredential(AuthzToken authzToken, String airavataCredStoreToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
         CredentialStoreService.Client csClient = csClientPool.getResource();
         SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+        String gatewayId = authzToken.getClaimsMap().get(Constants.GATEWAY_ID);
         try {
             if (!userHasAccessInternal(sharingClient, authzToken, airavataCredStoreToken, ResourcePermissionType.WRITE)) {
                 throw new AuthorizationException("User does not have permission to delete this resource.");
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
index dbb2fff..ecfb4e0 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
@@ -190,9 +190,22 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
     }
 
     @Override
-    public CredentialSummary getCredentialSummary(SummaryType type, String tokenId, String gatewayId) throws org.apache.airavata.credential.store.exception.CredentialStoreException, TException {
-        List<CredentialSummary> credentialSummaries = getAllCredentialSummaries(type, Collections.singletonList(tokenId), gatewayId);
-        return !credentialSummaries.isEmpty() ? credentialSummaries.get(0) : null;
+    public CredentialSummary getCredentialSummary(String tokenId, String gatewayId) throws org.apache.airavata.credential.store.exception.CredentialStoreException, TException {
+        try {
+            Credential credential = credentialReader.getCredential(gatewayId, tokenId);
+            if (isSSHCredential(credential)) {
+                return convertToCredentialSummary((org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential) credential);
+            } else if (isCertificateCredential(credential)) {
+                return convertToCredentialSummary((org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential) credential);
+            } else if (isPasswordCredential(credential)) {
+                return convertToCredentialSummary((org.apache.airavata.credential.store.credential.impl.password.PasswordCredential) credential);
+            }
+            throw new org.apache.airavata.credential.store.exception.CredentialStoreException("Unrecognized type of credential for token: " + tokenId);
+        } catch (CredentialStoreException e) {
+            final String msg = "Error occurred while retrieving credential summary for token - " + tokenId + " and gateway id - " + gatewayId;
+            log.error(msg , e);
+            throw new org.apache.airavata.credential.store.exception.CredentialStoreException(msg);
+        }
     }
 
     @Override
@@ -201,20 +214,19 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
             List<Credential> credentials = credentialReader.getAllAccessibleCredentialsPerGateway(gatewayId, accessibleTokenIds);
             if (type.equals(SummaryType.SSH)) {
                 return credentials.stream()
-                        .filter(cred -> cred instanceof org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential
-                                && !(cred instanceof org.apache.airavata.credential.store.credential.impl.password.PasswordCredential))
+                        .filter(this::isSSHCredential)
                         .map(cred -> (org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential) cred)
                         .map(cred -> convertToCredentialSummary(cred))
                         .collect(Collectors.toList());
             } else if (type.equals(SummaryType.CERT)) {
                 return credentials.stream()
-                        .filter(cred -> cred instanceof org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential)
+                        .filter(this::isCertificateCredential)
                         .map(cred -> (org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential) cred)
                         .map(cred -> convertToCredentialSummary(cred))
                         .collect(Collectors.toList());
             } else if (type.equals(SummaryType.PASSWD)) {
                 return credentials.stream()
-                        .filter(cred -> cred instanceof org.apache.airavata.credential.store.credential.impl.password.PasswordCredential)
+                        .filter(this::isPasswordCredential)
                         .map(cred -> (org.apache.airavata.credential.store.credential.impl.password.PasswordCredential) cred)
                         .map(cred -> convertToCredentialSummary(cred))
                         .collect(Collectors.toList());
@@ -228,6 +240,19 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
         }
     }
 
+    private boolean isSSHCredential(Credential cred) {
+        return cred instanceof org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential
+                && !(cred instanceof org.apache.airavata.credential.store.credential.impl.password.PasswordCredential);
+    }
+
+    private boolean isCertificateCredential(Credential cred) {
+        return cred instanceof org.apache.airavata.credential.store.credential.impl.certificate.CertificateCredential;
+    }
+
+    private boolean isPasswordCredential(Credential cred) {
+        return cred instanceof org.apache.airavata.credential.store.credential.impl.password.PasswordCredential;
+    }
+
     private CredentialSummary convertToCredentialSummary(org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential cred) {
         CredentialSummary credentialSummary = new CredentialSummary();
         credentialSummary.setType(SummaryType.SSH);


[airavata] 01/03: AIRAVATA-2840 Removing unnecessary parameters from API

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 6bf1caf932e15cc0d57d659929aa00b4b66e5d16
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Sep 26 19:22:21 2018 -0400

    AIRAVATA-2840 Removing unnecessary parameters from API
---
 .../airavata-apis/airavata_api.thrift                 | 19 +++----------------
 .../component-cpis/credential-store-cpi.thrift        |  8 ++++----
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 05dd91b..fc1e601 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -297,7 +297,7 @@ service Airavata {
                      2: airavata_errors.AiravataClientException ace,
                      3: airavata_errors.AiravataSystemException ase)
 
-  credential_store_data_models.CredentialSummary getCredentialSummary(1: required security_model.AuthzToken authzToken, 2: required credential_store_data_models.SummaryType type, 3: required string tokenId)
+  credential_store_data_models.CredentialSummary getCredentialSummary(1: required security_model.AuthzToken authzToken, 2: required string tokenId)
              throws (1: airavata_errors.InvalidRequestException ire,
                      2: airavata_errors.AiravataClientException ace,
                      3: airavata_errors.AiravataSystemException ase,
@@ -308,20 +308,8 @@ service Airavata {
                      2: airavata_errors.AiravataClientException ace,
                      3: airavata_errors.AiravataSystemException ase)
 
-    /**
-    *
-    * Delete a Gateway
-    *
-    * @param gatewayId
-    *    The gateway Id of the Gateway to be deleted.
-    *
-    * @return boolean
-    *    Boolean identifier for the success or failure of the deletion operation.
-    *
-    **/
   bool deleteSSHPubKey (1: required security_model.AuthzToken authzToken,
-                          2: required string airavataCredStoreToken,
-                          3: required string gatewayId)
+                          2: required string airavataCredStoreToken)
              throws (1: airavata_errors.InvalidRequestException ire,
                      2: airavata_errors.AiravataClientException ace,
                      3: airavata_errors.AiravataSystemException ase,
@@ -329,8 +317,7 @@ service Airavata {
 
 
   bool deletePWDCredential (1: required security_model.AuthzToken authzToken,
-                            2: required string airavataCredStoreToken,
-                            3: required string gatewayId)
+                            2: required string airavataCredStoreToken)
                throws (1: airavata_errors.InvalidRequestException ire,
                        2: airavata_errors.AiravataClientException ace,
                        3: airavata_errors.AiravataSystemException ase,
diff --git a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift
index 32464f1..95bff09 100644
--- a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift
+++ b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift
@@ -35,10 +35,10 @@ service CredentialStoreService {
   /** Query CS server to fetch the CPI version */
   string getCSServiceVersion(),
 
-  credential_store_data_models.CredentialSummary getCredentialSummary (1: required credential_store_data_models.SummaryType type,
-                             2: required string tokenId,
-                             3: required string gatewayId)
-                            throws (1:credential_store_errors.CredentialStoreException csException);
+  credential_store_data_models.CredentialSummary getCredentialSummary (
+        1: required string tokenId,
+        2: required string gatewayId)
+    throws (1:credential_store_errors.CredentialStoreException csException);
 
   list<credential_store_data_models.CredentialSummary> getAllCredentialSummaries(
       1: required credential_store_data_models.SummaryType type,


[airavata] 02/03: AIRAVATA-2840 Regenerate Thrift stubs

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit f590d0a59d6e297aef6145e2e02f23c569b75ef9
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Sep 26 19:23:21 2018 -0400

    AIRAVATA-2840 Regenerate Thrift stubs
---
 .../java/org/apache/airavata/api/Airavata.java     | 420 ++-------------------
 .../main/resources/lib/Airavata/API/Airavata.php   | 112 +-----
 .../lib/Airavata/Model/Credential/Store/Types.php  |   3 +
 .../resources/lib/airavata/api/Airavata-remote     |  24 +-
 .../main/resources/lib/airavata/api/Airavata.py    | 113 +-----
 .../lib/airavata/model/credential/store/ttypes.py  |   3 +-
 .../store/cpi/CredentialStoreService.java          | 156 +-------
 7 files changed, 106 insertions(+), 725 deletions(-)

diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index d64a3a5..b068280 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -218,29 +218,13 @@ public class Airavata {
      */
     public java.lang.String registerPwdCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String loginUserName, java.lang.String password, java.lang.String description) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
 
-    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TE [...]
+    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String tokenId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     public java.util.List<org.apache.airavata.model.credential.store.CredentialSummary> getAllCredentialSummaries(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
 
-    /**
-     * 
-     * Delete a Gateway
-     * 
-     * @param gatewayId
-     *    The gateway Id of the Gateway to be deleted.
-     * 
-     * @return boolean
-     *    Boolean identifier for the success or failure of the deletion operation.
-     * 
-     * 
-     * 
-     * @param authzToken
-     * @param airavataCredStoreToken
-     * @param gatewayId
-     */
-    public boolean deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public boolean deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public boolean deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public boolean deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
      * 
@@ -3051,13 +3035,13 @@ public class Airavata {
 
     public void registerPwdCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String loginUserName, java.lang.String password, java.lang.String description, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException;
+    public void getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String tokenId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException;
 
     public void getAllCredentialSummaries(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type, org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.airavata.model.credential.store.CredentialSummary>> resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
     public void createProject(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.workspace.Project project, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
@@ -3989,17 +3973,16 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerPwdCredential failed: unknown result");
     }
 
-    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TE [...]
+    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String tokenId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_getCredentialSummary(authzToken, type, tokenId);
+      send_getCredentialSummary(authzToken, tokenId);
       return recv_getCredentialSummary();
     }
 
-    public void send_getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId) throws org.apache.thrift.TException
+    public void send_getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String tokenId) throws org.apache.thrift.TException
     {
       getCredentialSummary_args args = new getCredentialSummary_args();
       args.setAuthzToken(authzToken);
-      args.setType(type);
       args.setTokenId(tokenId);
       sendBase("getCredentialSummary", args);
     }
@@ -4059,18 +4042,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllCredentialSummaries failed: unknown result");
     }
 
-    public boolean deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_deleteSSHPubKey(authzToken, airavataCredStoreToken, gatewayId);
+      send_deleteSSHPubKey(authzToken, airavataCredStoreToken);
       return recv_deleteSSHPubKey();
     }
 
-    public void send_deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId) throws org.apache.thrift.TException
+    public void send_deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken) throws org.apache.thrift.TException
     {
       deleteSSHPubKey_args args = new deleteSSHPubKey_args();
       args.setAuthzToken(authzToken);
       args.setAiravataCredStoreToken(airavataCredStoreToken);
-      args.setGatewayId(gatewayId);
       sendBase("deleteSSHPubKey", args);
     }
 
@@ -4096,18 +4078,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteSSHPubKey failed: unknown result");
     }
 
-    public boolean deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_deletePWDCredential(authzToken, airavataCredStoreToken, gatewayId);
+      send_deletePWDCredential(authzToken, airavataCredStoreToken);
       return recv_deletePWDCredential();
     }
 
-    public void send_deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId) throws org.apache.thrift.TException
+    public void send_deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken) throws org.apache.thrift.TException
     {
       deletePWDCredential_args args = new deletePWDCredential_args();
       args.setAuthzToken(authzToken);
       args.setAiravataCredStoreToken(airavataCredStoreToken);
-      args.setGatewayId(gatewayId);
       sendBase("deletePWDCredential", args);
     }
 
@@ -10879,21 +10860,19 @@ public class Airavata {
       }
     }
 
-    public void getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException {
+    public void getCredentialSummary(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String tokenId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getCredentialSummary_call method_call = new getCredentialSummary_call(authzToken, type, tokenId, resultHandler, this, ___protocolFactory, ___transport);
+      getCredentialSummary_call method_call = new getCredentialSummary_call(authzToken, tokenId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getCredentialSummary_call extends org.apache.thrift.async.TAsyncMethodCall<org.apache.airavata.model.credential.store.CredentialSummary> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
-      private org.apache.airavata.model.credential.store.SummaryType type;
       private java.lang.String tokenId;
-      public getCredentialSummary_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.th [...]
+      public getCredentialSummary_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String tokenId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
-        this.type = type;
         this.tokenId = tokenId;
       }
 
@@ -10901,7 +10880,6 @@ public class Airavata {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getCredentialSummary", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getCredentialSummary_args args = new getCredentialSummary_args();
         args.setAuthzToken(authzToken);
-        args.setType(type);
         args.setTokenId(tokenId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -10952,9 +10930,9 @@ public class Airavata {
       }
     }
 
-    public void deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
+    public void deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      deleteSSHPubKey_call method_call = new deleteSSHPubKey_call(authzToken, airavataCredStoreToken, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+      deleteSSHPubKey_call method_call = new deleteSSHPubKey_call(authzToken, airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -10962,12 +10940,10 @@ public class Airavata {
     public static class deleteSSHPubKey_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String airavataCredStoreToken;
-      private java.lang.String gatewayId;
-      public deleteSSHPubKey_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public deleteSSHPubKey_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.airavataCredStoreToken = airavataCredStoreToken;
-        this.gatewayId = gatewayId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -10975,7 +10951,6 @@ public class Airavata {
         deleteSSHPubKey_args args = new deleteSSHPubKey_args();
         args.setAuthzToken(authzToken);
         args.setAiravataCredStoreToken(airavataCredStoreToken);
-        args.setGatewayId(gatewayId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -10990,9 +10965,9 @@ public class Airavata {
       }
     }
 
-    public void deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
+    public void deletePWDCredential(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      deletePWDCredential_call method_call = new deletePWDCredential_call(authzToken, airavataCredStoreToken, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+      deletePWDCredential_call method_call = new deletePWDCredential_call(authzToken, airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -11000,12 +10975,10 @@ public class Airavata {
     public static class deletePWDCredential_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String airavataCredStoreToken;
-      private java.lang.String gatewayId;
-      public deletePWDCredential_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public deletePWDCredential_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.airavataCredStoreToken = airavataCredStoreToken;
-        this.gatewayId = gatewayId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -11013,7 +10986,6 @@ public class Airavata {
         deletePWDCredential_args args = new deletePWDCredential_args();
         args.setAuthzToken(authzToken);
         args.setAiravataCredStoreToken(airavataCredStoreToken);
-        args.setGatewayId(gatewayId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -17961,7 +17933,7 @@ public class Airavata {
       public getCredentialSummary_result getResult(I iface, getCredentialSummary_args args) throws org.apache.thrift.TException {
         getCredentialSummary_result result = new getCredentialSummary_result();
         try {
-          result.success = iface.getCredentialSummary(args.authzToken, args.type, args.tokenId);
+          result.success = iface.getCredentialSummary(args.authzToken, args.tokenId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -18019,7 +17991,7 @@ public class Airavata {
       public deleteSSHPubKey_result getResult(I iface, deleteSSHPubKey_args args) throws org.apache.thrift.TException {
         deleteSSHPubKey_result result = new deleteSSHPubKey_result();
         try {
-          result.success = iface.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken, args.gatewayId);
+          result.success = iface.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -18050,7 +18022,7 @@ public class Airavata {
       public deletePWDCredential_result getResult(I iface, deletePWDCredential_args args) throws org.apache.thrift.TException {
         deletePWDCredential_result result = new deletePWDCredential_result();
         try {
-          result.success = iface.deletePWDCredential(args.authzToken, args.airavataCredStoreToken, args.gatewayId);
+          result.success = iface.deletePWDCredential(args.authzToken, args.airavataCredStoreToken);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -24667,7 +24639,7 @@ public class Airavata {
       }
 
       public void start(I iface, getCredentialSummary_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException {
-        iface.getCredentialSummary(args.authzToken, args.type, args.tokenId,resultHandler);
+        iface.getCredentialSummary(args.authzToken, args.tokenId,resultHandler);
       }
     }
 
@@ -24818,7 +24790,7 @@ public class Airavata {
       }
 
       public void start(I iface, deleteSSHPubKey_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
-        iface.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken, args.gatewayId,resultHandler);
+        iface.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken,resultHandler);
       }
     }
 
@@ -24896,7 +24868,7 @@ public class Airavata {
       }
 
       public void start(I iface, deletePWDCredential_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
-        iface.deletePWDCredential(args.authzToken, args.airavataCredStoreToken, args.gatewayId,resultHandler);
+        iface.deletePWDCredential(args.authzToken, args.airavataCredStoreToken,resultHandler);
       }
     }
 
@@ -58176,29 +58148,18 @@ public class Airavata {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCredentialSummary_args");
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)2);
-    private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)3);
+    private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCredentialSummary_argsStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCredentialSummary_argsTupleSchemeFactory();
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
-    /**
-     * 
-     * @see org.apache.airavata.model.credential.store.SummaryType
-     */
-    public org.apache.airavata.model.credential.store.SummaryType type; // required
     public java.lang.String tokenId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      /**
-       * 
-       * @see org.apache.airavata.model.credential.store.SummaryType
-       */
-      TYPE((short)2, "type"),
-      TOKEN_ID((short)3, "tokenId");
+      TOKEN_ID((short)2, "tokenId");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -58215,9 +58176,7 @@ public class Airavata {
         switch(fieldId) {
           case 1: // AUTHZ_TOKEN
             return AUTHZ_TOKEN;
-          case 2: // TYPE
-            return TYPE;
-          case 3: // TOKEN_ID
+          case 2: // TOKEN_ID
             return TOKEN_ID;
           default:
             return null;
@@ -58264,8 +58223,6 @@ public class Airavata {
       java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
-      tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.credential.store.SummaryType.class)));
       tmpMap.put(_Fields.TOKEN_ID, new org.apache.thrift.meta_data.FieldMetaData("tokenId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
@@ -58277,12 +58234,10 @@ public class Airavata {
 
     public getCredentialSummary_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      org.apache.airavata.model.credential.store.SummaryType type,
       java.lang.String tokenId)
     {
       this();
       this.authzToken = authzToken;
-      this.type = type;
       this.tokenId = tokenId;
     }
 
@@ -58293,9 +58248,6 @@ public class Airavata {
       if (other.isSetAuthzToken()) {
         this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
-      if (other.isSetType()) {
-        this.type = other.type;
-      }
       if (other.isSetTokenId()) {
         this.tokenId = other.tokenId;
       }
@@ -58308,7 +58260,6 @@ public class Airavata {
     @Override
     public void clear() {
       this.authzToken = null;
-      this.type = null;
       this.tokenId = null;
     }
 
@@ -58336,38 +58287,6 @@ public class Airavata {
       }
     }
 
-    /**
-     * 
-     * @see org.apache.airavata.model.credential.store.SummaryType
-     */
-    public org.apache.airavata.model.credential.store.SummaryType getType() {
-      return this.type;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.credential.store.SummaryType
-     */
-    public getCredentialSummary_args setType(org.apache.airavata.model.credential.store.SummaryType type) {
-      this.type = type;
-      return this;
-    }
-
-    public void unsetType() {
-      this.type = null;
-    }
-
-    /** Returns true if field type is set (has been assigned a value) and false otherwise */
-    public boolean isSetType() {
-      return this.type != null;
-    }
-
-    public void setTypeIsSet(boolean value) {
-      if (!value) {
-        this.type = null;
-      }
-    }
-
     public java.lang.String getTokenId() {
       return this.tokenId;
     }
@@ -58402,14 +58321,6 @@ public class Airavata {
         }
         break;
 
-      case TYPE:
-        if (value == null) {
-          unsetType();
-        } else {
-          setType((org.apache.airavata.model.credential.store.SummaryType)value);
-        }
-        break;
-
       case TOKEN_ID:
         if (value == null) {
           unsetTokenId();
@@ -58426,9 +58337,6 @@ public class Airavata {
       case AUTHZ_TOKEN:
         return getAuthzToken();
 
-      case TYPE:
-        return getType();
-
       case TOKEN_ID:
         return getTokenId();
 
@@ -58445,8 +58353,6 @@ public class Airavata {
       switch (field) {
       case AUTHZ_TOKEN:
         return isSetAuthzToken();
-      case TYPE:
-        return isSetType();
       case TOKEN_ID:
         return isSetTokenId();
       }
@@ -58477,15 +58383,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_type = true && this.isSetType();
-      boolean that_present_type = true && that.isSetType();
-      if (this_present_type || that_present_type) {
-        if (!(this_present_type && that_present_type))
-          return false;
-        if (!this.type.equals(that.type))
-          return false;
-      }
-
       boolean this_present_tokenId = true && this.isSetTokenId();
       boolean that_present_tokenId = true && that.isSetTokenId();
       if (this_present_tokenId || that_present_tokenId) {
@@ -58506,10 +58403,6 @@ public class Airavata {
       if (isSetAuthzToken())
         hashCode = hashCode * 8191 + authzToken.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
-      if (isSetType())
-        hashCode = hashCode * 8191 + type.getValue();
-
       hashCode = hashCode * 8191 + ((isSetTokenId()) ? 131071 : 524287);
       if (isSetTokenId())
         hashCode = hashCode * 8191 + tokenId.hashCode();
@@ -58535,16 +58428,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetTokenId()).compareTo(other.isSetTokenId());
       if (lastComparison != 0) {
         return lastComparison;
@@ -58583,14 +58466,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("type:");
-      if (this.type == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.type);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("tokenId:");
       if (this.tokenId == null) {
         sb.append("null");
@@ -58607,9 +58482,6 @@ public class Airavata {
       if (authzToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
       }
-      if (type == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' was not present! Struct: " + toString());
-      }
       if (tokenId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'tokenId' was not present! Struct: " + toString());
       }
@@ -58662,15 +58534,7 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.type = org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
-                struct.setTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // TOKEN_ID
+            case 2: // TOKEN_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.tokenId = iprot.readString();
                 struct.setTokenIdIsSet(true);
@@ -58698,11 +58562,6 @@ public class Airavata {
           struct.authzToken.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.type != null) {
-          oprot.writeFieldBegin(TYPE_FIELD_DESC);
-          oprot.writeI32(struct.type.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.tokenId != null) {
           oprot.writeFieldBegin(TOKEN_ID_FIELD_DESC);
           oprot.writeString(struct.tokenId);
@@ -58726,7 +58585,6 @@ public class Airavata {
       public void write(org.apache.thrift.protocol.TProtocol prot, getCredentialSummary_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
-        oprot.writeI32(struct.type.getValue());
         oprot.writeString(struct.tokenId);
       }
 
@@ -58736,8 +58594,6 @@ public class Airavata {
         struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
         struct.authzToken.read(iprot);
         struct.setAuthzTokenIsSet(true);
-        struct.type = org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
         struct.tokenId = iprot.readString();
         struct.setTokenIdIsSet(true);
       }
@@ -60754,20 +60610,17 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataCredStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteSSHPubKey_argsStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteSSHPubKey_argsTupleSchemeFactory();
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String airavataCredStoreToken; // required
-    public java.lang.String gatewayId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      AIRAVATA_CRED_STORE_TOKEN((short)2, "airavataCredStoreToken"),
-      GATEWAY_ID((short)3, "gatewayId");
+      AIRAVATA_CRED_STORE_TOKEN((short)2, "airavataCredStoreToken");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -60786,8 +60639,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // AIRAVATA_CRED_STORE_TOKEN
             return AIRAVATA_CRED_STORE_TOKEN;
-          case 3: // GATEWAY_ID
-            return GATEWAY_ID;
           default:
             return null;
         }
@@ -60835,8 +60686,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.AIRAVATA_CRED_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("airavataCredStoreToken", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteSSHPubKey_args.class, metaDataMap);
     }
@@ -60846,13 +60695,11 @@ public class Airavata {
 
     public deleteSSHPubKey_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      java.lang.String airavataCredStoreToken,
-      java.lang.String gatewayId)
+      java.lang.String airavataCredStoreToken)
     {
       this();
       this.authzToken = authzToken;
       this.airavataCredStoreToken = airavataCredStoreToken;
-      this.gatewayId = gatewayId;
     }
 
     /**
@@ -60865,9 +60712,6 @@ public class Airavata {
       if (other.isSetAiravataCredStoreToken()) {
         this.airavataCredStoreToken = other.airavataCredStoreToken;
       }
-      if (other.isSetGatewayId()) {
-        this.gatewayId = other.gatewayId;
-      }
     }
 
     public deleteSSHPubKey_args deepCopy() {
@@ -60878,7 +60722,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.airavataCredStoreToken = null;
-      this.gatewayId = null;
     }
 
     public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -60929,30 +60772,6 @@ public class Airavata {
       }
     }
 
-    public java.lang.String getGatewayId() {
-      return this.gatewayId;
-    }
-
-    public deleteSSHPubKey_args setGatewayId(java.lang.String gatewayId) {
-      this.gatewayId = gatewayId;
-      return this;
-    }
-
-    public void unsetGatewayId() {
-      this.gatewayId = null;
-    }
-
-    /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
-    public boolean isSetGatewayId() {
-      return this.gatewayId != null;
-    }
-
-    public void setGatewayIdIsSet(boolean value) {
-      if (!value) {
-        this.gatewayId = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, java.lang.Object value) {
       switch (field) {
       case AUTHZ_TOKEN:
@@ -60971,14 +60790,6 @@ public class Airavata {
         }
         break;
 
-      case GATEWAY_ID:
-        if (value == null) {
-          unsetGatewayId();
-        } else {
-          setGatewayId((java.lang.String)value);
-        }
-        break;
-
       }
     }
 
@@ -60990,9 +60801,6 @@ public class Airavata {
       case AIRAVATA_CRED_STORE_TOKEN:
         return getAiravataCredStoreToken();
 
-      case GATEWAY_ID:
-        return getGatewayId();
-
       }
       throw new java.lang.IllegalStateException();
     }
@@ -61008,8 +60816,6 @@ public class Airavata {
         return isSetAuthzToken();
       case AIRAVATA_CRED_STORE_TOKEN:
         return isSetAiravataCredStoreToken();
-      case GATEWAY_ID:
-        return isSetGatewayId();
       }
       throw new java.lang.IllegalStateException();
     }
@@ -61047,15 +60853,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_gatewayId = true && this.isSetGatewayId();
-      boolean that_present_gatewayId = true && that.isSetGatewayId();
-      if (this_present_gatewayId || that_present_gatewayId) {
-        if (!(this_present_gatewayId && that_present_gatewayId))
-          return false;
-        if (!this.gatewayId.equals(that.gatewayId))
-          return false;
-      }
-
       return true;
     }
 
@@ -61071,10 +60868,6 @@ public class Airavata {
       if (isSetAiravataCredStoreToken())
         hashCode = hashCode * 8191 + airavataCredStoreToken.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetGatewayId()) ? 131071 : 524287);
-      if (isSetGatewayId())
-        hashCode = hashCode * 8191 + gatewayId.hashCode();
-
       return hashCode;
     }
 
@@ -61106,16 +60899,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetGatewayId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -61151,14 +60934,6 @@ public class Airavata {
         sb.append(this.airavataCredStoreToken);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("gatewayId:");
-      if (this.gatewayId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.gatewayId);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -61171,9 +60946,6 @@ public class Airavata {
       if (airavataCredStoreToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataCredStoreToken' was not present! Struct: " + toString());
       }
-      if (gatewayId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
-      }
       // check for sub-struct validity
       if (authzToken != null) {
         authzToken.validate();
@@ -61231,14 +61003,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // GATEWAY_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.gatewayId = iprot.readString();
-                struct.setGatewayIdIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -61264,11 +61028,6 @@ public class Airavata {
           oprot.writeString(struct.airavataCredStoreToken);
           oprot.writeFieldEnd();
         }
-        if (struct.gatewayId != null) {
-          oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
-          oprot.writeString(struct.gatewayId);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -61288,7 +61047,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.airavataCredStoreToken);
-        oprot.writeString(struct.gatewayId);
       }
 
       @Override
@@ -61299,8 +61057,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.airavataCredStoreToken = iprot.readString();
         struct.setAiravataCredStoreTokenIsSet(true);
-        struct.gatewayId = iprot.readString();
-        struct.setGatewayIdIsSet(true);
       }
     }
 
@@ -62098,20 +61854,17 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataCredStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deletePWDCredential_argsStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deletePWDCredential_argsTupleSchemeFactory();
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String airavataCredStoreToken; // required
-    public java.lang.String gatewayId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      AIRAVATA_CRED_STORE_TOKEN((short)2, "airavataCredStoreToken"),
-      GATEWAY_ID((short)3, "gatewayId");
+      AIRAVATA_CRED_STORE_TOKEN((short)2, "airavataCredStoreToken");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -62130,8 +61883,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // AIRAVATA_CRED_STORE_TOKEN
             return AIRAVATA_CRED_STORE_TOKEN;
-          case 3: // GATEWAY_ID
-            return GATEWAY_ID;
           default:
             return null;
         }
@@ -62179,8 +61930,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.AIRAVATA_CRED_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("airavataCredStoreToken", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deletePWDCredential_args.class, metaDataMap);
     }
@@ -62190,13 +61939,11 @@ public class Airavata {
 
     public deletePWDCredential_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      java.lang.String airavataCredStoreToken,
-      java.lang.String gatewayId)
+      java.lang.String airavataCredStoreToken)
     {
       this();
       this.authzToken = authzToken;
       this.airavataCredStoreToken = airavataCredStoreToken;
-      this.gatewayId = gatewayId;
     }
 
     /**
@@ -62209,9 +61956,6 @@ public class Airavata {
       if (other.isSetAiravataCredStoreToken()) {
         this.airavataCredStoreToken = other.airavataCredStoreToken;
       }
-      if (other.isSetGatewayId()) {
-        this.gatewayId = other.gatewayId;
-      }
     }
 
     public deletePWDCredential_args deepCopy() {
@@ -62222,7 +61966,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.airavataCredStoreToken = null;
-      this.gatewayId = null;
     }
 
     public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -62273,30 +62016,6 @@ public class Airavata {
       }
     }
 
-    public java.lang.String getGatewayId() {
-      return this.gatewayId;
-    }
-
-    public deletePWDCredential_args setGatewayId(java.lang.String gatewayId) {
-      this.gatewayId = gatewayId;
-      return this;
-    }
-
-    public void unsetGatewayId() {
-      this.gatewayId = null;
-    }
-
-    /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
-    public boolean isSetGatewayId() {
-      return this.gatewayId != null;
-    }
-
-    public void setGatewayIdIsSet(boolean value) {
-      if (!value) {
-        this.gatewayId = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, java.lang.Object value) {
       switch (field) {
       case AUTHZ_TOKEN:
@@ -62315,14 +62034,6 @@ public class Airavata {
         }
         break;
 
-      case GATEWAY_ID:
-        if (value == null) {
-          unsetGatewayId();
-        } else {
-          setGatewayId((java.lang.String)value);
-        }
-        break;
-
       }
     }
 
@@ -62334,9 +62045,6 @@ public class Airavata {
       case AIRAVATA_CRED_STORE_TOKEN:
         return getAiravataCredStoreToken();
 
-      case GATEWAY_ID:
-        return getGatewayId();
-
       }
       throw new java.lang.IllegalStateException();
     }
@@ -62352,8 +62060,6 @@ public class Airavata {
         return isSetAuthzToken();
       case AIRAVATA_CRED_STORE_TOKEN:
         return isSetAiravataCredStoreToken();
-      case GATEWAY_ID:
-        return isSetGatewayId();
       }
       throw new java.lang.IllegalStateException();
     }
@@ -62391,15 +62097,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_gatewayId = true && this.isSetGatewayId();
-      boolean that_present_gatewayId = true && that.isSetGatewayId();
-      if (this_present_gatewayId || that_present_gatewayId) {
-        if (!(this_present_gatewayId && that_present_gatewayId))
-          return false;
-        if (!this.gatewayId.equals(that.gatewayId))
-          return false;
-      }
-
       return true;
     }
 
@@ -62415,10 +62112,6 @@ public class Airavata {
       if (isSetAiravataCredStoreToken())
         hashCode = hashCode * 8191 + airavataCredStoreToken.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetGatewayId()) ? 131071 : 524287);
-      if (isSetGatewayId())
-        hashCode = hashCode * 8191 + gatewayId.hashCode();
-
       return hashCode;
     }
 
@@ -62450,16 +62143,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetGatewayId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -62495,14 +62178,6 @@ public class Airavata {
         sb.append(this.airavataCredStoreToken);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("gatewayId:");
-      if (this.gatewayId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.gatewayId);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -62515,9 +62190,6 @@ public class Airavata {
       if (airavataCredStoreToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataCredStoreToken' was not present! Struct: " + toString());
       }
-      if (gatewayId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
-      }
       // check for sub-struct validity
       if (authzToken != null) {
         authzToken.validate();
@@ -62575,14 +62247,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // GATEWAY_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.gatewayId = iprot.readString();
-                struct.setGatewayIdIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -62608,11 +62272,6 @@ public class Airavata {
           oprot.writeString(struct.airavataCredStoreToken);
           oprot.writeFieldEnd();
         }
-        if (struct.gatewayId != null) {
-          oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
-          oprot.writeString(struct.gatewayId);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -62632,7 +62291,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.airavataCredStoreToken);
-        oprot.writeString(struct.gatewayId);
       }
 
       @Override
@@ -62643,8 +62301,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.airavataCredStoreToken = iprot.readString();
         struct.setAiravataCredStoreTokenIsSet(true);
-        struct.gatewayId = iprot.readString();
-        struct.setGatewayIdIsSet(true);
       }
     }
 
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index d96fd62..c8b5301 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -288,7 +288,6 @@ interface AiravataIf {
   public function registerPwdCredential(\Airavata\Model\Security\AuthzToken $authzToken, $loginUserName, $password, $description);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
-   * @param int $type
    * @param string $tokenId
    * @return \Airavata\Model\Credential\Store\CredentialSummary
    * @throws \Airavata\API\Error\InvalidRequestException
@@ -296,7 +295,7 @@ interface AiravataIf {
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function getCredentialSummary(\Airavata\Model\Security\AuthzToken $authzToken, $type, $tokenId);
+  public function getCredentialSummary(\Airavata\Model\Security\AuthzToken $authzToken, $tokenId);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param int $type
@@ -307,38 +306,25 @@ interface AiravataIf {
    */
   public function getAllCredentialSummaries(\Airavata\Model\Security\AuthzToken $authzToken, $type);
   /**
-   * 
-   * Delete a Gateway
-   * 
-   * @param gatewayId
-   *    The gateway Id of the Gateway to be deleted.
-   * 
-   * @return boolean
-   *    Boolean identifier for the success or failure of the deletion operation.
-   * 
-   * 
-   * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $airavataCredStoreToken
-   * @param string $gatewayId
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function deleteSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId);
+  public function deleteSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $airavataCredStoreToken
-   * @param string $gatewayId
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function deletePWDCredential(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId);
+  public function deletePWDCredential(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken);
   /**
    * 
    * Creates a Project with basic metadata.
@@ -5339,17 +5325,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("registerPwdCredential failed: unknown result");
   }
 
-  public function getCredentialSummary(\Airavata\Model\Security\AuthzToken $authzToken, $type, $tokenId)
+  public function getCredentialSummary(\Airavata\Model\Security\AuthzToken $authzToken, $tokenId)
   {
-    $this->send_getCredentialSummary($authzToken, $type, $tokenId);
+    $this->send_getCredentialSummary($authzToken, $tokenId);
     return $this->recv_getCredentialSummary();
   }
 
-  public function send_getCredentialSummary(\Airavata\Model\Security\AuthzToken $authzToken, $type, $tokenId)
+  public function send_getCredentialSummary(\Airavata\Model\Security\AuthzToken $authzToken, $tokenId)
   {
     $args = new \Airavata\API\Airavata_getCredentialSummary_args();
     $args->authzToken = $authzToken;
-    $args->type = $type;
     $args->tokenId = $tokenId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
@@ -5465,18 +5450,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getAllCredentialSummaries failed: unknown result");
   }
 
-  public function deleteSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId)
+  public function deleteSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken)
   {
-    $this->send_deleteSSHPubKey($authzToken, $airavataCredStoreToken, $gatewayId);
+    $this->send_deleteSSHPubKey($authzToken, $airavataCredStoreToken);
     return $this->recv_deleteSSHPubKey();
   }
 
-  public function send_deleteSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId)
+  public function send_deleteSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken)
   {
     $args = new \Airavata\API\Airavata_deleteSSHPubKey_args();
     $args->authzToken = $authzToken;
     $args->airavataCredStoreToken = $airavataCredStoreToken;
-    $args->gatewayId = $gatewayId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
@@ -5530,18 +5514,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("deleteSSHPubKey failed: unknown result");
   }
 
-  public function deletePWDCredential(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId)
+  public function deletePWDCredential(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken)
   {
-    $this->send_deletePWDCredential($authzToken, $airavataCredStoreToken, $gatewayId);
+    $this->send_deletePWDCredential($authzToken, $airavataCredStoreToken);
     return $this->recv_deletePWDCredential();
   }
 
-  public function send_deletePWDCredential(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId)
+  public function send_deletePWDCredential(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken)
   {
     $args = new \Airavata\API\Airavata_deletePWDCredential_args();
     $args->authzToken = $authzToken;
     $args->airavataCredStoreToken = $airavataCredStoreToken;
-    $args->gatewayId = $gatewayId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
@@ -21042,10 +21025,6 @@ class Airavata_getCredentialSummary_args {
    */
   public $authzToken = null;
   /**
-   * @var int
-   */
-  public $type = null;
-  /**
    * @var string
    */
   public $tokenId = null;
@@ -21059,10 +21038,6 @@ class Airavata_getCredentialSummary_args {
           'class' => '\Airavata\Model\Security\AuthzToken',
           ),
         2 => array(
-          'var' => 'type',
-          'type' => TType::I32,
-          ),
-        3 => array(
           'var' => 'tokenId',
           'type' => TType::STRING,
           ),
@@ -21072,9 +21047,6 @@ class Airavata_getCredentialSummary_args {
       if (isset($vals['authzToken'])) {
         $this->authzToken = $vals['authzToken'];
       }
-      if (isset($vals['type'])) {
-        $this->type = $vals['type'];
-      }
       if (isset($vals['tokenId'])) {
         $this->tokenId = $vals['tokenId'];
       }
@@ -21109,13 +21081,6 @@ class Airavata_getCredentialSummary_args {
           }
           break;
         case 2:
-          if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->type);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 3:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->tokenId);
           } else {
@@ -21143,13 +21108,8 @@ class Airavata_getCredentialSummary_args {
       $xfer += $this->authzToken->write($output);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->type !== null) {
-      $xfer += $output->writeFieldBegin('type', TType::I32, 2);
-      $xfer += $output->writeI32($this->type);
-      $xfer += $output->writeFieldEnd();
-    }
     if ($this->tokenId !== null) {
-      $xfer += $output->writeFieldBegin('tokenId', TType::STRING, 3);
+      $xfer += $output->writeFieldBegin('tokenId', TType::STRING, 2);
       $xfer += $output->writeString($this->tokenId);
       $xfer += $output->writeFieldEnd();
     }
@@ -21632,10 +21592,6 @@ class Airavata_deleteSSHPubKey_args {
    * @var string
    */
   public $airavataCredStoreToken = null;
-  /**
-   * @var string
-   */
-  public $gatewayId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -21649,10 +21605,6 @@ class Airavata_deleteSSHPubKey_args {
           'var' => 'airavataCredStoreToken',
           'type' => TType::STRING,
           ),
-        3 => array(
-          'var' => 'gatewayId',
-          'type' => TType::STRING,
-          ),
         );
     }
     if (is_array($vals)) {
@@ -21662,9 +21614,6 @@ class Airavata_deleteSSHPubKey_args {
       if (isset($vals['airavataCredStoreToken'])) {
         $this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
       }
-      if (isset($vals['gatewayId'])) {
-        $this->gatewayId = $vals['gatewayId'];
-      }
     }
   }
 
@@ -21702,13 +21651,6 @@ class Airavata_deleteSSHPubKey_args {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 3:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->gatewayId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -21735,11 +21677,6 @@ class Airavata_deleteSSHPubKey_args {
       $xfer += $output->writeString($this->airavataCredStoreToken);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->gatewayId !== null) {
-      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
-      $xfer += $output->writeString($this->gatewayId);
-      $xfer += $output->writeFieldEnd();
-    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -21933,10 +21870,6 @@ class Airavata_deletePWDCredential_args {
    * @var string
    */
   public $airavataCredStoreToken = null;
-  /**
-   * @var string
-   */
-  public $gatewayId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -21950,10 +21883,6 @@ class Airavata_deletePWDCredential_args {
           'var' => 'airavataCredStoreToken',
           'type' => TType::STRING,
           ),
-        3 => array(
-          'var' => 'gatewayId',
-          'type' => TType::STRING,
-          ),
         );
     }
     if (is_array($vals)) {
@@ -21963,9 +21892,6 @@ class Airavata_deletePWDCredential_args {
       if (isset($vals['airavataCredStoreToken'])) {
         $this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
       }
-      if (isset($vals['gatewayId'])) {
-        $this->gatewayId = $vals['gatewayId'];
-      }
     }
   }
 
@@ -22003,13 +21929,6 @@ class Airavata_deletePWDCredential_args {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 3:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->gatewayId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -22036,11 +21955,6 @@ class Airavata_deletePWDCredential_args {
       $xfer += $output->writeString($this->airavataCredStoreToken);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->gatewayId !== null) {
-      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
-      $xfer += $output->writeString($this->gatewayId);
-      $xfer += $output->writeFieldEnd();
-    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Credential/Store/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Credential/Store/Types.php
index da47e85..31ec3ea 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Credential/Store/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Credential/Store/Types.php
@@ -280,6 +280,9 @@ class CredentialSummary {
    */
   public $gatewayId = null;
   /**
+   * The username corresponds to the Credential's `portalUserName` which is the username of the user that
+   * created the credential.
+   * 
    * @var string
    */
   public $username = null;
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote
index 83fe696..895e181 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote
@@ -40,10 +40,10 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('   getAllNotifications(AuthzToken authzToken, string gatewayId)')
     print('  string generateAndRegisterSSHKeys(AuthzToken authzToken, string description)')
     print('  string registerPwdCredential(AuthzToken authzToken, string loginUserName, string password, string description)')
-    print('  CredentialSummary getCredentialSummary(AuthzToken authzToken, SummaryType type, string tokenId)')
+    print('  CredentialSummary getCredentialSummary(AuthzToken authzToken, string tokenId)')
     print('   getAllCredentialSummaries(AuthzToken authzToken, SummaryType type)')
-    print('  bool deleteSSHPubKey(AuthzToken authzToken, string airavataCredStoreToken, string gatewayId)')
-    print('  bool deletePWDCredential(AuthzToken authzToken, string airavataCredStoreToken, string gatewayId)')
+    print('  bool deleteSSHPubKey(AuthzToken authzToken, string airavataCredStoreToken)')
+    print('  bool deletePWDCredential(AuthzToken authzToken, string airavataCredStoreToken)')
     print('  string createProject(AuthzToken authzToken, string gatewayId, Project project)')
     print('  void updateProject(AuthzToken authzToken, string projectId, Project updatedProject)')
     print('  Project getProject(AuthzToken authzToken, string projectId)')
@@ -387,10 +387,10 @@ elif cmd == 'registerPwdCredential':
     pp.pprint(client.registerPwdCredential(eval(args[0]), args[1], args[2], args[3],))
 
 elif cmd == 'getCredentialSummary':
-    if len(args) != 3:
-        print('getCredentialSummary requires 3 args')
+    if len(args) != 2:
+        print('getCredentialSummary requires 2 args')
         sys.exit(1)
-    pp.pprint(client.getCredentialSummary(eval(args[0]), eval(args[1]), args[2],))
+    pp.pprint(client.getCredentialSummary(eval(args[0]), args[1],))
 
 elif cmd == 'getAllCredentialSummaries':
     if len(args) != 2:
@@ -399,16 +399,16 @@ elif cmd == 'getAllCredentialSummaries':
     pp.pprint(client.getAllCredentialSummaries(eval(args[0]), eval(args[1]),))
 
 elif cmd == 'deleteSSHPubKey':
-    if len(args) != 3:
-        print('deleteSSHPubKey requires 3 args')
+    if len(args) != 2:
+        print('deleteSSHPubKey requires 2 args')
         sys.exit(1)
-    pp.pprint(client.deleteSSHPubKey(eval(args[0]), args[1], args[2],))
+    pp.pprint(client.deleteSSHPubKey(eval(args[0]), args[1],))
 
 elif cmd == 'deletePWDCredential':
-    if len(args) != 3:
-        print('deletePWDCredential requires 3 args')
+    if len(args) != 2:
+        print('deletePWDCredential requires 2 args')
         sys.exit(1)
-    pp.pprint(client.deletePWDCredential(eval(args[0]), args[1], args[2],))
+    pp.pprint(client.deletePWDCredential(eval(args[0]), args[1],))
 
 elif cmd == 'createProject':
     if len(args) != 3:
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py
index 3923df7..9f7a0ba 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py
@@ -255,11 +255,10 @@ class Iface(object):
         """
         pass
 
-    def getCredentialSummary(self, authzToken, type, tokenId):
+    def getCredentialSummary(self, authzToken, tokenId):
         """
         Parameters:
          - authzToken
-         - type
          - tokenId
         """
         pass
@@ -272,32 +271,19 @@ class Iface(object):
         """
         pass
 
-    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken):
         """
-
-        Delete a Gateway
-
-        @param gatewayId
-           The gateway Id of the Gateway to be deleted.
-
-        @return boolean
-           Boolean identifier for the success or failure of the deletion operation.
-
-
-
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
         pass
 
-    def deletePWDCredential(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deletePWDCredential(self, authzToken, airavataCredStoreToken):
         """
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
         pass
 
@@ -4346,21 +4332,19 @@ class Client(Iface):
             raise result.ase
         raise TApplicationException(TApplicationException.MISSING_RESULT, "registerPwdCredential failed: unknown result")
 
-    def getCredentialSummary(self, authzToken, type, tokenId):
+    def getCredentialSummary(self, authzToken, tokenId):
         """
         Parameters:
          - authzToken
-         - type
          - tokenId
         """
-        self.send_getCredentialSummary(authzToken, type, tokenId)
+        self.send_getCredentialSummary(authzToken, tokenId)
         return self.recv_getCredentialSummary()
 
-    def send_getCredentialSummary(self, authzToken, type, tokenId):
+    def send_getCredentialSummary(self, authzToken, tokenId):
         self._oprot.writeMessageBegin('getCredentialSummary', TMessageType.CALL, self._seqid)
         args = getCredentialSummary_args()
         args.authzToken = authzToken
-        args.type = type
         args.tokenId = tokenId
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -4428,33 +4412,20 @@ class Client(Iface):
             raise result.ase
         raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllCredentialSummaries failed: unknown result")
 
-    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken):
         """
-
-        Delete a Gateway
-
-        @param gatewayId
-           The gateway Id of the Gateway to be deleted.
-
-        @return boolean
-           Boolean identifier for the success or failure of the deletion operation.
-
-
-
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
-        self.send_deleteSSHPubKey(authzToken, airavataCredStoreToken, gatewayId)
+        self.send_deleteSSHPubKey(authzToken, airavataCredStoreToken)
         return self.recv_deleteSSHPubKey()
 
-    def send_deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
+    def send_deleteSSHPubKey(self, authzToken, airavataCredStoreToken):
         self._oprot.writeMessageBegin('deleteSSHPubKey', TMessageType.CALL, self._seqid)
         args = deleteSSHPubKey_args()
         args.authzToken = authzToken
         args.airavataCredStoreToken = airavataCredStoreToken
-        args.gatewayId = gatewayId
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
         self._oprot.trans.flush()
@@ -4482,22 +4453,20 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteSSHPubKey failed: unknown result")
 
-    def deletePWDCredential(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deletePWDCredential(self, authzToken, airavataCredStoreToken):
         """
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
-        self.send_deletePWDCredential(authzToken, airavataCredStoreToken, gatewayId)
+        self.send_deletePWDCredential(authzToken, airavataCredStoreToken)
         return self.recv_deletePWDCredential()
 
-    def send_deletePWDCredential(self, authzToken, airavataCredStoreToken, gatewayId):
+    def send_deletePWDCredential(self, authzToken, airavataCredStoreToken):
         self._oprot.writeMessageBegin('deletePWDCredential', TMessageType.CALL, self._seqid)
         args = deletePWDCredential_args()
         args.authzToken = authzToken
         args.airavataCredStoreToken = airavataCredStoreToken
-        args.gatewayId = gatewayId
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
         self._oprot.trans.flush()
@@ -14149,7 +14118,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = getCredentialSummary_result()
         try:
-            result.success = self._handler.getCredentialSummary(args.authzToken, args.type, args.tokenId)
+            result.success = self._handler.getCredentialSummary(args.authzToken, args.tokenId)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -14208,7 +14177,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = deleteSSHPubKey_result()
         try:
-            result.success = self._handler.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken, args.gatewayId)
+            result.success = self._handler.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -14239,7 +14208,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = deletePWDCredential_result()
         try:
-            result.success = self._handler.deletePWDCredential(args.authzToken, args.airavataCredStoreToken, args.gatewayId)
+            result.success = self._handler.deletePWDCredential(args.authzToken, args.airavataCredStoreToken)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -22562,20 +22531,17 @@ class getCredentialSummary_args(object):
     """
     Attributes:
      - authzToken
-     - type
      - tokenId
     """
 
     thrift_spec = (
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.I32, 'type', None, None, ),  # 2
-        (3, TType.STRING, 'tokenId', 'UTF8', None, ),  # 3
+        (2, TType.STRING, 'tokenId', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, type=None, tokenId=None,):
+    def __init__(self, authzToken=None, tokenId=None,):
         self.authzToken = authzToken
-        self.type = type
         self.tokenId = tokenId
 
     def read(self, iprot):
@@ -22594,11 +22560,6 @@ class getCredentialSummary_args(object):
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
-                if ftype == TType.I32:
-                    self.type = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
                 if ftype == TType.STRING:
                     self.tokenId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
@@ -22617,12 +22578,8 @@ class getCredentialSummary_args(object):
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.type is not None:
-            oprot.writeFieldBegin('type', TType.I32, 2)
-            oprot.writeI32(self.type)
-            oprot.writeFieldEnd()
         if self.tokenId is not None:
-            oprot.writeFieldBegin('tokenId', TType.STRING, 3)
+            oprot.writeFieldBegin('tokenId', TType.STRING, 2)
             oprot.writeString(self.tokenId.encode('utf-8') if sys.version_info[0] == 2 else self.tokenId)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -22631,8 +22588,6 @@ class getCredentialSummary_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.type is None:
-            raise TProtocolException(message='Required field type is unset!')
         if self.tokenId is None:
             raise TProtocolException(message='Required field tokenId is unset!')
         return
@@ -22950,20 +22905,17 @@ class deleteSSHPubKey_args(object):
     Attributes:
      - authzToken
      - airavataCredStoreToken
-     - gatewayId
     """
 
     thrift_spec = (
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, airavataCredStoreToken=None, gatewayId=None,):
+    def __init__(self, authzToken=None, airavataCredStoreToken=None,):
         self.authzToken = authzToken
         self.airavataCredStoreToken = airavataCredStoreToken
-        self.gatewayId = gatewayId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22985,11 +22937,6 @@ class deleteSSHPubKey_args(object):
                     self.airavataCredStoreToken = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRING:
-                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -23008,10 +22955,6 @@ class deleteSSHPubKey_args(object):
             oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 2)
             oprot.writeString(self.airavataCredStoreToken.encode('utf-8') if sys.version_info[0] == 2 else self.airavataCredStoreToken)
             oprot.writeFieldEnd()
-        if self.gatewayId is not None:
-            oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
-            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -23020,8 +22963,6 @@ class deleteSSHPubKey_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.airavataCredStoreToken is None:
             raise TProtocolException(message='Required field airavataCredStoreToken is unset!')
-        if self.gatewayId is None:
-            raise TProtocolException(message='Required field gatewayId is unset!')
         return
 
     def __repr__(self):
@@ -23152,20 +23093,17 @@ class deletePWDCredential_args(object):
     Attributes:
      - authzToken
      - airavataCredStoreToken
-     - gatewayId
     """
 
     thrift_spec = (
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, airavataCredStoreToken=None, gatewayId=None,):
+    def __init__(self, authzToken=None, airavataCredStoreToken=None,):
         self.authzToken = authzToken
         self.airavataCredStoreToken = airavataCredStoreToken
-        self.gatewayId = gatewayId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23187,11 +23125,6 @@ class deletePWDCredential_args(object):
                     self.airavataCredStoreToken = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRING:
-                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -23210,10 +23143,6 @@ class deletePWDCredential_args(object):
             oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 2)
             oprot.writeString(self.airavataCredStoreToken.encode('utf-8') if sys.version_info[0] == 2 else self.airavataCredStoreToken)
             oprot.writeFieldEnd()
-        if self.gatewayId is not None:
-            oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
-            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -23222,8 +23151,6 @@ class deletePWDCredential_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.airavataCredStoreToken is None:
             raise TProtocolException(message='Required field airavataCredStoreToken is unset!')
-        if self.gatewayId is None:
-            raise TProtocolException(message='Required field gatewayId is unset!')
         return
 
     def __repr__(self):
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/credential/store/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/credential/store/ttypes.py
index e4d52ad..86e716f 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/credential/store/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/credential/store/ttypes.py
@@ -188,7 +188,8 @@ class CredentialSummary(object):
     Attributes:
      - type
      - gatewayId
-     - username
+     - username: The username corresponds to the Credential's `portalUserName` which is the username of the user that
+    created the credential.
      - publicKey
      - persistedTime
      - token
diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
index 3c166e6..9a08737 100644
--- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
+++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
@@ -33,7 +33,7 @@ public class CredentialStoreService {
      */
     public java.lang.String getCSServiceVersion() throws org.apache.thrift.TException;
 
-    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, java.lang.String gatewayId) throws org.apache.airavata.credential.store.exception.CredentialStoreException, org.apache.thrift.TException;
+    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(java.lang.String tokenId, java.lang.String gatewayId) throws org.apache.airavata.credential.store.exception.CredentialStoreException, org.apache.thrift.TException;
 
     public java.util.List<org.apache.airavata.model.credential.store.CredentialSummary> getAllCredentialSummaries(org.apache.airavata.model.credential.store.SummaryType type, java.util.List<java.lang.String> accessibleTokenIds, java.lang.String gatewayId) throws org.apache.airavata.credential.store.exception.CredentialStoreException, org.apache.thrift.TException;
 
@@ -71,7 +71,7 @@ public class CredentialStoreService {
 
     public void getCSServiceVersion(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException;
+    public void getCredentialSummary(java.lang.String tokenId, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException;
 
     public void getAllCredentialSummaries(org.apache.airavata.model.credential.store.SummaryType type, java.util.List<java.lang.String> accessibleTokenIds, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.airavata.model.credential.store.CredentialSummary>> resultHandler) throws org.apache.thrift.TException;
 
@@ -141,16 +141,15 @@ public class CredentialStoreService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getCSServiceVersion failed: unknown result");
     }
 
-    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, java.lang.String gatewayId) throws org.apache.airavata.credential.store.exception.CredentialStoreException, org.apache.thrift.TException
+    public org.apache.airavata.model.credential.store.CredentialSummary getCredentialSummary(java.lang.String tokenId, java.lang.String gatewayId) throws org.apache.airavata.credential.store.exception.CredentialStoreException, org.apache.thrift.TException
     {
-      send_getCredentialSummary(type, tokenId, gatewayId);
+      send_getCredentialSummary(tokenId, gatewayId);
       return recv_getCredentialSummary();
     }
 
-    public void send_getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, java.lang.String gatewayId) throws org.apache.thrift.TException
+    public void send_getCredentialSummary(java.lang.String tokenId, java.lang.String gatewayId) throws org.apache.thrift.TException
     {
       getCredentialSummary_args args = new getCredentialSummary_args();
-      args.setType(type);
       args.setTokenId(tokenId);
       args.setGatewayId(gatewayId);
       sendBase("getCredentialSummary", args);
@@ -538,20 +537,18 @@ public class CredentialStoreService {
       }
     }
 
-    public void getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException {
+    public void getCredentialSummary(java.lang.String tokenId, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getCredentialSummary_call method_call = new getCredentialSummary_call(type, tokenId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+      getCredentialSummary_call method_call = new getCredentialSummary_call(tokenId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getCredentialSummary_call extends org.apache.thrift.async.TAsyncMethodCall<org.apache.airavata.model.credential.store.CredentialSummary> {
-      private org.apache.airavata.model.credential.store.SummaryType type;
       private java.lang.String tokenId;
       private java.lang.String gatewayId;
-      public getCredentialSummary_call(org.apache.airavata.model.credential.store.SummaryType type, java.lang.String tokenId, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getCredentialSummary_call(java.lang.String tokenId, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
-        this.type = type;
         this.tokenId = tokenId;
         this.gatewayId = gatewayId;
       }
@@ -559,7 +556,6 @@ public class CredentialStoreService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getCredentialSummary", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getCredentialSummary_args args = new getCredentialSummary_args();
-        args.setType(type);
         args.setTokenId(tokenId);
         args.setGatewayId(gatewayId);
         args.write(prot);
@@ -1056,7 +1052,7 @@ public class CredentialStoreService {
       public getCredentialSummary_result getResult(I iface, getCredentialSummary_args args) throws org.apache.thrift.TException {
         getCredentialSummary_result result = new getCredentialSummary_result();
         try {
-          result.success = iface.getCredentialSummary(args.type, args.tokenId, args.gatewayId);
+          result.success = iface.getCredentialSummary(args.tokenId, args.gatewayId);
         } catch (org.apache.airavata.credential.store.exception.CredentialStoreException csException) {
           result.csException = csException;
         }
@@ -1506,7 +1502,7 @@ public class CredentialStoreService {
       }
 
       public void start(I iface, getCredentialSummary_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary> resultHandler) throws org.apache.thrift.TException {
-        iface.getCredentialSummary(args.type, args.tokenId, args.gatewayId,resultHandler);
+        iface.getCredentialSummary(args.tokenId, args.gatewayId,resultHandler);
       }
     }
 
@@ -2909,30 +2905,19 @@ public class CredentialStoreService {
   public static class getCredentialSummary_args implements org.apache.thrift.TBase<getCredentialSummary_args, getCredentialSummary_args._Fields>, java.io.Serializable, Cloneable, Comparable<getCredentialSummary_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getCredentialSummary_args");
 
-    private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
-    private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
+    private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getCredentialSummary_argsStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getCredentialSummary_argsTupleSchemeFactory();
 
-    /**
-     * 
-     * @see org.apache.airavata.model.credential.store.SummaryType
-     */
-    public org.apache.airavata.model.credential.store.SummaryType type; // required
     public java.lang.String tokenId; // required
     public java.lang.String gatewayId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      /**
-       * 
-       * @see org.apache.airavata.model.credential.store.SummaryType
-       */
-      TYPE((short)1, "type"),
-      TOKEN_ID((short)2, "tokenId"),
-      GATEWAY_ID((short)3, "gatewayId");
+      TOKEN_ID((short)1, "tokenId"),
+      GATEWAY_ID((short)2, "gatewayId");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -2947,11 +2932,9 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // TYPE
-            return TYPE;
-          case 2: // TOKEN_ID
+          case 1: // TOKEN_ID
             return TOKEN_ID;
-          case 3: // GATEWAY_ID
+          case 2: // GATEWAY_ID
             return GATEWAY_ID;
           default:
             return null;
@@ -2996,8 +2979,6 @@ public class CredentialStoreService {
     public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.credential.store.SummaryType.class)));
       tmpMap.put(_Fields.TOKEN_ID, new org.apache.thrift.meta_data.FieldMetaData("tokenId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -3010,12 +2991,10 @@ public class CredentialStoreService {
     }
 
     public getCredentialSummary_args(
-      org.apache.airavata.model.credential.store.SummaryType type,
       java.lang.String tokenId,
       java.lang.String gatewayId)
     {
       this();
-      this.type = type;
       this.tokenId = tokenId;
       this.gatewayId = gatewayId;
     }
@@ -3024,9 +3003,6 @@ public class CredentialStoreService {
      * Performs a deep copy on <i>other</i>.
      */
     public getCredentialSummary_args(getCredentialSummary_args other) {
-      if (other.isSetType()) {
-        this.type = other.type;
-      }
       if (other.isSetTokenId()) {
         this.tokenId = other.tokenId;
       }
@@ -3041,43 +3017,10 @@ public class CredentialStoreService {
 
     @Override
     public void clear() {
-      this.type = null;
       this.tokenId = null;
       this.gatewayId = null;
     }
 
-    /**
-     * 
-     * @see org.apache.airavata.model.credential.store.SummaryType
-     */
-    public org.apache.airavata.model.credential.store.SummaryType getType() {
-      return this.type;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.credential.store.SummaryType
-     */
-    public getCredentialSummary_args setType(org.apache.airavata.model.credential.store.SummaryType type) {
-      this.type = type;
-      return this;
-    }
-
-    public void unsetType() {
-      this.type = null;
-    }
-
-    /** Returns true if field type is set (has been assigned a value) and false otherwise */
-    public boolean isSetType() {
-      return this.type != null;
-    }
-
-    public void setTypeIsSet(boolean value) {
-      if (!value) {
-        this.type = null;
-      }
-    }
-
     public java.lang.String getTokenId() {
       return this.tokenId;
     }
@@ -3128,14 +3071,6 @@ public class CredentialStoreService {
 
     public void setFieldValue(_Fields field, java.lang.Object value) {
       switch (field) {
-      case TYPE:
-        if (value == null) {
-          unsetType();
-        } else {
-          setType((org.apache.airavata.model.credential.store.SummaryType)value);
-        }
-        break;
-
       case TOKEN_ID:
         if (value == null) {
           unsetTokenId();
@@ -3157,9 +3092,6 @@ public class CredentialStoreService {
 
     public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
-      case TYPE:
-        return getType();
-
       case TOKEN_ID:
         return getTokenId();
 
@@ -3177,8 +3109,6 @@ public class CredentialStoreService {
       }
 
       switch (field) {
-      case TYPE:
-        return isSetType();
       case TOKEN_ID:
         return isSetTokenId();
       case GATEWAY_ID:
@@ -3202,15 +3132,6 @@ public class CredentialStoreService {
       if (this == that)
         return true;
 
-      boolean this_present_type = true && this.isSetType();
-      boolean that_present_type = true && that.isSetType();
-      if (this_present_type || that_present_type) {
-        if (!(this_present_type && that_present_type))
-          return false;
-        if (!this.type.equals(that.type))
-          return false;
-      }
-
       boolean this_present_tokenId = true && this.isSetTokenId();
       boolean that_present_tokenId = true && that.isSetTokenId();
       if (this_present_tokenId || that_present_tokenId) {
@@ -3236,10 +3157,6 @@ public class CredentialStoreService {
     public int hashCode() {
       int hashCode = 1;
 
-      hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
-      if (isSetType())
-        hashCode = hashCode * 8191 + type.getValue();
-
       hashCode = hashCode * 8191 + ((isSetTokenId()) ? 131071 : 524287);
       if (isSetTokenId())
         hashCode = hashCode * 8191 + tokenId.hashCode();
@@ -3259,16 +3176,6 @@ public class CredentialStoreService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetTokenId()).compareTo(other.isSetTokenId());
       if (lastComparison != 0) {
         return lastComparison;
@@ -3309,14 +3216,6 @@ public class CredentialStoreService {
       java.lang.StringBuilder sb = new java.lang.StringBuilder("getCredentialSummary_args(");
       boolean first = true;
 
-      sb.append("type:");
-      if (this.type == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.type);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("tokenId:");
       if (this.tokenId == null) {
         sb.append("null");
@@ -3338,9 +3237,6 @@ public class CredentialStoreService {
 
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      if (type == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' was not present! Struct: " + toString());
-      }
       if (tokenId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'tokenId' was not present! Struct: " + toString());
       }
@@ -3384,15 +3280,7 @@ public class CredentialStoreService {
             break;
           }
           switch (schemeField.id) {
-            case 1: // TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.type = org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
-                struct.setTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // TOKEN_ID
+            case 1: // TOKEN_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.tokenId = iprot.readString();
                 struct.setTokenIdIsSet(true);
@@ -3400,7 +3288,7 @@ public class CredentialStoreService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // GATEWAY_ID
+            case 2: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.gatewayId = iprot.readString();
                 struct.setGatewayIdIsSet(true);
@@ -3423,11 +3311,6 @@ public class CredentialStoreService {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.type != null) {
-          oprot.writeFieldBegin(TYPE_FIELD_DESC);
-          oprot.writeI32(struct.type.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.tokenId != null) {
           oprot.writeFieldBegin(TOKEN_ID_FIELD_DESC);
           oprot.writeString(struct.tokenId);
@@ -3455,7 +3338,6 @@ public class CredentialStoreService {
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getCredentialSummary_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        oprot.writeI32(struct.type.getValue());
         oprot.writeString(struct.tokenId);
         oprot.writeString(struct.gatewayId);
       }
@@ -3463,8 +3345,6 @@ public class CredentialStoreService {
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getCredentialSummary_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-        struct.type = org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
         struct.tokenId = iprot.readString();
         struct.setTokenIdIsSet(true);
         struct.gatewayId = iprot.readString();