-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
...ly-machine-war/src/main/java/org/eclipse/che/ide/ext/java/server/EventBusURLProvider.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,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; | ||
} | ||
} |
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
28 changes: 28 additions & 0 deletions
28
...mbly-machine-war/src/main/java/org/eclipse/che/ide/ext/java/server/UserTokenProvider.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,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)); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what for?