@vgroup/dialbox 0.2.48 → 0.2.50

package/fesm2015/vgroup-dialbox.mjs

@@ -539,26 +539,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 = Object.assign(Object.assign({}, 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 => {
@@ -572,7 +552,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);
     //               }), 
@@ -586,6 +566,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 = Object.assign(Object.assign({}, 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,
@@ -2120,13 +2120,13 @@ class CallProgressComponent {
                 };
                 const response = yield this.initiateCall(payload);
                 if (response.status == 200) {
-                    const { id: callAuthId, recordCall } = yield this.getCallAuthId(response);
-                    this.getUserInformation(callAuthId);
-                    this.recordCall = recordCall; // Store the recordCall value
-                    const tokenData = yield this.getOutgoingCallToken(callAuthId);
+                    const { authId } = yield this.getConferenceCallToken(response);
+                    this.getUserInformation(authId);
+                    // this.recordCall = recordCall; // Store the recordCall value
+                    const tokenData = yield this.getOutgoingCallToken(authId);
                     yield this.connectToDevice(tokenData.token, callData);
                     // Poll the status for 30-45 seconds
-                    this.pollCallStatus(callAuthId);
+                    this.pollCallStatus(authId);
                 }
                 else if (response.status == 201) {
                     swal("Error", response.message.join("<br/>"), "error");
@@ -2147,13 +2147,16 @@ class CallProgressComponent {
             return yield this.extensionService.initiateCall(payload).toPromise();
         });
     }
-    getCallAuthId(response) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                id: response.callauth.id,
-                recordCall: response.callauth.recordCall
-            };
-        });
+    // private async getCallAuthId(response: any) {
+    //   return {
+    //     id: response.callauth.id,
+    //     recordCall: response.callauth.recordCall
+    //   };
+    // }
+    getConferenceCallToken(response) {
+        return {
+            authId: response.callauth.id,
+        };
     }
     getOutgoingCallToken(callAuthId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -2385,10 +2388,10 @@ class CallProgressComponent {
                 };
                 const response = yield this.initiateCall(payload);
                 if (response.status == 200) {
-                    const { id: callAuthId, recordCall } = yield this.getCallAuthId(response);
-                    this.getUserInformation(callAuthId);
-                    this.recordCall = recordCall;
-                    const tokenData = yield this.getOutgoingCallToken(callAuthId);
+                    const { authId } = yield this.getConferenceCallToken(response);
+                    this.getUserInformation(authId);
+                    // this.recordCall = recordCall;
+                    const tokenData = yield this.getOutgoingCallToken(authId);
                     // Connect to new call
                     const options = {
                         codecPreferences: ['opus', 'pcmu'],
@@ -2426,7 +2429,7 @@ class CallProgressComponent {
                     // Setup event listeners for new call
                     this.setupEventListeners();
                     // Poll call status
-                    this.pollCallStatus(callAuthId);
+                    this.pollCallStatus(authId);
                     console.log('New call initiated to:', phoneNumber);
                     this.cdr.detectChanges();
                 }