forked from syndesisio/syndesis-rest
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Integrated the global settings for oauth apps issues syndesisio#424 and
syndesisio/syndesis-ui#556. When a user updates the oauth id/secret for a connection in the settings page, the oauth credentials registry now gets updated.
- Loading branch information
Showing
9 changed files
with
315 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
rest/src/main/java/io/syndesis/rest/v1/handler/setup/OAuthAppToCredentialsBridge.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /** | ||
| * Copyright (C) 2016 Red Hat, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.syndesis.rest.v1.handler.setup; | ||
|
|
||
| import io.syndesis.core.EventBus; | ||
| import io.syndesis.core.Json; | ||
| import io.syndesis.credential.CredentialProviderLocator; | ||
| import io.syndesis.credential.salesforce.SalesforceConfiguration; | ||
| import io.syndesis.credential.salesforce.SalesforceProperties; | ||
| import io.syndesis.credential.twitter.TwitterConfiguration; | ||
| import io.syndesis.model.ChangeEvent; | ||
| import io.syndesis.model.Kind; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.boot.autoconfigure.social.TwitterProperties; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import javax.annotation.PostConstruct; | ||
| import javax.annotation.PreDestroy; | ||
| import javax.persistence.EntityNotFoundException; | ||
| import java.io.IOException; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Executors; | ||
|
|
||
| /** | ||
| * This component handles initializing and updating the CredentialProviderLocator | ||
| * from the DB state. | ||
| */ | ||
| @Component | ||
| public class OAuthAppToCredentialsBridge { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(OAuthAppToCredentialsBridge.class); | ||
|
|
||
| private final OAuthAppHandler oAuthAppHandler; | ||
| private final CredentialProviderLocator locator; | ||
| private final Optional<EventBus> bus; | ||
| private ExecutorService executor; | ||
|
|
||
| public OAuthAppToCredentialsBridge(OAuthAppHandler oAuthAppHandler, CredentialProviderLocator locator, Optional<EventBus> bus) { | ||
| this.oAuthAppHandler = oAuthAppHandler; | ||
| this.locator = locator; | ||
| this.bus = bus; | ||
| } | ||
|
|
||
| @PostConstruct | ||
| public void init() { | ||
|
|
||
| if( bus.isPresent() ) { | ||
| executor = Executors.newSingleThreadExecutor(); | ||
| bus.get().subscribe(getClass().getName(), getChangeEventSubscription()); | ||
| } | ||
|
|
||
| // lets look at the app configs stored in the DB... | ||
| for (OAuthAppHandler.OAuthApp app : oAuthAppHandler.get()) { | ||
| registerCredentialProvider(app); | ||
| } | ||
| } | ||
|
|
||
| @PreDestroy | ||
| public void shutdown() { | ||
| if( bus.isPresent() ) { | ||
| bus.get().unsubscribe(getClass().getName()); | ||
| executor.shutdown(); | ||
| } | ||
| } | ||
|
|
||
| private EventBus.Subscription getChangeEventSubscription() { | ||
| return (event, data) -> { | ||
| // Never do anything that could block in this callback! | ||
| if (event!=null && "change-event".equals(event)) { | ||
| try { | ||
| ChangeEvent changeEvent = Json.mapper().readValue(data, ChangeEvent.class); | ||
| if (changeEvent != null) { | ||
| changeEvent.getId().ifPresent(id -> { | ||
| changeEvent.getKind() | ||
| .map(Kind::from) | ||
| .filter(k -> k == Kind.Connector) | ||
| .ifPresent(k -> { | ||
| executor.execute(() -> onConnectorUpdated(id)); | ||
| }); | ||
| }); | ||
| } | ||
| } catch (IOException e) { | ||
| LOG.error("Error while processing change-event " + data, e); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private void onConnectorUpdated(String connectorId) { | ||
| OAuthAppHandler.OAuthApp oAuthApp = null; | ||
| try { | ||
| oAuthApp = oAuthAppHandler.get(connectorId); | ||
| } catch (EntityNotFoundException e) { | ||
| // Not all connectors will be oauth apps.. | ||
| return; | ||
| } | ||
| registerCredentialProvider(oAuthApp); | ||
| } | ||
|
|
||
| public void registerCredentialProvider(OAuthAppHandler.OAuthApp app) { | ||
| // is the app configured? | ||
| if( isSet(app.clientId) && isSet(app.clientSecret) ) { | ||
| if( "twitter".equals(app.id) ) { | ||
| TwitterProperties props = new TwitterProperties(); | ||
| props.setAppId(app.clientId); | ||
| props.setAppSecret(app.clientSecret); | ||
| locator.addCredentialProvider(TwitterConfiguration.create(props)); | ||
| } | ||
| if( "twitter".equals(app.id) ) { | ||
| SalesforceProperties props = new SalesforceProperties(); | ||
| props.setAppId(app.clientId); | ||
| props.setAppSecret(app.clientSecret); | ||
| locator.addCredentialProvider(SalesforceConfiguration.create(props)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static boolean isSet(String value) { | ||
| return value!=null && !value.isEmpty(); | ||
| } | ||
| } |
Oops, something went wrong.