Skip to content

Commit 0e4f98e

Browse files
committed
fix: example server token services will now use regional watson service urls if those were set
1 parent 347e17f commit 0e4f98e

File tree

1 file changed

+18
-26
lines changed

1 file changed

+18
-26
lines changed

examples/server.js

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,21 @@ var sttAuthService = new AuthorizationV1(
8989
{
9090
username: process.env.SPEECH_TO_TEXT_USERNAME, // or hard-code credentials here
9191
password: process.env.SPEECH_TO_TEXT_PASSWORD,
92-
iam_apikey: process.env.SPEECH_TO_TEXT_IAM_APIKEY // if using an RC service
92+
iam_apikey: process.env.SPEECH_TO_TEXT_IAM_APIKEY, // if using an RC service
93+
url: process.env.SPEECH_TO_TEXT_URL ? process.env.SPEECH_TO_TEXT_URL : SpeechToTextV1.URL
9394
},
9495
vcapServices.getCredentials('speech_to_text') // pulls credentials from environment in bluemix, otherwise returns {}
9596
)
9697
);
9798
app.use('/api/speech-to-text/token', function(req, res) {
98-
sttAuthService.getToken(
99-
{
100-
url: SpeechToTextV1.URL
101-
},
102-
function(err, token) {
103-
if (err) {
104-
console.log('Error retrieving token: ', err);
105-
res.status(500).send('Error retrieving token');
106-
return;
107-
}
108-
res.send(token);
99+
sttAuthService.getToken({}, function(err, token) {
100+
if (err) {
101+
console.log('Error retrieving token: ', err);
102+
res.status(500).send('Error retrieving token');
103+
return;
109104
}
110-
);
105+
res.send(token);
106+
});
111107
});
112108

113109
// text to speech token endpoint
@@ -116,25 +112,21 @@ var ttsAuthService = new AuthorizationV1(
116112
{
117113
username: process.env.TEXT_TO_SPEECH_USERNAME, // or hard-code credentials here
118114
password: process.env.TEXT_TO_SPEECH_PASSWORD,
119-
iam_apikey: process.env.TEXT_TO_SPEECH_IAM_APIKEY // if using an RC service
115+
iam_apikey: process.env.TEXT_TO_SPEECH_IAM_APIKEY, // if using an RC service
116+
url: process.env.TEXT_TO_SPEECH_URL ? process.env.TEXT_TO_SPEECH_URL : TextToSpeechV1.URL
120117
},
121118
vcapServices.getCredentials('text_to_speech') // pulls credentials from environment in bluemix, otherwise returns {}
122119
)
123120
);
124121
app.use('/api/text-to-speech/token', function(req, res) {
125-
ttsAuthService.getToken(
126-
{
127-
url: TextToSpeechV1.URL
128-
},
129-
function(err, token) {
130-
if (err) {
131-
console.log('Error retrieving token: ', err);
132-
res.status(500).send('Error retrieving token');
133-
return;
134-
}
135-
res.send(token);
122+
ttsAuthService.getToken({}, function(err, token) {
123+
if (err) {
124+
console.log('Error retrieving token: ', err);
125+
res.status(500).send('Error retrieving token');
126+
return;
136127
}
137-
);
128+
res.send(token);
129+
});
138130
});
139131

140132
const port = process.env.PORT || process.env.VCAP_APP_PORT || 3000;

0 commit comments

Comments
 (0)