@vgroup/dialbox 0.2.49 → 0.2.51

package/fesm2020/vgroup-dialbox.mjs

@@ -538,26 +538,6 @@ class ExtensionService {
         const httpOptions = { headers: new HttpHeaders(params) };
         return this.http.put(environment.apiUrl + '/utilities/softphone/update/callerid/label', dtModel, httpOptions);
     }
-    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 = { ...payload, proxy: ipAddressInfo.proxy.toString() };
-                const httpOptions = { headers: new HttpHeaders(params) };
-                return this.http.post(environment.apiUrl + '/utilities/ext/ur/initiate/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 => {
@@ -571,7 +551,7 @@ class ExtensionService {
     //             };
     //             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(
+    //             return this.http.post<[]>(environment.apiUrl + '/utilities/ext/ur/initiate/call', payload, httpOptions).pipe(
     //               catchError(error => {
     //                 return throwError(error);
     //               }), 
@@ -585,6 +565,26 @@ class ExtensionService {
     //     })
     //   );
     // }
+    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 = { ...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);
+            }));
+        }));
+    }
     getConferenceCallToken(payload) {
         const params = {
             "conferenceId": payload.conferenceId,
@@ -2116,13 +2116,13 @@ class CallProgressComponent {
             };
             const response = await this.initiateCall(payload);
             if (response.status == 200) {
-                const { authId } = await this.getConferenceCallToken(response);
-                this.getUserInformation(authId);
-                // this.recordCall = recordCall; // Store the recordCall value
-                const tokenData = await this.getOutgoingCallToken(authId);
+                const { id: callAuthId, recordCall } = await this.getCallAuthId(response);
+                this.getUserInformation(callAuthId);
+                this.recordCall = recordCall; // Store the recordCall value
+                const tokenData = await this.getOutgoingCallToken(callAuthId);
                 await this.connectToDevice(tokenData.token, callData);
                 // Poll the status for 30-45 seconds
-                this.pollCallStatus(authId);
+                this.pollCallStatus(callAuthId);
             }
             else if (response.status == 201) {
                 swal("Error", response.message.join("<br/>"), "error");
@@ -2140,19 +2140,14 @@ class CallProgressComponent {
     async initiateCall(payload) {
         return await this.extensionService.initiateCall(payload).toPromise();
     }
-    // private async getCallAuthId(response: any) {
-    //   return {
-    //     id: response.callauth.id,
-    //     recordCall: response.callauth.recordCall
-    //   };
-    // }
-    getConferenceCallToken(response) {
+    async getCallAuthId(response) {
         return {
-            authId: response.callauth.id,
+            id: response.callauth.id,
+            recordCall: response.callauth.recordCall
         };
     }
     async getOutgoingCallToken(callAuthId) {
-        return await this.extensionService.getOutgoingCallToken({ authId: callAuthId }).toPromise();
+        return await this.extensionService.getConferenceCallToken({ authId: callAuthId }).toPromise();
     }
     async connectToDevice(token, callData) {
         const options = {
@@ -2372,10 +2367,10 @@ class CallProgressComponent {
             };
             const response = await this.initiateCall(payload);
             if (response.status == 200) {
-                const { authId } = await this.getConferenceCallToken(response);
-                this.getUserInformation(authId);
-                // this.recordCall = recordCall;
-                const tokenData = await this.getOutgoingCallToken(authId);
+                const { id: callAuthId, recordCall } = await this.getCallAuthId(response);
+                this.getUserInformation(callAuthId);
+                this.recordCall = recordCall;
+                const tokenData = await this.getOutgoingCallToken(callAuthId);
                 // Connect to new call
                 const options = {
                     codecPreferences: ['opus', 'pcmu'],
@@ -2413,7 +2408,7 @@ class CallProgressComponent {
                 // Setup event listeners for new call
                 this.setupEventListeners();
                 // Poll call status
-                this.pollCallStatus(authId);
+                this.pollCallStatus(callAuthId);
                 console.log('New call initiated to:', phoneNumber);
                 this.cdr.detectChanges();
             }