Skip to content

Fix issue with updating of external credentials #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthewboss-axway wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix issue with updating of external credentials #570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/apim-adapter/src/main/java/com/axway/apim/adapter/client/apps/APIMgrAppsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,10 @@ private void saveCredentials(ClientApplication app, ClientApplication actualApp)
if (opt.isPresent()) {
LOG.info("Found extclients credential with same ID");
//I found a credential with same id name but different in some properties, I have to update it
endpoint.append("/" + cred.getId());
ClientAppCredential target = opt.get();
endpoint.append("/" + target.getId());
update = true;
copyClientAppCredential(cred, opt.get(), false);
copyClientAppCredential(cred, target, false);
}
} else if (cred instanceof APIKey) {
final String credentialId = ((APIKey) cred).getApiKey();
Expand Down Expand Up @@ -504,15 +505,14 @@ protected Optional<ClientAppCredential> searchForExistingCredential(ClientApplic
if (o instanceof OAuth)
return ((OAuth) o).getClientId().equals(credentialId);
if (o instanceof ExtClients)
return o.getId().equals(credentialId);
return ((ExtClients) o).getClientId().equals(credentialId);
if (o instanceof APIKey)
return o.getId().equals(credentialId);
return false;
}).findFirst();
} else {
return Optional.empty();
}

}

public RestAPICall createUpsertUri(HttpEntity entity, URI uri, ClientApplication actualApp) {
Expand Down