@vgroup/dialbox 0.2.30 → 0.2.32

package/fesm2020/vgroup-dialbox.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, Input, Output, ViewChild, Inject, NgModule } from '@angular/core';
 import swal from 'sweetalert2';
 import { AsYouType } from 'libphonenumber-js';
-import { throwError, BehaviorSubject, forkJoin, of, interval, Subscription } from 'rxjs';
+import { throwError, BehaviorSubject, of, interval, Subscription } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpClientModule } from '@angular/common/http';
 import { catchError, switchMap, map, tap, shareReplay } from 'rxjs/operators';
@@ -67,7 +67,7 @@ const environment = {
     production: false,
     secureCookies: true,
     feUrl: 'https://dev.vgroupinc.com:91/',
-    apiUrl: 'https://apis.vgroupinc.com/test_softphone',
+    apiUrl: 'https://dev-api-t10.vgroupinc.com/dev_softphone_p91',
     captchaKey: "6LfpOmEaAAAAAGsI6JXlMzOl3b7rW4YmYXFDjldD",
     stripePublishableKey: "pk_test_51K6aTuBiNVV2TMlQfmBWY8jziwiDo0IZ3TrqWPqth1m32cpMAAg5Qpi2AlSMDEAX6hCZRBXoTzBB1uQQLc8B4tco00q2SgG6zO",
     sessionTimeout: 15,
@@ -573,19 +573,63 @@ class ExtensionService {
                 };
                 payload = { ...payload, proxy: ipAddressInfo.proxy.toString() };
                 const httpOptions = { headers: new HttpHeaders(params) };
-                const api1$ = this.http.post(`${environment.apiUrl}/utilities/ext/ur/initiate/call`, payload, httpOptions);
-                const api2$ = this.http.post(`${environment.apiUrl}/utilities/ext/ur/initiate/conference/call`, payload, httpOptions);
-                return forkJoin([api1$, api2$]).pipe(catchError(error => throwError(() => error)));
-            }), catchError(error => throwError(() => error)));
+                return this.http.post(environment.apiUrl + '/utilities/ext/ur/initiate/conference/call', payload, httpOptions).pipe(catchError(error => {
+                    return throwError(error);
+                }));
+            }), catchError(error => {
+                // Catch error from getIpAddressInfo
+                return throwError(error);
+            }));
         }));
     }
+    // initiateCall(payload: any): Observable<any> {
+    //   return this.fetchBlockedCountries().pipe(
+    //     switchMap(blockedCountries => {
+    //       return this.ipAddressService.getIpAddressInfo().pipe(
+    //         switchMap(ipAddressInfo => {
+    //           const params = {
+    //             'Content-Type': 'application/json',
+    //             'Auth-Key': 'Bearer ' + localStorage.getItem('ext_token'),
+    //             'ip-address': ipAddressInfo.ip,
+    //             'ip-country': ipAddressInfo.address.country,
+    //           }; 
+    //           payload = { ...payload, proxy: ipAddressInfo.proxy.toString() };
+    //           const httpOptions = { headers: new HttpHeaders(params) };
+    //           const api1$ = this.http.post(
+    //             `${environment.apiUrl}/utilities/ext/ur/initiate/call`,
+    //             payload,
+    //             httpOptions
+    //           );
+    //           const api2$ = this.http.post(
+    //             `${environment.apiUrl}/utilities/ext/ur/initiate/conference/call`,
+    //             payload,
+    //             httpOptions
+    //           );
+    //           return forkJoin([api1$, api2$]).pipe(
+    //             catchError(error => throwError(() => error))
+    //           );
+    //         }),
+    //         catchError(error => throwError(() => error))
+    //       );
+    //     })
+    //   );
+    // }
+    //  getConferenceCallToken(payload: any) {
+    //   const params = {
+    //     "conferenceId": payload.conferenceId,
+    //     "userId": payload.userId
+    //   }
+    //   const httpOptions = { headers: new HttpHeaders(params) };
+    //   return this.http.post<[]>(environment.apiUrl + '/utilities/ext/ur/generate/conference/token', params, httpOptions);
+    // }
     getConferenceCallToken(payload) {
         const params = {
-            "conferenceId": payload.conferenceId,
-            "userId": payload.userId
+            'Content-Type': 'application/json',
+            'Auth-Key': "Bearer " + localStorage.getItem('ext_token'),
+            'c2c-request': window.location.hostname
         };
         const httpOptions = { headers: new HttpHeaders(params) };
-        return this.http.post(environment.apiUrl + '/ur/generate/conference/token', params, httpOptions);
+        return this.http.post(environment.apiUrl + '/utilities/ext/ur/generate/token', payload, httpOptions);
     }
     addFirstParticipant(payload) {
         const params = {
@@ -2101,7 +2145,7 @@ class CallProgressComponent {
                 const { id: callAuthId, recordCall } = await this.getCallAuthId(response);
                 this.getUserInformation(callAuthId);
                 this.recordCall = recordCall; // Store the recordCall value
-                const tokenData = await this.getOutgoingCallToken(callAuthId);
+                const tokenData = await this.getConferenceCallToken(callAuthId);
                 await this.connectToDevice(tokenData.token, callData);
                 // Poll the status for 30-45 seconds
                 this.pollCallStatus(callAuthId);
@@ -2128,8 +2172,8 @@ class CallProgressComponent {
             recordCall: response.callauth.recordCall
         };
     }
-    async getOutgoingCallToken(callAuthId) {
-        return await this.extensionService.getOutgoingCallToken({ authId: callAuthId }).toPromise();
+    async getConferenceCallToken(callAuthId) {
+        return await this.extensionService.getConferenceCallToken({ authId: callAuthId }).toPromise();
     }
     async connectToDevice(token, callData) {
         const options = {
@@ -2350,7 +2394,7 @@ class CallProgressComponent {
                 const { id: callAuthId, recordCall } = await this.getCallAuthId(response);
                 this.getUserInformation(callAuthId);
                 this.recordCall = recordCall;
-                const tokenData = await this.getOutgoingCallToken(callAuthId);
+                const tokenData = await this.getConferenceCallToken(callAuthId);
                 // Connect to new call
                 const options = {
                     codecPreferences: ['opus', 'pcmu'],