Feat: password settings for account (#65 )

* feat: password settings for account * feat: password settings for account * fix: review comments * fix: review comments * fix: review comments * return empty json * fix: after review
add password_settings table
2026-01-25 02:08:24 +00:00 · 2022-10-04 09:13:57 +01:00 · 2022-09-30 09:56:19 +01:00 · 2022-09-28 00:39:28 +01:00 · 2022-09-27 11:00:17 +01:00
13 changed files with 2087 additions and 2664 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 # Logs
 logs
 *.log
-run-tests.sh

 # Runtime data
 pids
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.12.1-alpine3.16 as base
+FROM --platform=linux/amd64 node:18.8.0-alpine as base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

--- a/Dockerfile.db-create
+++ b/Dockerfile.db-create
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.9.0-alpine3.16 as base
+FROM --platform=linux/amd64 node:18.8.0-alpine as base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

--- a/db/jambones-sql.sql
+++ b/db/jambones-sql.sql
@@ -79,7 +79,7 @@ CREATE TABLE account_limits
 (
 account_limits_sid CHAR(36) NOT NULL UNIQUE ,
 account_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
+category ENUM('api_rate','voice_call_session', 'device') NOT NULL,
 quantity INTEGER NOT NULL,
 PRIMARY KEY (account_limits_sid)
 );
@@ -254,7 +254,7 @@ CREATE TABLE service_provider_limits
 (
 service_provider_limits_sid CHAR(36) NOT NULL UNIQUE ,
 service_provider_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
+category ENUM('api_rate','voice_call_session', 'device') NOT NULL,
 quantity INTEGER NOT NULL,
 PRIMARY KEY (service_provider_limits_sid)
 );
@@ -342,9 +342,6 @@ smpp_password VARCHAR(64),
 smpp_enquire_link_interval INTEGER DEFAULT 0,
 smpp_inbound_system_id VARCHAR(255),
 smpp_inbound_password VARCHAR(64),
-register_from_user VARCHAR(128),
-register_from_domain VARCHAR(255),
-register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

--- a/db/jambones.sqs
+++ b/db/jambones.sqs
@@ -87,7 +87,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[49E56AF4-4E40-49B6-BA88-4E378F1E6C18]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[7]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[6]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[0507BD46-ACAC-48A3-841E-4DEC2FEDCB72]]></uid>
    </SQLTable>
@@ -148,7 +148,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[6E651E52-F91E-4086-9A1E-FB3425476B2F]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[17]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[16]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[0A95311F-47FA-429F-BAF9-1442C6EE0C0E]]></uid>
    </SQLTable>
@@ -225,7 +225,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[D1019218-F1FC-4BC5-A890-F8DBB7153375]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[10]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[9]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[0AC2FD20-B22F-48DB-8611-801CEF6BFA12]]></uid>
    </SQLTable>
@@ -279,7 +279,7 @@
            <uid><![CDATA[755D10B0-F60D-4250-8971-C8E4FDB0E0CD]]></uid>
            <unique><![CDATA[1]]></unique>
        </SQLField>
-        <labelWindowIndex><![CDATA[14]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[13]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[16B9E383-E044-4D71-AB46-FEB86A46A298]]></uid>
    </SQLTable>
@@ -316,8 +316,6 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[C4EEBFF0-C3CB-4897-8720-12D14DBA93A5]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[1]]></labelWindowIndex>
-        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[1A80FB9B-419E-483A-86FF-B44A00A44D7F]]></uid>
    </SQLTable>
    <SQLTable>
@@ -328,7 +326,7 @@
            <y>16.00</y>
        </location>
        <size>
-            <width>316.00</width>
+            <width>259.00</width>
            <height>380.00</height>
        </size>
        <zorder>11</zorder>
@@ -470,7 +468,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[601FA05B-78A5-4E7E-9983-39BB0E6D18EB]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[21]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[20]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[2A735FAB-592C-42E5-9C8B-06B109314799]]></uid>
    </SQLTable>
@@ -536,7 +534,7 @@
            <indexed><![CDATA[1]]></indexed>
            <uid><![CDATA[365FB018-429D-4DA4-AC33-D9D106EA97E5]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[6]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[5]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[311D99B2-DC8B-4C4A-A1FC-4AFAA1F450F3]]></uid>
    </SQLTable>
@@ -545,12 +543,12 @@
        <schema><![CDATA[]]></schema>
        <comment><![CDATA[A Carrier or customer PBX that can send or receive calls]]></comment>
        <location>
-            <x>20.00</x>
-            <y>287.00</y>
+            <x>24.00</x>
+            <y>317.00</y>
        </location>
        <size>
-            <width>293.00</width>
-            <height>520.00</height>
+            <width>267.00</width>
+            <height>460.00</height>
        </size>
        <zorder>6</zorder>
        <SQLField>
@@ -714,24 +712,7 @@
            <type><![CDATA[VARCHAR(64)]]></type>
            <uid><![CDATA[630DAD4B-E60E-43AE-9822-41C1EED748AA]]></uid>
        </SQLField>
-        <SQLField>
-            <name><![CDATA[register_from_user]]></name>
-            <type><![CDATA[VARCHAR(128)]]></type>
-            <uid><![CDATA[8DC203AE-E70B-4431-9204-CA55F17B9E1B]]></uid>
-        </SQLField>
-        <SQLField>
-            <name><![CDATA[register_from_domain]]></name>
-            <type><![CDATA[VARCHAR(255)]]></type>
-            <uid><![CDATA[82EA1953-92A3-4BD2-A340-B469466BCB5A]]></uid>
-        </SQLField>
-        <SQLField>
-            <name><![CDATA[register_public_ip_in_contact]]></name>
-            <type><![CDATA[BOOLEAN]]></type>
-            <defaultValue><![CDATA[false]]></defaultValue>
-            <notNull><![CDATA[1]]></notNull>
-            <uid><![CDATA[E93A67DB-9A49-4980-9B25-CF1E7DC42F9B]]></uid>
-        </SQLField>
-        <labelWindowIndex><![CDATA[22]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[21]]></labelWindowIndex>
        <objectComment><![CDATA[A Carrier or customer PBX that can send or receive calls]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[3D3136A7-AFC0-4A70-AEC3-68577955CA2E]]></uid>
@@ -813,7 +794,7 @@
            <defaultValue><![CDATA[CURRENT_TIMESTAMP]]></defaultValue>
            <uid><![CDATA[C84C9B6A-80B5-4B0B-8C14-EB02F7421BBE]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[31]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[30]]></labelWindowIndex>
        <objectComment><![CDATA[An authorization token that is used to access the REST api]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[3EDF89A0-FD38-4DF9-BB65-E0FCD0A678BE]]></uid>
@@ -826,7 +807,7 @@
            <y>325.00</y>
        </location>
        <size>
-            <width>770.00</width>
+            <width>352.00</width>
            <height>100.00</height>
        </size>
        <zorder>30</zorder>
@@ -856,7 +837,7 @@
        </SQLField>
        <SQLField>
            <name><![CDATA[category]]></name>
-            <type><![CDATA[ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license')]]></type>
+            <type><![CDATA[ENUM('api_rate','voice_call_session', 'device')]]></type>
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[9724C27F-3B51-453A-99B8-313480D4A63A]]></uid>
        </SQLField>
@@ -866,7 +847,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[EA4C1A7E-68ED-41D5-9EE9-345DD61F00C7]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[3]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[2]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[4893A0F0-BE1B-4322-9034-644528E802DE]]></uid>
    </SQLTable>
@@ -993,7 +974,7 @@
            <indexType><![CDATA[UNIQUE]]></indexType>
            <uid><![CDATA[554ABEC2-3E1B-41B1-BF07-25F403D5E3B4]]></uid>
        </SQLIndex>
-        <labelWindowIndex><![CDATA[16]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[15]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[49A68E1C-DEE2-446C-A4EB-9850E16155CC]]></uid>
    </SQLTable>
@@ -1014,7 +995,7 @@
            <type><![CDATA[VARCHAR(16)]]></type>
            <uid><![CDATA[1EA572BD-FF6B-43CC-9EBB-33A735781429]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[4]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[3]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[518AC592-D3E6-4032-8A33-15A3DB72B060]]></uid>
    </SQLTable>
@@ -1075,7 +1056,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[6B2F726C-48A6-49D9-B7B1-8850DD6FB3EC]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[9]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[8]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[51A02EFE-AA51-46EF-8671-E8B2F1FC5F8D]]></uid>
    </SQLTable>
@@ -1087,7 +1068,7 @@
            <y>205.00</y>
        </location>
        <size>
-            <width>770.00</width>
+            <width>352.00</width>
            <height>100.00</height>
        </size>
        <zorder>29</zorder>
@@ -1117,7 +1098,7 @@
        </SQLField>
        <SQLField>
            <name><![CDATA[category]]></name>
-            <type><![CDATA[ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license')]]></type>
+            <type><![CDATA[ENUM('api_rate','voice_call_session', 'device')]]></type>
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[72BFA408-371D-4B21-8DA0-A56644FCD92C]]></uid>
        </SQLField>
@@ -1127,7 +1108,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[2EA3A57F-7EF7-4958-B06B-62B0279BB87E]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[2]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[1]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[5784AC2F-BEBC-466F-9818-F9A7D227A5B5]]></uid>
    </SQLTable>
@@ -1177,7 +1158,7 @@
            <type><![CDATA[VARCHAR(255)]]></type>
            <uid><![CDATA[04BB457A-D532-4780-8A58-5900094171EC]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[23]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[22]]></labelWindowIndex>
        <objectComment><![CDATA[An HTTP callback]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[64D64CB9-0990-4C68-BE71-F9FD43C2BE19]]></uid>
@@ -1277,7 +1258,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[9A75A20B-1EFD-4E16-994A-5376C650EAB5]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[5]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[4]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[6511AF7D-91FD-40C7-9F73-B8E9E66DC249]]></uid>
    </SQLTable>
@@ -1286,8 +1267,8 @@
        <schema><![CDATA[]]></schema>
        <comment><![CDATA[a regex-based pattern match for call routing]]></comment>
        <location>
-            <x>44.00</x>
-            <y>821.00</y>
+            <x>36.00</x>
+            <y>791.00</y>
        </location>
        <size>
            <width>254.00</width>
@@ -1346,7 +1327,7 @@
            <uid><![CDATA[9B4208B5-9E3B-4B76-B7F7-4E5D36B99BF2]]></uid>
            <unsigned><![CDATA[0]]></unsigned>
        </SQLField>
-        <labelWindowIndex><![CDATA[30]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[29]]></labelWindowIndex>
        <objectComment><![CDATA[a regex-based pattern match for call routing]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[78584D93-2CD7-4495-9C5E-893C7B869133]]></uid>
@@ -1383,7 +1364,7 @@
            <noQuoteDefault><![CDATA[1]]></noQuoteDefault>
            <uid><![CDATA[4D2F7B02-F183-4239-8CE8-3E98206708AE]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[8]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[7]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[86FAB0AB-DC68-4ADF-8A08-BBAF61BA1840]]></uid>
    </SQLTable>
@@ -1492,7 +1473,7 @@
            <uid><![CDATA[1DDAD1A1-942D-4487-89C8-D496B7F82274]]></uid>
            <unique><![CDATA[1]]></unique>
        </SQLField>
-        <labelWindowIndex><![CDATA[20]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[19]]></labelWindowIndex>
        <objectComment><![CDATA[A Microsoft Teams customer tenant]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[92FD042A-5AEC-4D8F-AB94-C73C0F566F75]]></uid>
@@ -1562,7 +1543,7 @@
            <objectComment><![CDATA[lower priority carriers are attempted first]]></objectComment>
            <uid><![CDATA[01F61C68-799B-49B0-9E6A-0E2162EE5A54]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[26]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[25]]></labelWindowIndex>
        <objectComment><![CDATA[An entry in the LCR routing list]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[956025F5-0798-47F7-B76C-457814C7B52E]]></uid>
@@ -1755,7 +1736,7 @@
            <referencesTableUID><![CDATA[E97EE4F0-7ED7-4E8C-862E-D98192D6EAE0]]></referencesTableUID>
            <uid><![CDATA[4B8283B4-5E16-4846-A79D-12C6B2E73C86]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[28]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[27]]></labelWindowIndex>
        <objectComment><![CDATA[An enterprise that uses the platform for comm services]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[985D6997-B1A7-4AB3-80F4-4D59B45480C8]]></uid>
@@ -1794,7 +1775,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[D0BF7D36-E40C-4385-9BA5-2099B49A1042]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[15]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[14]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[A8ED2178-3CC4-4174-A8FC-C2B58FD28214]]></uid>
    </SQLTable>
@@ -1886,7 +1867,7 @@
            <type><![CDATA[VARCHAR(32)]]></type>
            <uid><![CDATA[CE2015BC-8538-4FB0-B4D9-454436FAB1D9]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[11]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[10]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[AF34726D-EDFD-414E-9B44-5243DA9D9497]]></uid>
    </SQLTable>
@@ -1937,7 +1918,7 @@
            <notNull><![CDATA[1]]></notNull>
            <uid><![CDATA[73092A7A-9F3F-4C49-8478-39CE5DAF5ADD]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[13]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[12]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[B10C0DE3-03CD-4C5A-B1FB-F9F81ED14A40]]></uid>
    </SQLTable>
@@ -1946,8 +1927,8 @@
        <schema><![CDATA[]]></schema>
        <comment><![CDATA[A phone number that has been assigned to an account]]></comment>
        <location>
-            <x>29.00</x>
-            <y>954.00</y>
+            <x>33.00</x>
+            <y>924.00</y>
        </location>
        <size>
            <width>331.00</width>
@@ -2033,7 +2014,7 @@
            <objectComment><![CDATA[if not null, this number is a test number for the associated service provider]]></objectComment>
            <uid><![CDATA[D2D46B75-F9C7-42A5-8D8C-4A8412C75ECA]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[29]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[28]]></labelWindowIndex>
        <objectComment><![CDATA[A phone number that has been assigned to an account]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[BA650DDC-AC7B-4DFE-A5E5-828C75607807]]></uid>
@@ -2133,7 +2114,7 @@
            <indexNamePrefix><![CDATA[sip_gateway]]></indexNamePrefix>
            <uid><![CDATA[1C744DE3-39BD-4EC6-B427-7EB2DD258771]]></uid>
        </SQLIndex>
-        <labelWindowIndex><![CDATA[25]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[24]]></labelWindowIndex>
        <objectComment><![CDATA[A whitelisted sip gateway used for origination/termination]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[D8A564E2-DA41-4217-8ACE-06CF77E9BEC1]]></uid>
@@ -2302,7 +2283,7 @@
            <indexType><![CDATA[UNIQUE]]></indexType>
            <uid><![CDATA[3FDDDF3B-375D-4DE4-B759-514438845F7D]]></uid>
        </SQLIndex>
-        <labelWindowIndex><![CDATA[27]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[26]]></labelWindowIndex>
        <objectComment><![CDATA[A defined set of behaviors to be applied to phone calls ]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[E97EE4F0-7ED7-4E8C-862E-D98192D6EAE0]]></uid>
@@ -2410,7 +2391,7 @@
            <type><![CDATA[VARBINARY(52)]]></type>
            <uid><![CDATA[B4793720-635C-4E25-A306-62E7416541C4]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[12]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[11]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[EB4BC5F9-CC10-4C8C-AB31-6D942256AEFB]]></uid>
    </SQLTable>
@@ -2480,7 +2461,7 @@
            <indexed><![CDATA[1]]></indexed>
            <uid><![CDATA[6F249D1F-111F-45B4-B76C-8B5E6B9CB43F]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[19]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[18]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[F0EE651E-DBF6-4CAC-A517-AC85BCC2D3AF]]></uid>
    </SQLTable>
@@ -2525,7 +2506,7 @@
            <uid><![CDATA[B73773BA-AB1B-47AA-B995-2D2FE006198F]]></uid>
            <unique><![CDATA[1]]></unique>
        </SQLField>
-        <labelWindowIndex><![CDATA[24]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[23]]></labelWindowIndex>
        <objectComment><![CDATA[Least cost routing table]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[F283D572-F670-4571-91FD-A665A9D3E15D]]></uid>
@@ -2592,7 +2573,7 @@
            <type><![CDATA[VARCHAR(255)]]></type>
            <uid><![CDATA[FA39B463-61C7-4654-BE9C-D1AC39AB1B97]]></uid>
        </SQLField>
-        <labelWindowIndex><![CDATA[18]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[17]]></labelWindowIndex>
        <objectComment><![CDATA[A partition of the platform used by one service provider]]></objectComment>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[F294B51E-F867-47CA-BC1F-F70BDF8170FF]]></uid>
@@ -2617,10 +2598,10 @@
        <SourceSidebarWidth><![CDATA[0.000000]]></SourceSidebarWidth>
        <SQLEditorFileFormatVersion><![CDATA[4]]></SQLEditorFileFormatVersion>
        <uid><![CDATA[58C99A00-06C9-478C-A667-C63842E088F3]]></uid>
-        <windowHeight><![CDATA[871.000000]]></windowHeight>
+        <windowHeight><![CDATA[833.000000]]></windowHeight>
        <windowLocationX><![CDATA[0.000000]]></windowLocationX>
-        <windowLocationY><![CDATA[73.000000]]></windowLocationY>
-        <windowScrollOrigin><![CDATA[{0, 0}]]></windowScrollOrigin>
+        <windowLocationY><![CDATA[111.000000]]></windowLocationY>
+        <windowScrollOrigin><![CDATA[{610, 4}]]></windowScrollOrigin>
        <windowWidth><![CDATA[1512.000000]]></windowWidth>
    </SQLDocumentInfo>
    <AllowsIndexRenamingOnInsert><![CDATA[1]]></AllowsIndexRenamingOnInsert>
--- a/db/upgrade-jambonz-db.js
+++ b/db/upgrade-jambonz-db.js
@@ -53,10 +53,7 @@ const sql = {
    `ALTER TABLE account_limits 
    ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) 
    REFERENCES accounts (account_sid) 
-    ON DELETE CASCADE`,
-    'ALTER TABLE `voip_carriers` ADD COLUMN `register_from_user` VARCHAR(128)',
-    'ALTER TABLE `voip_carriers` ADD COLUMN `register_from_domain` VARCHAR(256)',
-    'ALTER TABLE `voip_carriers` ADD COLUMN `register_public_ip_in_contact` BOOLEAN NOT NULL DEFAULT false'
+    ON DELETE CASCADE`
  ]
 };

--- a/lib/models/voip-carrier.js
+++ b/lib/models/voip-carrier.js
@@ -111,18 +111,6 @@ VoipCarrier.fields = [
    name: 'smpp_system_id',
    type: 'string'
  },
-  {
-    name: 'register_from_user',
-    type: 'string'
-  },
-  {
-    name: 'register_from_domain',
-    type: 'string'
-  },
-  {
-    name: 'register_public_ip_in_contact',
-    type: 'number'
-  }
 ];

 module.exports = VoipCarrier;
--- a/lib/swagger/swagger.yaml
+++ b/lib/swagger/swagger.yaml
@@ -909,15 +909,6 @@ paths:
                  type: string
                  description: sip password to authenticate with, if registration is required
                  example: bar
-                register_from_user:
-                  type: string
-                  description: optional username to apply in From header
-                register_from_domain:
-                  type: string
-                  description: optional domain to apply in From header
-                register_public_ip_in_contact:
-                  type: boolean
-                  description: if true, use our public ip in Contact header; otherwise, use sip realm
                tech_prefix:
                  type: string
                  description: prefix to be applied to the called number for outbound call attempts
@@ -3419,10 +3410,6 @@ paths:
                  type: string
                  description: The calling party number
                  example: "16172375089"
-                fromHost:
-                  type: string
-                  description: The hostname to put in the SIP From header of the INVITE
-                  example: "blf.finotel.com"
                timeout:
                  type: integer
                  description: the number of seconds to wait for call to be answered.  Defaults to 60.
@@ -4524,12 +4511,6 @@ components:
          type: string
        register_password:
          type: string
-        register_from_user:
-          type: string
-        register_from_domain:
-          type: string
-        register_public_ip_in_contact:
-          type: boolean
        tech_prefix:
          type: string
        inbound_auth_username:
--- a/lib/utils/speech-utils.js
+++ b/lib/utils/speech-utils.js
@@ -2,8 +2,6 @@ const ttsGoogle = require('@google-cloud/text-to-speech');
 const sttGoogle = require('@google-cloud/speech').v1p1beta1;
 const Polly = require('aws-sdk/clients/polly');
 const AWS = require('aws-sdk');
-const { Deepgram } = require('@deepgram/sdk');
-const sdk = require('microsoft-cognitiveservices-speech-sdk');
 const bent = require('bent');
 const fs = require('fs');

@@ -34,65 +32,6 @@ const testGoogleStt = async(logger, credentials) => {
  }
 };

-const testDeepgramStt = async(logger, credentials) => {
-  const {api_key} = credentials;
-  const deepgram = new Deepgram(api_key);
-
-  const mimetype = 'audio/wav';
-  const source = {
-    buffer: fs.readFileSync(`${__dirname}/../../data/test_audio.wav`),
-    mimetype: mimetype
-  };
-
-  return new Promise((resolve, reject) => {
-    // Send the audio to Deepgram and get the response
-    deepgram.transcription
-      .preRecorded(source, {punctuate: true})
-      .then((response) => {
-        //logger.debug({response}, 'got transcript');
-        if (response?.results?.channels[0]?.alternatives?.length > 0) resolve(response);
-        else reject(new Error('no transcript returned'));
-        return;
-      })
-      .catch((err) => {
-        logger.info({err}, 'failed to get deepgram transcript');
-        reject(err);
-      });
-  });
-};
-
-const testMicrosoftStt = async(logger, credentials) => {
-  const {api_key, region} = credentials;
-
-  const speechConfig = sdk.SpeechConfig.fromSubscription(api_key, region);
-  const audioConfig = sdk.AudioConfig.fromWavFileInput(fs.readFileSync(`${__dirname}/../../data/test_audio.wav`));
-  speechConfig.speechRecognitionLanguage = 'en-US';
-  const speechRecognizer = new sdk.SpeechRecognizer(speechConfig, audioConfig);
-
-  return new Promise((resolve, reject) => {
-    speechRecognizer.recognizeOnceAsync((result) => {
-      switch (result.reason) {
-        case sdk.ResultReason.RecognizedSpeech:
-          resolve();
-          break;
-        case sdk.ResultReason.NoMatch:
-          reject('Speech could not be recognized.');
-          break;
-        case sdk.ResultReason.Canceled:
-          const cancellation = sdk.CancellationDetails.fromResult(result);
-          logger.info(`CANCELED: Reason=${cancellation.reason}`);
-          if (cancellation.reason == sdk.CancellationReason.Error) {
-            logger.info(`CANCELED: ErrorCode=${cancellation.ErrorCode}`);
-            logger.info(`CANCELED: ErrorDetails=${cancellation.errorDetails}`);
-          }
-          reject(cancellation.reason);
-          break;
-      }
-      speechRecognizer.close();
-    });
-  });
-};
-
 const testAwsTts = (logger, credentials) => {
  const polly = new Polly(credentials);
  return new Promise((resolve, reject) => {
@@ -150,6 +89,11 @@ const testMicrosoftTts = async(logger, credentials) => {
  }
 };

+const testMicrosoftStt = async(logger, credentials) => {
+  //TODO
+  return true;
+};
+
 const testWellSaidTts = async(logger, credentials) => {
  const {api_key} = credentials;
  try {
@@ -183,5 +127,4 @@ module.exports = {
  testMicrosoftTts,
  testMicrosoftStt,
  testWellSaidStt,
-  testDeepgramStt
 };
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-api-server",
-  "version": "v0.7.8",
+  "version": "v0.7.7",
  "description": "",
  "main": "app.js",
  "scripts": {
@@ -18,12 +18,11 @@
    "url": "https://github.com/jambonz/jambonz-api-server.git"
  },
  "dependencies": {
-    "@deepgram/sdk": "^1.10.2",
-    "@google-cloud/speech": "^5.1.0",
-    "@google-cloud/text-to-speech": "^4.0.3",
-    "@jambonz/db-helpers": "^0.7.3",
-    "@jambonz/realtimedb-helpers": "^0.5.9",
-    "@jambonz/time-series": "^0.2.5",
+    "@google-cloud/speech": "^4.10.2",
+    "@google-cloud/text-to-speech": "^3.4.0",
+    "@jambonz/db-helpers": "^0.6.18",
+    "@jambonz/realtimedb-helpers": "^0.4.29",
+    "@jambonz/time-series": "^0.2.1",
    "argon2-ffi": "^2.0.0",
    "aws-sdk": "^2.1152.0",
    "bent": "^7.3.12",
@@ -34,9 +33,8 @@
    "form-data": "^2.5.1",
    "form-urlencoded": "^6.1.0",
    "helmet": "^5.1.0",
-    "jsonwebtoken": "^9.0.0",
+    "jsonwebtoken": "^8.5.1",
    "mailgun.js": "^3.7.3",
-    "microsoft-cognitiveservices-speech-sdk": "^1.24.1",
    "mysql2": "^2.3.3",
    "passport": "^0.6.0",
    "passport-http-bearer": "^1.0.1",
--- a/test/speech-credentials.js
+++ b/test/speech-credentials.js
@@ -30,9 +30,7 @@ test('speech credentials tests', async(t) => {
      json: true,
      body: {
        vendor: 'google',
-        service_key: jsonKey,
-        use_for_tts: true,
-        use_for_stt: true
+        service_key: jsonKey
      }
    });
    t.ok(result.statusCode === 201, 'successfully added a speech credential to service provider');
@@ -63,9 +61,7 @@ test('speech credentials tests', async(t) => {
      json: true,
      body: {
        vendor: 'google',
-        service_key: jsonKey,
-        use_for_tts: true,
-        use_for_stt: true
+        service_key: jsonKey
      }
    });
    t.ok(result.statusCode === 201, 'successfully added speech credential');
@@ -114,34 +110,7 @@ test('speech credentials tests', async(t) => {
    });
    t.ok(result.statusCode === 204, 'successfully deleted speech credential');

-    /* add / test a credential for google */
-    if (process.env.GCP_JSON_KEY) {
-      result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,
-        body: {
-          vendor: 'google',
-          use_for_tts: true,
-          use_for_stt: true,
-          service_key: process.env.GCP_JSON_KEY
-        }
-      });
-      t.ok(result.statusCode === 201, 'successfully added speech credential for google');
-      const ms_sid = result.body.sid;
-
-      /* test the speech credential */
-      result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}/test`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,   
-      });
-      //console.log(JSON.stringify(result));
-      t.ok(result.statusCode === 200 && result.body.tts.status === 'ok', 'successfully tested speech credential for google tts');
-      t.ok(result.statusCode === 200 && result.body.stt.status === 'ok', 'successfully tested speech credential for google stt');
-    }
-
-    /* add / test a credential for microsoft */
+    /* add a credential for microsoft */
    if (process.env.MICROSOFT_API_KEY && process.env.MICROSOFT_REGION) {
      result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
        resolveWithFullResponse: true,
@@ -150,12 +119,11 @@ test('speech credentials tests', async(t) => {
        body: {
          vendor: 'microsoft',
          use_for_tts: true,
-          use_for_stt: true,
          api_key: process.env.MICROSOFT_API_KEY,
          region: process.env.MICROSOFT_REGION
        }
      });
-      t.ok(result.statusCode === 201, 'successfully added speech credential for microsoft');
+      t.ok(result.statusCode === 201, 'successfully added speech credential');
      const ms_sid = result.body.sid;

      /* test the speech credential */
@@ -164,9 +132,7 @@ test('speech credentials tests', async(t) => {
        auth: authUser,
        json: true,   
      });
-      //console.log(JSON.stringify(result));
-      t.ok(result.statusCode === 200 && result.body.tts.status === 'ok', 'successfully tested speech credential for microsoft tts');
-      t.ok(result.statusCode === 200 && result.body.stt.status === 'ok', 'successfully tested speech credential for microsoft stt');
+      console.log(JSON.stringify(result));
    }

    /* add a credential for wellsaid */
@@ -190,8 +156,7 @@ test('speech credentials tests', async(t) => {
        auth: authUser,
        json: true,   
      });
-      //console.log(JSON.stringify(result));
-      t.ok(result.statusCode === 200 && result.body.tts.status === 'ok', 'successfully tested speech credential for wellsaid');
+      console.log(JSON.stringify(result));

      /* delete the credential */
      result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}`, {
--- a/test/voip-carriers.js
+++ b/test/voip-carriers.js
@@ -54,9 +54,7 @@ test('voip carrier tests', async(t) => {
        requires_register: true,
        register_username: 'foo',
        register_sip_realm: 'bar',
-        register_password: 'baz',
-        register_from_user: 'fromme',
-        register_from_domain: 'fromdomain'
+        register_password: 'baz'
      }
    });
    t.ok(result.statusCode === 204, 'successfully updated voip carrier');
Author	SHA1	Message	Date
xquanluu	b46604fc0d	Feat: password settings for account (#65 ) * feat: password settings for account * feat: password settings for account * fix: review comments * fix: review comments * fix: review comments * return empty json * fix: after review	2022-10-04 09:13:57 +01:00
Dave Horton	c04cf65f17	add password_settings table	2022-09-30 09:56:19 +01:00
Dave Horton	b1a75a3410	add support for azure custom endpoints	2022-09-28 00:39:28 +01:00
Dave Horton	73d1fa933e	added new table password_settings	2022-09-27 11:00:17 +01:00