@vgroup/dialbox 0.2.29 → 0.2.31

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';
@@ -562,54 +562,74 @@ class ExtensionService {
     //     })
     //   );
     // }
-    /**
-     * Initiates a normal & a conference call in parallel.
-     * The method performs three steps:
-     *   1. Load black-listed countries & current IP info in parallel.
-     *   2. Abort early if the caller is from a blocked country.
-     *   3. Fire both call-initiation APIs together and return both responses.
-     *
-     * It guarantees that:
-     *   • Both HTTP requests are always attempted.
-     *   • Failure of one request does not cancel the other – the error is
-     *     returned alongside the success response so that the component can
-     *     decide what to do.
-     */
     initiateCall(payload) {
-        return forkJoin({
-            blocked: this.fetchBlockedCountries(),
-            ipInfo: this.ipAddressService.getIpAddressInfo()
-        }).pipe(switchMap(({ blocked, ipInfo }) => {
-            // Reject early if user’s country is in the blocked list.
-            if (blocked.includes(ipInfo.address.countryCode)) {
-                return throwError(() => ({ message: ['User from blocked country'] }));
-            }
-            // Prepare headers & body for both requests.
-            const headers = new HttpHeaders({
-                'Content-Type': 'application/json',
-                'Auth-Key': 'Bearer ' + localStorage.getItem('ext_token'),
-                'ip-address': ipInfo.ip,
-                'ip-country': ipInfo.address.country
-            });
-            const body = { ...payload, proxy: ipInfo.proxy.toString() };
-            const options = { headers };
-            const api1$ = this.http
-                .post(`${environment.apiUrl}/utilities/ext/ur/initiate/call`, body, options)
-                .pipe(catchError(error => of({ error })));
-            const api2$ = this.http
-                .post(`${environment.apiUrl}/ur/initiate/conference/call`, body, options)
-                .pipe(catchError(error => of({ error })));
-            // Execute both requests and return their individual outcomes.
-            return forkJoin([api1$, api2$]);
+        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) };
+                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 = {
@@ -2120,17 +2140,17 @@ class CallProgressComponent {
                 scope: 'local',
                 fromNumber: callData.from
             };
-            const [response] = await this.initiateCall(payload);
-            if (response && response.status === 200) {
+            const response = await this.initiateCall(payload);
+            if (response.status == 200) {
                 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);
             }
-            else if (response && response.status === 201) {
+            else if (response.status == 201) {
                 swal("Error", response.message.join("<br/>"), "error");
                 console.log('test2');
                 this.endCall();
@@ -2152,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 = {
@@ -2369,12 +2389,12 @@ class CallProgressComponent {
                 scope: 'local',
                 fromNumber: this.callData.from
             };
-            const [response] = await this.initiateCall(payload);
-            if (response && response.status === 200) {
+            const response = await this.initiateCall(payload);
+            if (response.status == 200) {
                 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'],
@@ -2416,7 +2436,7 @@ class CallProgressComponent {
                 console.log('New call initiated to:', phoneNumber);
                 this.cdr.detectChanges();
             }
-            else if (response && response.status === 201) {
+            else if (response.status == 201) {
                 swal("Error", response.message.join("<br/>"), "error");
                 // Restore held call if new call fails
                 if (this.heldCall) {