@zohoim/client-sdk 1.0.0-poc63 → 1.0.0-poc65

package/es/core/constants/ResponseTypes.js

@@ -0,0 +1,4 @@
+const LIST = 'list';
+const SINGLE = 'single';
+const NONE = 'none';
+export { LIST, SINGLE, NONE };

package/es/core/constants/index.js

@@ -1,5 +1,6 @@
 import { HttpMethods } from '@zohoim/http-client';
 import ModuleNames from "./ModuleNames";
+import { LIST, SINGLE, NONE } from "./ResponseTypes";
 const IM_API_PREFIX = '/api/v1';
 const HTTP_METHODS = HttpMethods;
-export { ModuleNames, IM_API_PREFIX, HTTP_METHODS };
+export { ModuleNames, IM_API_PREFIX, HTTP_METHODS, LIST, SINGLE, NONE };

package/es/domain/dto/contacts/getContactsRequest.js

@@ -3,7 +3,8 @@ import RequestBuilder from "../RequestBuilder";
 function getContactsRequest() {
   return new RequestBuilder().withQuery({
     from: 0,
-    limit: 10
+    limit: 10,
+    searchStr: null
   }).build();
 }
 

package/es/domain/schema/attachment/AttachmentSchema.js

@@ -21,7 +21,7 @@ const AttachmentSchema = {
   },
   url: {
     type: 'string',
-    required: true
+    required: false
   }
 };
 export default AttachmentSchema;

package/es/infrastructure/api/BaseAPI.js

@@ -1,3 +1,5 @@
+import { LIST, NONE, SINGLE } from "../../core/constants";
+import { ResponseUtils } from "../../core/utils";
 import configRegistry from "../config/configRegistry";
 import { getRegistryConfig } from "./registry";
 export default class BaseAPI {
@@ -60,15 +62,18 @@ export default class BaseAPI {
       acc[key] = value;
       return acc;
     }, {});
-    return new URLSearchParams(filteredQuery).toString();
+    return Object.entries(filteredQuery).map(_ref5 => {
+      let [key, value] = _ref5;
+      return `${key}=${value}`;
+    }).join('&');
   }
 
-  async request(_ref5) {
+  async request(_ref6) {
     let {
       request,
       operation,
       header
-    } = _ref5;
+    } = _ref6;
     const config = this.registryProvider.getRegistryConfig(this.module, operation);
 
     if (!config) {
@@ -89,7 +94,7 @@ export default class BaseAPI {
     return httpRequest;
   }
 
-  createAPIProxy(customAPI, defaultAPI, defaultAPIInstance) {
+  createAPIProxy(customAPI, defaultAPI) {
     // If no custom API provided, just use default
     if (!customAPI) {
       return defaultAPI;
@@ -99,7 +104,7 @@ export default class BaseAPI {
     return new Proxy({}, {
       get: (target, prop) => {
         // For methods, check if custom implementation exists
-        if (typeof prop === 'string' && typeof customAPI[prop] === 'function' && this.isMethodOverridden(defaultAPIInstance, customAPI, prop)) {
+        if (typeof prop === 'string' && typeof customAPI[prop] === 'function' && this.isMethodOverridden(customAPI, prop)) {
           // Use custom implementation if available
           return customAPI[prop].bind(customAPI);
         } // Fall back to default implementation
@@ -110,10 +115,33 @@ export default class BaseAPI {
     });
   }
 
-  isMethodOverridden(defaultAPIInstance, customAPI, methodName) {
-    const basePrototype = defaultAPIInstance.prototype;
-    const injectedMethod = customAPI[methodName];
-    return injectedMethod !== basePrototype[methodName];
+  isMethodOverridden(customAPI, methodName) {
+    const customPrototype = Object.getPrototypeOf(customAPI);
+    return typeof customAPI[methodName] === 'function' && // Method is defined directly on custom prototype
+    Object.prototype.hasOwnProperty.call(customPrototype, methodName);
+  }
+
+  async executeAPICall(_ref7) {
+    let {
+      operation,
+      request,
+      apiProxy,
+      customAPI,
+      adapter,
+      responseType = SINGLE
+    } = _ref7;
+    const response = await apiProxy[operation](request);
+    const isOverridden = this.isMethodOverridden(customAPI, operation);
+
+    if (isOverridden) {
+      return response;
+    }
+
+    if (responseType === NONE || !adapter) {
+      return response;
+    }
+
+    return responseType === LIST ? ResponseUtils.adaptListResponse(response, adapter.adapt) : ResponseUtils.adaptSingleResponse(response, adapter.adapt);
   }
 
 }

package/es/infrastructure/repositories/agents/AgentRepository.js

@@ -1,7 +1,7 @@
-import { ResponseUtils } from "../../../core/utils";
 import { IAgentRepository } from "../../../domain/interfaces/repositories";
 import { AgentAdapter } from "../../adapters";
 import { AgentAPI } from "../../api";
+import { LIST } from "../../../core/constants";
 export default class AgentRepository extends IAgentRepository {
   constructor(_ref) {
     let {
@@ -9,13 +9,35 @@ export default class AgentRepository extends IAgentRepository {
       agentAdapter
     } = _ref;
     super();
-    this.agentAPI = agentAPI || new AgentAPI();
+    this.defaultAPI = new AgentAPI();
+    this.customAPI = agentAPI;
+    this.agentAPI = this.createAPIProxy(this.customAPI, this.defaultAPI);
     this.agentAdapter = agentAdapter || new AgentAdapter();
   }
 
+  async invokeAPI(_ref2) {
+    let {
+      operation,
+      request,
+      adapter = this.agentAdapter,
+      responseType
+    } = _ref2;
+    return this.executeAPICall({
+      operation,
+      request,
+      apiProxy: this.agentAPI,
+      customAPI: this.customAPI,
+      adapter,
+      responseType
+    });
+  }
+
   async getAgents(request) {
-    const response = await this.agentAPI.getAgents(request);
-    return ResponseUtils.adaptListResponse(response, this.agentAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getAgents',
+      request,
+      responseType: LIST
+    });
   }
 
   toJSON() {

package/es/infrastructure/repositories/bots/BotRepository.js

@@ -1,7 +1,7 @@
-import { ResponseUtils } from "../../../core/utils";
 import { IBotRepository } from "../../../domain/interfaces/repositories";
 import { BotAdapter } from "../../adapters";
 import { BotAPI } from "../../api";
+import { LIST } from "../../../core/constants";
 export default class BotRepository extends IBotRepository {
   constructor(_ref) {
     let {
@@ -10,23 +10,34 @@ export default class BotRepository extends IBotRepository {
     } = _ref;
     super();
     this.defaultAPI = new BotAPI();
-    this.botAPI = this.createAPIProxy(botAPI, this.defaultAPI, BotAPI);
+    this.customAPI = botAPI;
+    this.botAPI = this.createAPIProxy(this.customAPI, this.defaultAPI);
     this.botAdapter = botAdapter || new BotAdapter();
   }
 
-  isOverridden(methodName) {
-    return this.isMethodOverridden(BotAPI, this.botAPI, methodName);
+  async invokeAPI(_ref2) {
+    let {
+      operation,
+      request,
+      adapter = this.botAdapter,
+      responseType
+    } = _ref2;
+    return this.executeAPICall({
+      operation,
+      request,
+      apiProxy: this.botAPI,
+      customAPI: this.customAPI,
+      adapter,
+      responseType
+    });
   }
 
   async getBots(request) {
-    const response = await this.botAPI.getBots(request);
-    const isOverridden = this.isOverridden('getBots');
-
-    if (isOverridden) {
-      return response;
-    }
-
-    return ResponseUtils.adaptListResponse(response, this.botAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getBots',
+      request,
+      responseType: LIST
+    });
   }
 
   toJSON() {

package/es/infrastructure/repositories/channels/ChannelAgentRepository.js

@@ -1,7 +1,7 @@
-import { ResponseUtils } from "../../../core/utils";
 import { IChannelAgentRepository } from "../../../domain/interfaces/repositories";
 import { ChannelAgentAdapter } from "../../adapters";
 import { ChannelAgentAPI } from "../../api";
+import { LIST } from "../../../core/constants";
 export default class ChannelAgentRepository extends IChannelAgentRepository {
   constructor(_ref) {
     let {
@@ -9,13 +9,35 @@ export default class ChannelAgentRepository extends IChannelAgentRepository {
       channelAgentAdapter
     } = _ref;
     super();
-    this.channelAgentAPI = channelAgentAPI || new ChannelAgentAPI();
+    this.defaultAPI = new ChannelAgentAPI();
+    this.customAPI = channelAgentAPI;
+    this.channelAgentAPI = this.createAPIProxy(this.customAPI, this.defaultAPI);
     this.channelAgentAdapter = channelAgentAdapter || new ChannelAgentAdapter();
   }
 
+  async invokeAPI(_ref2) {
+    let {
+      operation,
+      request,
+      adapter = this.channelAgentAdapter,
+      responseType
+    } = _ref2;
+    return this.executeAPICall({
+      operation,
+      request,
+      apiProxy: this.channelAgentAPI,
+      customAPI: this.customAPI,
+      adapter,
+      responseType
+    });
+  }
+
   async getAgents(request) {
-    const response = await this.channelAgentAPI.getAgents(request);
-    return ResponseUtils.adaptListResponse(response, this.channelAgentAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getAgents',
+      request,
+      responseType: LIST
+    });
   }
 
   toJSON() {

package/es/infrastructure/repositories/channels/ChannelRepository.js

@@ -1,7 +1,7 @@
-import { ResponseUtils } from "../../../core/utils";
 import { IChannelRepository } from "../../../domain/interfaces/repositories";
 import { ChannelAdapter } from "../../adapters";
 import { ChannelAPI } from "../../api";
+import { LIST } from "../../../core/constants";
 export default class ChannelRepository extends IChannelRepository {
   constructor() {
     let {
@@ -9,13 +9,35 @@ export default class ChannelRepository extends IChannelRepository {
       channelAdapter
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     super();
-    this.channelAPI = channelAPI || new ChannelAPI();
+    this.defaultAPI = new ChannelAPI();
+    this.customAPI = channelAPI;
+    this.channelAPI = this.createAPIProxy(this.customAPI, this.defaultAPI);
     this.channelAdapter = channelAdapter || new ChannelAdapter();
   }
 
+  async invokeAPI(_ref) {
+    let {
+      operation,
+      request,
+      adapter = this.channelAdapter,
+      responseType
+    } = _ref;
+    return this.executeAPICall({
+      operation,
+      request,
+      apiProxy: this.channelAPI,
+      customAPI: this.customAPI,
+      adapter,
+      responseType
+    });
+  }
+
   async getChannels(request) {
-    const response = await this.channelAPI.getChannels(request);
-    return ResponseUtils.adaptListResponse(response, this.channelAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getChannels',
+      request,
+      responseType: LIST
+    });
   }
 
   toJSON() {

package/es/infrastructure/repositories/contacts/ContactRepository.js

@@ -1,7 +1,7 @@
-import { ResponseUtils } from "../../../core/utils";
 import { IContactRepository } from "../../../domain/interfaces/repositories";
 import { ContactAdapter } from "../../adapters";
 import { ContactAPI } from "../../api";
+import { LIST } from "../../../core/constants";
 export default class ContactRepository extends IContactRepository {
   constructor(_ref) {
     let {
@@ -9,13 +9,35 @@ export default class ContactRepository extends IContactRepository {
       contactAdapter
     } = _ref;
     super();
-    this.contactAPI = contactAPI || new ContactAPI();
+    this.defaultAPI = new ContactAPI();
+    this.customAPI = contactAPI;
+    this.contactAPI = this.createAPIProxy(this.customAPI, this.defaultAPI);
     this.contactAdapter = contactAdapter || new ContactAdapter();
   }
 
+  async invokeAPI(_ref2) {
+    let {
+      operation,
+      request,
+      adapter = this.contactAdapter,
+      responseType
+    } = _ref2;
+    return this.executeAPICall({
+      operation,
+      request,
+      apiProxy: this.contactAPI,
+      customAPI: this.customAPI,
+      adapter,
+      responseType
+    });
+  }
+
   async getContacts(request) {
-    const response = await this.contactAPI.getContacts(request);
-    return ResponseUtils.adaptListResponse(response, this.contactAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getContacts',
+      request,
+      responseType: LIST
+    });
   }
 
   toJSON() {

package/es/infrastructure/repositories/messages/MessageRepository.js

@@ -1,8 +1,8 @@
 import { MessageAdapter } from "../../adapters";
-import { ResponseUtils } from "../../../core/utils";
 import { MessageAPI } from "../../api";
 import { IMessageRepository } from "../../../domain/interfaces/repositories/messages";
 import MessageWithSessionAdapter from "../../adapters/messages/MessageWithSessionAdapter";
+import { LIST, NONE } from "../../../core/constants";
 export default class MessageRepository extends IMessageRepository {
   constructor(_ref) {
     let {
@@ -11,49 +11,88 @@ export default class MessageRepository extends IMessageRepository {
       messageWithSessionAdapter
     } = _ref;
     super();
-    this.messageAPI = messageAPI || new MessageAPI();
+    this.defaultAPI = new MessageAPI();
+    this.customAPI = messageAPI;
+    this.messageAPI = this.createAPIProxy(this.customAPI, this.defaultAPI);
     this.messageAdapter = messageAdapter || new MessageAdapter();
     this.messageWithSessionAdapter = messageWithSessionAdapter || new MessageWithSessionAdapter();
   }
 
+  async invokeAPI(_ref2) {
+    let {
+      operation,
+      request,
+      adapter = this.messageAdapter,
+      responseType
+    } = _ref2;
+    return this.executeAPICall({
+      operation,
+      request,
+      apiProxy: this.messageAPI,
+      customAPI: this.customAPI,
+      adapter,
+      responseType
+    });
+  }
+
   async getMessages(request) {
-    const response = await this.messageAPI.getMessages(request);
-    return ResponseUtils.adaptListResponse(response, this.messageAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getMessages',
+      request,
+      responseType: LIST
+    });
   }
 
   async getFullContent(request) {
-    const response = await this.messageAPI.getFullContent(request);
-    return response;
+    return this.invokeAPI({
+      operation: 'getFullContent',
+      request,
+      responseType: NONE
+    });
   }
 
   async sendMessage(request) {
-    const response = await this.messageAPI.sendMessage(request);
-    return ResponseUtils.adaptSingleResponse(response, this.messageAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'sendMessage',
+      request
+    });
   }
 
   async sendAttachment(request) {
-    const response = await this.messageAPI.sendAttachment(request);
-    return ResponseUtils.adaptSingleResponse(response, this.messageAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'sendAttachment',
+      request
+    });
   }
 
   async resendMessage(request) {
-    const response = await this.messageAPI.resendMessage(request);
-    return ResponseUtils.adaptSingleResponse(response, this.messageAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'resendMessage',
+      request
+    });
   }
 
   async deleteMessage(request) {
-    const response = await this.messageAPI.deleteMessage(request);
-    return ResponseUtils.adaptSingleResponse(response, this.messageAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'deleteMessage',
+      request
+    });
   }
 
   async initiateSession(request) {
-    const response = await this.messageAPI.initiateSession(request);
-    return ResponseUtils.adaptSingleResponse(response, this.messageAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'initiateSession',
+      request
+    });
   }
 
   async searchMessages(request) {
-    const response = await this.messageAPI.searchMessages(request);
-    return ResponseUtils.adaptListResponse(response, this.messageWithSessionAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'searchMessages',
+      request,
+      adapter: this.messageWithSessionAdapter,
+      responseType: LIST
+    });
   }
 
   toJSON() {

package/es/infrastructure/repositories/sessions/SessionRepository.js

@@ -1,7 +1,7 @@
 import { AttachmentAdapter, MessageAdapter, SessionAdapter } from "../../adapters/index";
-import { ResponseUtils } from "../../../core/utils";
 import { ISessionRepository } from "../../../domain/interfaces/repositories";
 import { SessionAPI } from "../../api";
+import { LIST } from "../../../core/constants";
 export default class SessionRepository extends ISessionRepository {
   constructor(_ref) {
     let {
@@ -11,45 +11,83 @@ export default class SessionRepository extends ISessionRepository {
       messageAdapter
     } = _ref;
     super();
-    this.sessionAPI = sessionAPI || new SessionAPI();
+    this.defaultAPI = new SessionAPI();
+    this.customAPI = sessionAPI;
+    this.sessionAPI = this.createAPIProxy(this.customAPI, this.defaultAPI);
     this.sessionAdapter = sessionAdapter || new SessionAdapter();
     this.attachmentAdapter = attachmentAdapter || new AttachmentAdapter();
     this.messageAdapter = messageAdapter || new MessageAdapter();
   }
 
+  async invokeAPI(_ref2) {
+    let {
+      operation,
+      request,
+      adapter = this.sessionAdapter,
+      responseType
+    } = _ref2;
+    return this.executeAPICall({
+      operation,
+      request,
+      apiProxy: this.sessionAPI,
+      customAPI: this.customAPI,
+      adapter,
+      responseType
+    });
+  }
+
   async updateAssignee(request) {
-    const response = await this.sessionAPI.updateAssignee(request);
-    return ResponseUtils.adaptSingleResponse(response, this.sessionAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'updateAssignee',
+      request
+    });
   }
 
   async getSessions(request) {
-    const response = await this.sessionAPI.getSessions(request);
-    return ResponseUtils.adaptListResponse(response, this.sessionAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getSessions',
+      request,
+      responseType: LIST
+    });
   }
 
   async getSession(request) {
-    const response = await this.sessionAPI.getSession(request);
-    return ResponseUtils.adaptSingleResponse(response, this.sessionAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getSession',
+      request
+    });
   }
 
   async getSessionAttachments(request) {
-    const response = await this.sessionAPI.getSessionAttachments(request);
-    return ResponseUtils.adaptListResponse(response, this.attachmentAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getSessionAttachments',
+      request,
+      adapter: this.attachmentAdapter,
+      responseType: LIST
+    });
   }
 
   async getSessionLastMessages(request) {
-    const response = await this.sessionAPI.getSessionLastMessages(request);
-    return ResponseUtils.adaptListResponse(response, this.messageAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'getSessionLastMessages',
+      request,
+      adapter: this.messageAdapter,
+      responseType: LIST
+    });
   }
 
   async markSessionAsRead(request) {
-    const response = await this.sessionAPI.markSessionAsRead(request);
-    return ResponseUtils.adaptSingleResponse(response, this.sessionAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'markSessionAsRead',
+      request
+    });
   }
 
   async updateSessionStatus(request) {
-    const response = await this.sessionAPI.updateSessionStatus(request);
-    return ResponseUtils.adaptSingleResponse(response, this.sessionAdapter.adapt);
+    return this.invokeAPI({
+      operation: 'updateSessionStatus',
+      request
+    });
   }
 
   toJSON() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohoim/client-sdk",
-  "version": "1.0.0-poc63",
+  "version": "1.0.0-poc65",
   "description": "To have the client sdk for the IM",
   "main": "es/index.js",
   "module": "es/index.js",