Skip to content
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.

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

IDEX-3512: Add provider and binding for user token on machine #95

Merged
merged 1 commit into from
Nov 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*******************************************************************************
* Copyright (c) 2012-2015 Codenvy, S.A.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Codenvy, S.A. - initial API and implementation
*******************************************************************************/
package org.eclipse.che.ide.ext.java.server;

import javax.inject.Inject;
import javax.inject.Named;
import java.util.regex.Pattern;

/**
* Provides value of web socket url to set up event bus between machine and api.
*
* @author Anton Korneta
*/
public class EventBusURLProvider extends ApiEndpointProvider {
/** changes url protocol to web socket e.g https: to ws: */
private static final Pattern URL_PROTOCOL_PATTERN = Pattern.compile("([A-Za-z]{3,9}:)");

@Inject
@Named("user.token")
String token;

@Override
public String get() {
return URL_PROTOCOL_PATTERN.matcher(super.get()).replaceFirst("ws:") + "/eventbus/?token=" + token;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.google.inject.name.Names;

import org.eclipse.che.api.auth.oauth.OAuthTokenProvider;
import org.eclipse.che.api.core.notification.WSocketEventBusClient;
import org.eclipse.che.api.core.rest.ApiInfoService;
import org.eclipse.che.api.core.rest.CoreRestModule;
import org.eclipse.che.api.git.GitConnectionFactory;
Expand All @@ -26,6 +27,7 @@
import org.eclipse.che.api.user.server.dao.UserDao;
import org.eclipse.che.api.vfs.server.VirtualFileSystemModule;
import org.eclipse.che.api.vfs.server.VirtualFileSystemRegistry;
import org.eclipse.che.commons.lang.Pair;
import org.eclipse.che.everrest.CodenvyAsynchronousJobPool;
import org.eclipse.che.generator.archetype.ArchetypeGenerator;
import org.eclipse.che.generator.archetype.ArchetypeGeneratorModule;
Expand Down Expand Up @@ -88,6 +90,26 @@ protected void configure() {
bind(ServiceBindingHelper.bindingKey(AsynchronousJobService.class, "/async/{ws-id}")).to(AsynchronousJobService.class);

bind(String.class).annotatedWith(Names.named("api.endpoint")).toProvider(ApiEndpointProvider.class);
bind(String.class).annotatedWith(Names.named("user.token")).toProvider(UserTokenProvider.class);
bind(WSocketEventBusClient.class).asEagerSingleton();

bind(String.class).annotatedWith(Names.named("event.bus.url")).toProvider(EventBusURLProvider.class);
}

//it's need for WSocketEventBusClient and in the future will be replaced with the property
@Named("notification.client.event_subscriptions")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what for?

@Provides
@SuppressWarnings("unchecked")
Pair<String, String>[] eventSubscriptionsProvider(@Named("event.bus.url") String eventBusURL) {
return new Pair[] {Pair.of(eventBusURL, "")};
}

//it's need for EventOriginClientPropagationPolicy and in the future will be replaced with the property
@Named("notification.client.propagate_events")
@Provides
@SuppressWarnings("unchecked")
Pair<String, String>[] propagateEventsProvider(@Named("event.bus.url") String eventBusURL) {
return new Pair[] {Pair.of(eventBusURL, "")};
}

@Provides
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*******************************************************************************
* Copyright (c) 2012-2015 Codenvy, S.A.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Codenvy, S.A. - initial API and implementation
*******************************************************************************/
package org.eclipse.che.ide.ext.java.server;

import com.google.inject.Provider;

import static com.google.common.base.Strings.nullToEmpty;

/**
* @author Anton Korneta
*/
public class UserTokenProvider implements Provider<String> {

public static final String USER_TOKEN = "USER_TOKEN";

@Override
public String get() {
return nullToEmpty(System.getenv(USER_TOKEN));
}
}