Skip to content

Skip token creation if no authentication is present. closes #440 #444

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

Merged
germanattanasio merged 1 commit into from
Sep 16, 2016
+26 −19
Merged

Skip token creation if no authentication is present. closes #440 #444

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public abstract class WatsonService {
private String endPoint;
private final String name;
protected Headers defaultHeaders = null;
private boolean skipAuthentication = false;
protected boolean skipAuthentication = false;

/** The Constant MESSAGE_CODE. */
protected static final String MESSAGE_CODE = "code";
Expand Down
36 changes: 20 additions & 16 deletions src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,21 +346,25 @@ public void recognizeUsingWebSocket(final InputStream audio, final RecognizeOpti
Validator.notNull(options, "options cannot be null");
Validator.notNull(options.contentType(), "options.contentType cannot be null");
Validator.notNull(callback, "callback cannot be null");


getToken().enqueue(new ServiceCallback<String>() {
@Override
public void onFailure(Exception e) {
callback.onError(e);
}

@Override
public void onResponse(String token) {
String url = getEndPoint().replaceFirst("(https|http)", "wss");
WebSocketManager wsManager = new WebSocketManager(url + PATH_RECOGNIZE, configureHttpClient(), defaultHeaders, token);
wsManager.recognize(audio, options, callback);
}
});


final String url = getEndPoint().replaceFirst("(https|http)", "wss");

if (skipAuthentication) {
WebSocketManager wsManager = new WebSocketManager(url + PATH_RECOGNIZE, configureHttpClient(), defaultHeaders, null);
wsManager.recognize(audio, options, callback);
} else {
getToken().enqueue(new ServiceCallback<String>() {
@Override
public void onFailure(Exception e) {
callback.onError(e);
}

@Override
public void onResponse(String token) {
WebSocketManager wsManager = new WebSocketManager(url + PATH_RECOGNIZE, configureHttpClient(), defaultHeaders, token);
wsManager.recognize(audio, options, callback);
}
});
}
}
}
7 changes: 5 additions & 2 deletions ...ain/java/com/ibm/watson/developer_cloud/speech_to_text/v1/websocket/WebSocketManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,12 @@ public WebSocketManager(String url, OkHttpClient client, Headers defaultHeaders,
private WebSocketCall createConnection(RecognizeOptions options) {
String speechModel = options.model() == null ? "" : "?model=" + options.model();
Builder builder = new Request.Builder()
.url(url + speechModel)
.addHeader(HttpHeaders.X_WATSON_AUTHORIZATION_TOKEN, token);
.url(url + speechModel);

if (token != null) {
builder.addHeader(HttpHeaders.X_WATSON_AUTHORIZATION_TOKEN, token);
}

if (defaultHeaders != null) {
for (String key : defaultHeaders.names()) {
builder.header(key, defaultHeaders.get(key));
Expand Down