Merge pull request #2811 from irontec/PROVIDER-2079-hint-sip-alg-term…

…inales-broken Hint sip alg terminales broken
irontec · Nov 7, 2024 · a54ee89 · a54ee89
2 parents de58583 + 7a8a16e
commit a54ee89
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/library/Ivoz/Provider/Domain/Model/Terminal/TerminalDto.php b/library/Ivoz/Provider/Domain/Model/Terminal/TerminalDto.php
@@ -57,6 +57,7 @@ public static function getPropertyMap(string $context = '', string $role = null)
                     'publicReceived',
                     'expires',
                     'userAgent',
+                    'publicContact'
                 ]]
             ];
 
@@ -94,6 +95,7 @@ public static function getPropertyMap(string $context = '', string $role = null)
                 'publicReceived',
                 'expires',
                 'userAgent',
+                'publicContact'
             ]];
         }
 

diff --git a/web/portal/client/src/entities/RetailAccount/Field/Status.tsx b/web/portal/client/src/entities/RetailAccount/Field/Status.tsx
@@ -80,16 +80,14 @@ const Status: StatusIconProps = (props): JSX.Element | null => {
         const publicReceived = row.publicReceived;
         const expires = row.expires;
         const userAgent = row.userAgent;
-        const contact = row.contact.match(/sips?:([^@]+@)?(.+)/)?.pop();
+        const contact = row.contact.match(/sips?:([^@]+@)?([^;]+)/)?.pop();
         const publicContact = row.publicContact;
 
         let hintMsg: string | React.ReactElement = '';
         if (!received) {
           hintMsg = publicContact
             ? _('No NAT with public Contact (hint: SIP ALG / STUN)')
             : _('No NAT with private Contact (hint: internal routing)');
-        } else if (contact === received) {
-          hintMsg = _('Regular NAT detected');
         } else if (publicReceived && !publicContact) {
           hintMsg = _('Regular NAT detected');
         } else {
@@ -134,6 +132,7 @@ const Status: StatusIconProps = (props): JSX.Element | null => {
               </Tooltip>
               {hintMsg}
             </div>
+            {status.length - 1 !== key && <br />}
           </div>
         );
       })}

diff --git a/web/rest/brand/features/provider/terminal/getTerminalStatus.feature b/web/rest/brand/features/provider/terminal/getTerminalStatus.feature
@@ -22,6 +22,7 @@ Feature: Retrieve terminals status
               "status": [
                   {
                       "contact": "sip:[email protected]:5060",
+                      "publicContact": false,
                       "received": "sip:212.64.172.23:5060",
                       "publicReceived": true,
                       "expires": "2031-01-01 00:59:59",

diff --git a/web/rest/client/features/provider/terminal/getTerminal.feature b/web/rest/client/features/provider/terminal/getTerminal.feature
@@ -91,6 +91,7 @@ Feature: Retrieve terminals
           "status": [
               {
                   "contact": "sip:[email protected]:5060",
+                  "publicContact": false,
                   "received": "sip:212.64.172.23:5060",
                   "publicReceived": true,
                   "expires": "2031-01-01 00:59:59",

diff --git a/web/rest/client/features/provider/terminal/getTerminalStatus.feature b/web/rest/client/features/provider/terminal/getTerminalStatus.feature
@@ -21,6 +21,7 @@ Feature: Retrieve terminals status
               "status": [
                   {
                       "contact": "sip:[email protected]:5060",
+                      "publicContact": false,
                       "received": "sip:212.64.172.23:5060",
                       "publicReceived": true,
                       "expires": "2031-01-01 00:59:59",