fix elevenlabs voice and language

jambonz · Oct 13, 2023 · 60949da · 60949da
1 parent 2e9cae8
commit 60949da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/models/speech-credential.js b/lib/models/speech-credential.js
@@ -23,9 +23,10 @@ class SpeechCredential extends Model {
   static async getSpeechCredentialsByVendorAndLabel(service_provider_sid, account_sid, vendor, label) {
     let sql;
     if (account_sid) {
-      sql = 'SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ? AND label = ?';
+      sql = `SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ? ${label ? 'AND label = ?' : ''}`;
     } else {
-      sql = 'SELECT * FROM speech_credentials WHERE service_provider_sid = ? AND vendor = ? AND label = ?';
+      sql = `SELECT * FROM speech_credentials WHERE service_provider_sid = ? AND vendor = ?
+        ${label ? 'AND label = ?' : ''}`;
     }
     const [rows] = await promisePool.query(sql, [account_sid ? account_sid : service_provider_sid, vendor, label]);
     return rows;

diff --git a/lib/routes/api/speech-credentials.js b/lib/routes/api/speech-credentials.js
@@ -799,7 +799,8 @@ router.post('/languages', async(req, res) => {
 const getTtsVoices = async(vendor, label, service_provider_sid, account_sid) => {
   const credentials = await SpeechCredential.getSpeechCredentialsByVendorAndLabel(
     service_provider_sid, account_sid, vendor, label);
-  const cred = credentials && credentials.length > 0 ? credentials[0] : null;
+  const tmp = credentials && credentials.length > 0 ? credentials[0] : null;
+  const cred = tmp ? JSON.parse(decrypt(tmp.credential)) : null;
   if (vendor === 'elevenlabs') {
     const get = bent('https://api.elevenlabs.io', 'GET', 'json', {
       ...(cred && {
@@ -821,7 +822,8 @@ const getTtsVoices = async(vendor, label, service_provider_sid, account_sid) =>
 const getTtsLanguages = async(vendor, label, service_provider_sid, account_sid) => {
   const credentials = await SpeechCredential.getSpeechCredentialsByVendorAndLabel(
     service_provider_sid, account_sid, vendor, label);
-  const cred = credentials && credentials.length > 0 ? credentials[0] : null;
+  const tmp = credentials && credentials.length > 0 ? credentials[0] : null;
+  const cred = tmp ? JSON.parse(decrypt(tmp.credential)) : null;
   if (vendor === 'elevenlabs') {
     if (!cred) {
       return [];