NTP-15943 | conflicts resolved

packages/adapter-ameyo/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.0.78 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/adapter-ameyo
+
+
+
+
+
+## 1.0.77 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/adapter-ameyo
+
+
+
+
+
+## 1.0.76 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/adapter-ameyo
+
+
+
+
+
+## 1.0.75 (2024-12-04)
+
+**Note:** Version bump only for package @universal-call-sdk/adapter-ameyo
+
+
+
+
+
 ## 1.0.68 (2024-11-28)
 
 **Note:** Version bump only for package @universal-call-sdk/adapter-ameyo

packages/adapter-ameyo/lib/assets/js/ajaxClient.ts

@@ -76,7 +76,7 @@ function extractUserCallModelUpdatedPush(rawResponse) {
                 userCRTObjectId = userCRTObjectId.replace('%40', '@');
                 const phoneNumber = parsedObject?.phone;
                 const lan = parsedObject?.loanaccountnumber;
-                const callId = parsedObject?.unique_id;
+                const callId = parsedObject?.unique_id || parsedObject?.callid;
                 localStorage.setItem(
                     'revEngCustomerInfo',
                     JSON.stringify({phoneNumber, lan, crtObjectId, userCRTObjectId, callId})

packages/adapter-ameyo/lib/main.ts

@@ -38,7 +38,8 @@ class AmeyoAdapter implements IAdapter {
         onCallIncoming: (data: StateType) => void,
         onAdapterReady: () => void,
         onAgentAvailabilityChange: (isAgentAvailable: boolean) => void
-        onForcedLogout: () => void
+        onForcedLogout: () => void,
+        onLoginFailed: (err: GenericObject)=>void
         onAgentsForCallTransfer: (data: GenericObject) => void
         onCallTransferStatus: (data: GenericObject) => void;
     };
@@ -56,7 +57,7 @@ class AmeyoAdapter implements IAdapter {
     constructor(options: AmeyoInitializationOptions) {
         console.log('AmeyoAdapter constructor');
 
-        if (document.readyState === 'loading') {
+        if(document.readyState === 'loading') {
             document.addEventListener('DOMContentLoaded', this._appendTags);
         } else {
             this._appendTags();
@@ -81,6 +82,9 @@ class AmeyoAdapter implements IAdapter {
             onAgentsForCallTransfer: () => {
             },
             onCallTransferStatus: () => {
+            },
+            onLoginFailed: ()=>{
+
             }
         };
         this.sessionId = '';
@@ -121,6 +125,10 @@ class AmeyoAdapter implements IAdapter {
     _onListenForCorsBypassResponse = (payload: GenericObject) => {
         console.log('universal sdk', payload);
         if (payload?.data?.requestKey === RequestKeys.AMEYO_LOGIN) {
+            if(payload?.data?.err) {
+                console.log('on login failed', payload?.data?.err);
+                this.callbacks.onLoginFailed(payload?.err);
+            }
             const sessionId = payload?.data?.response?.userSessionInfo?.sessionId;
             this.sessionId = sessionId;
             getSipAccountInfo(sessionId, this.userName?.toLowerCase());
@@ -152,6 +160,7 @@ class AmeyoAdapter implements IAdapter {
             setAutoStatus(this.sessionId);
             this.isAgentAvailable = true;
             window.postMessage({type: 'onAmeyoAvailabiltyChange', data: true});
+            this.callbacks.onAgentAvailabilityChange(true)
 
         }
         if (payload?.data?.requestKey === RequestKeys.OMNIQUEUE_SERVICE) {
@@ -239,6 +248,11 @@ class AmeyoAdapter implements IAdapter {
         this.callbacks.onForcedLogout = callback;
     }
 
+    registerOnLoginFailedListener(callback: ()=>void) {
+        console.log('register on login failed');
+        this.callbacks.onLoginFailed = callback
+    }
+
     registerOnAgentsForCallTransfer(callback: (data: GenericObject) => void) {
         console.log('registerOnAgentsForCallTransfer');
         this.callbacks.onAgentsForCallTransfer = callback;

packages/adapter-ameyo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universal-call-sdk/adapter-ameyo",
-  "version": "1.0.74",
+  "version": "1.0.79",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@universal-call-sdk/common": "^1.0.27"
+    "@universal-call-sdk/common": "^1.0.32"
   },
   "devDependencies": {
     "@eslint/js": "^9.11.1",

packages/common/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.0.31 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/common
+
+
+
+
+
+## 1.0.30 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/common
+
+
+
+
+
+## 1.0.29 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/common
+
+
+
+
+
+## 1.0.28 (2024-12-04)
+
+**Note:** Version bump only for package @universal-call-sdk/common
+
+
+
+
+
 ## 1.0.23 (2024-11-28)
 
 **Note:** Version bump only for package @universal-call-sdk/common

packages/common/lib/Interfaces/IAdapter.ts

@@ -7,6 +7,7 @@ class IAdapter {
     registerOnAdapterReady(callback: ()=> void) {callback()}
     registerOnAgentAvailabilityChange(callback: (isAgentAvailable: boolean) => void) {callback(false)}
     registerOnForcedLogoutListener(callback:()=>void) {callback()}
+    registerOnLoginFailedListener(callback:()=>void) {callback()}
     registerOnAgentsForCallTransfer(callback: (data : GenericObject) => void) {callback({})}
     registerOnCallTransferStatus(callback: (data: GenericObject) => void) {callback({})}
     acceptCall() {}
@@ -20,6 +21,7 @@ class IAdapter {
     init() {}
 
     getAgentAvailability(): boolean {return  false}
+
     getLatestCallState() {return {}}
     getAvailableAgentsForCallTransfer() {}
     transferCallToAgent(data: GenericObject) {console.log("transfer call", data)}

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universal-call-sdk/common",
-  "version": "1.0.27",
+  "version": "1.0.32",
   "type": "module",
   "scripts": {
     "dev": "vite",

packages/core/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.0.36 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/core
+
+
+
+
+
+## 1.0.35 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/core
+
+
+
+
+
+## 1.0.34 (2024-12-06)
+
+**Note:** Version bump only for package @universal-call-sdk/core
+
+
+
+
+
+## 1.0.33 (2024-12-04)
+
+**Note:** Version bump only for package @universal-call-sdk/core
+
+
+
+
+
 ## 1.0.28 (2024-11-28)
 
 **Note:** Version bump only for package @universal-call-sdk/core

packages/core/lib/useCallSdk.ts

@@ -32,33 +32,33 @@ function reducer(state: StateType, action: Actions): GenericObject {
         }
     }
 
-    if (action.type === actionTypes.CALL_DISCONNECTED) {
+    if(action.type === actionTypes.CALL_DISCONNECTED) {
         return {
             ...state,
             connectedCustomerData: {},
             isCallDisconnected: true
         }
     }
-    if (action.type === actionTypes.CALL_REJECTED) {
+    if(action.type === actionTypes.CALL_REJECTED) {
         return {
             connectedCustomerData: {},
             isRinging: false
         }
 
     }
-    if (action.type === actionTypes.CALL_MUTED) {
+    if(action.type === actionTypes.CALL_MUTED) {
         return {
             ...state,
             isMuted: true
         }
     }
-    if (action.type === actionTypes.CALL_UNMUTED) {
+    if(action.type === actionTypes.CALL_UNMUTED) {
         return {
             ...state,
             isMuted: false
         }
     }
-    return state;
+   return state;
 }
 
 
@@ -80,31 +80,31 @@ function UseCallSdk({AdapterClass, adapterOptions}: {
         adapter = new AdapterClass(adapterOptions);
     }, []);
     // @ts-expect-error sdfsf
-    const [callState] = useReducer<any>(reducer, initialState, () => initialState);
+   const [callState] = useReducer<any>(reducer, initialState,()=> initialState);
 
-    function registerOnCallIncoming(callback: (callState: GenericObject) => void) {
+   function registerOnCallIncoming(callback : (callState: GenericObject)=>void) {
         //dispatch({type: actionTypes.CALL_INCOMING, payload: {}})
         adapter.registerOnCallIncoming(callback);
     }
 
-    function registerOnCallConnected(callback: (callState: GenericObject) => void) {
+    function registerOnCallConnected(callback : (callState: GenericObject)=>void) {
         adapter.registerOnCallConnected(callback);
     }
 
-    function registerOnCallDisconnected(callback: (callState: GenericObject) => void) {
+    function registerOnCallDisconnected(callback : (callState: GenericObject)=>void) {
         adapter.registerOnCallDisconnected(callback);
     }
 
-    function registerOnAdapterReady(callback: () => void) {
+    function registerOnAdapterReady(callback : ()=> void) {
         adapter.registerOnAdapterReady(callback);
     }
 
 
-    function registerOnAgentAvailabilityChange(callback: (isAgentAvailable: boolean) => void) {
+    function registerOnAgentAvailabilityChange(callback : (isAgentAvailable: boolean) => void) {
         adapter.registerOnAgentAvailabilityChange(callback);
     }
 
-    function registerOnForcedLogoutListener(callback: () => void) {
+    function registerOnForcedLogoutListener(callback:()=>void) {
         adapter.registerOnForcedLogoutListener(callback);
     }
 
@@ -116,6 +116,10 @@ function UseCallSdk({AdapterClass, adapterOptions}: {
         adapter.registerOnCallTransferStatus(callback);
     }
 
+    function registerOnLoginFailedListener(callback:()=>void) {
+       adapter.registerOnLoginFailedListener(callback);
+    }
+
     function acceptCall() {
         adapter.acceptCall();
     }
@@ -174,6 +178,7 @@ function UseCallSdk({AdapterClass, adapterOptions}: {
         registerOnForcedLogoutListener,
         registerOnAgentsForCallTransfer,
         registerOnCallTransferStatus,
+        registerOnLoginFailedListener,
         acceptCall,
         rejectCall,
         disposeCall,

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universal-call-sdk/core",
-  "version": "1.0.32",
+  "version": "1.0.37",
   "type": "module",
   "scripts": {
     "dev": "vite",