@vgroup/dialbox 0.2.28 → 0.2.29

package/fesm2015/vgroup-dialbox.mjs

@@ -563,21 +563,45 @@ 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 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 = Object.assign(Object.assign({}, 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}/ur/initiate/conference/call`, payload, httpOptions);
-                return forkJoin([api1$, api2$]).pipe(catchError(error => throwError(() => error)));
-            }), catchError(error => throwError(() => error)));
+        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 = Object.assign(Object.assign({}, 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$]);
         }));
     }
     getConferenceCallToken(payload) {
@@ -2100,8 +2124,8 @@ class CallProgressComponent {
                     scope: 'local',
                     fromNumber: callData.from
                 };
-                const response = yield this.initiateCall(payload);
-                if (response.status == 200) {
+                const [response] = yield this.initiateCall(payload);
+                if (response && response.status === 200) {
                     const { id: callAuthId, recordCall } = yield this.getCallAuthId(response);
                     this.getUserInformation(callAuthId);
                     this.recordCall = recordCall; // Store the recordCall value
@@ -2110,7 +2134,7 @@ class CallProgressComponent {
                     // Poll the status for 30-45 seconds
                     this.pollCallStatus(callAuthId);
                 }
-                else if (response.status == 201) {
+                else if (response && response.status === 201) {
                     swal("Error", response.message.join("<br/>"), "error");
                     console.log('test2');
                     this.endCall();
@@ -2363,8 +2387,8 @@ class CallProgressComponent {
                     scope: 'local',
                     fromNumber: this.callData.from
                 };
-                const response = yield this.initiateCall(payload);
-                if (response.status == 200) {
+                const [response] = yield this.initiateCall(payload);
+                if (response && response.status === 200) {
                     const { id: callAuthId, recordCall } = yield this.getCallAuthId(response);
                     this.getUserInformation(callAuthId);
                     this.recordCall = recordCall;
@@ -2410,7 +2434,7 @@ class CallProgressComponent {
                     console.log('New call initiated to:', phoneNumber);
                     this.cdr.detectChanges();
                 }
-                else if (response.status == 201) {
+                else if (response && response.status === 201) {
                     swal("Error", response.message.join("<br/>"), "error");
                     // Restore held call if new call fails
                     if (this.heldCall) {