@zohoim/client-sdk 1.0.0-poc90 → 1.0.0-poc91

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/es/application/services/messages/MessageService.js +5 -0
  2. package/es/application/services/sessions/SessionService.js +0 -5
  3. package/es/domain/dto/messages/getMessageRequest.js +14 -0
  4. package/es/domain/dto/messages/index.js +1 -0
  5. package/es/domain/dto/messages/initiateSessionRequest.js +1 -0
  6. package/es/domain/dto/messages/sendAttachmentRequest.js +0 -1
  7. package/es/domain/dto/messages/sendMessageRequest.js +2 -0
  8. package/es/domain/dto/sessions/index.js +1 -2
  9. package/es/domain/dto/sessions/markSessionAsReadRequest.js +5 -1
  10. package/es/domain/dto/sessions/updateSessionStatusRequest.js +0 -1
  11. package/es/domain/entities/Actor/Actor.js +5 -1
  12. package/es/domain/entities/Message/Action.js +3 -4
  13. package/es/domain/entities/Message/ExternalInfo.js +9 -0
  14. package/es/domain/entities/Message/Info.js +9 -14
  15. package/es/domain/entities/Message/Message.js +39 -3
  16. package/es/domain/entities/Message/index.js +1 -2
  17. package/es/domain/entities/Session/Session.js +20 -4
  18. package/es/domain/enum/actor/ActorType.js +1 -1
  19. package/es/domain/enum/attachment/AttachmentStatus.js +1 -3
  20. package/es/domain/enum/message/MessageDirection.js +2 -2
  21. package/es/domain/enum/message/MessageType.js +5 -1
  22. package/es/domain/enum/message/index.js +1 -2
  23. package/es/domain/interfaces/repositories/messages/IMessageRepository.js +6 -1
  24. package/es/domain/interfaces/repositories/sessions/ISessionRepository.js +1 -6
  25. package/es/domain/schema/message/MessageSchema.js +4 -0
  26. package/es/domain/schema/message/index.js +1 -2
  27. package/es/infrastructure/api/BaseAPI.js +9 -60
  28. package/es/infrastructure/api/UrlBuilder.js +53 -0
  29. package/es/infrastructure/api/messages/MessageAPI.js +11 -1
  30. package/es/infrastructure/api/registry/bots/botAPIRegistry.js +1 -2
  31. package/es/infrastructure/api/registry/channels/channelAgentAPIRegistry.js +1 -1
  32. package/es/infrastructure/api/registry/messages/messageAPIRegistry.js +6 -1
  33. package/es/infrastructure/api/registry/sessions/sessionAPIRegistry.js +2 -8
  34. package/es/infrastructure/api/sessions/SessionAPI.js +1 -11
  35. package/es/infrastructure/repositories/messages/MessageRepository.js +8 -0
  36. package/es/infrastructure/repositories/sessions/SessionRepository.js +0 -8
  37. package/package.json +1 -1
  38. package/es/domain/dto/sessions/pickupSessionRequest.js +0 -9
  39. package/es/domain/entities/Message/InfoTarget.js +0 -22
  40. package/es/domain/enum/message/InfoTargetType.js +0 -7
  41. package/es/domain/schema/message/InfoTargetSchema.js +0 -29
@@ -12,6 +12,10 @@ export default class MessageService extends IMessageRepository {
12
12
  return this.messageRepository.getMessages(request);
13
13
  }
14
14
 
15
+ async getMessage(request) {
16
+ return this.messageRepository.getMessage(request);
17
+ }
18
+
15
19
  async getFullContent(request) {
16
20
  return this.messageRepository.getFullContent(request);
17
21
  }
@@ -43,6 +47,7 @@ export default class MessageService extends IMessageRepository {
43
47
  toJSON() {
44
48
  return {
45
49
  getMessages: this.getMessages.bind(this),
50
+ getMessage: this.getMessage.bind(this),
46
51
  getFullContent: this.getFullContent.bind(this),
47
52
  sendMessage: this.sendMessage.bind(this),
48
53
  sendAttachment: this.sendAttachment.bind(this),
@@ -8,10 +8,6 @@ export default class SessionService extends ISessionRepository {
8
8
  this.sessionRepository = sessionRepository;
9
9
  }
10
10
 
11
- async pickupSession(request) {
12
- return this.sessionRepository.pickupSession(request);
13
- }
14
-
15
11
  async updateAssignee(request) {
16
12
  return this.sessionRepository.updateAssignee(request);
17
13
  }
@@ -42,7 +38,6 @@ export default class SessionService extends ISessionRepository {
42
38
 
43
39
  toJSON() {
44
40
  return {
45
- pickupSession: this.pickupSession.bind(this),
46
41
  updateAssignee: this.updateAssignee.bind(this),
47
42
  getSessions: this.getSessions.bind(this),
48
43
  getSession: this.getSession.bind(this),
@@ -0,0 +1,14 @@
1
+ import RequestBuilder from "../RequestBuilder";
2
+
3
+ function getMessageRequest() {
4
+ let {
5
+ params = {}
6
+ } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
7
+ return new RequestBuilder().withParams({
8
+ sessionId: null,
9
+ messageId: null,
10
+ ...params
11
+ }).build();
12
+ }
13
+
14
+ export default getMessageRequest;
@@ -1,4 +1,5 @@
1
1
  export { default as getMessagesRequest } from "./getMessagesRequest";
2
+ export { default as getMessageRequest } from "./getMessageRequest";
2
3
  export { default as deleteMessageRequest } from "./deleteMessageRequest";
3
4
  export { default as getFullContentRequest } from "./getFullContentRequest";
4
5
  export { default as resendMessageRequest } from "./resendMessageRequest";
@@ -14,6 +14,7 @@ function initiateSessionRequest() {
14
14
  cannedMessageId: null,
15
15
  language: null,
16
16
  parameters: {},
17
+ message: null,
17
18
  ...body
18
19
  }).build();
19
20
  }
@@ -7,7 +7,6 @@ function sendAttachmentRequest() {
7
7
  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
8
8
  return new RequestBuilder().withParams({
9
9
  sessionId: null,
10
- messageId: null,
11
10
  ...params
12
11
  }).withBody({
13
12
  message: null,
@@ -10,6 +10,8 @@ function sendMessageRequest() {
10
10
  ...params
11
11
  }).withBody({
12
12
  message: null,
13
+ replyToMessageId: null,
14
+ meta: null,
13
15
  ...body
14
16
  }).build();
15
17
  }
@@ -4,5 +4,4 @@ export { default as getSessionRequest } from "./getSessionRequest";
4
4
  export { default as getSessionAttachmentsRequest } from "./getSessionAttachmentsRequest";
5
5
  export { default as getSessionLastMessagesRequest } from "./getSessionLastMessagesRequest";
6
6
  export { default as markSessionAsReadRequest } from "./markSessionAsReadRequest";
7
- export { default as updateSessionStatusRequest } from "./updateSessionStatusRequest";
8
- export { default as pickupSessionRequest } from "./pickupSessionRequest";
7
+ export { default as updateSessionStatusRequest } from "./updateSessionStatusRequest";
@@ -2,11 +2,15 @@ import RequestBuilder from "../RequestBuilder";
2
2
 
3
3
  function markSessionAsReadRequest() {
4
4
  let {
5
- body = {}
5
+ body = {},
6
+ params = {}
6
7
  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
7
8
  return new RequestBuilder().withBody({
8
9
  lastSeenMessageId: null,
9
10
  ...body
11
+ }).withParams({
12
+ sessionId: null,
13
+ ...params
10
14
  }).build();
11
15
  }
12
16
 
@@ -10,7 +10,6 @@ function updateSessionStatusRequest() {
10
10
  ...params
11
11
  }).withBody({
12
12
  status: null,
13
- agentId: null,
14
13
  ...body
15
14
  }).build();
16
15
  }
@@ -21,10 +21,14 @@ export default class Actor {
21
21
  return type === ActorType.BOT;
22
22
  }
23
23
 
24
- static isEndUser(type) {
24
+ static isEnduser(type) {
25
25
  return type === ActorType.ENDUSER;
26
26
  }
27
27
 
28
+ static isSystemMessage(type) {
29
+ return type === ActorType.SYSTEM;
30
+ }
31
+
28
32
  toJSON() {
29
33
  return { ...this.data
30
34
  };
@@ -1,6 +1,6 @@
1
1
  import { validateSchema } from "../../../core/utils";
2
- import { ActionType } from "../../enum";
3
2
  import { ActionSchema } from "../../schema";
3
+ import { ActionType } from "../../enum";
4
4
  export default class Action {
5
5
  constructor() {
6
6
  let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -12,9 +12,8 @@ export default class Action {
12
12
  };
13
13
  }
14
14
 
15
- static isTransferAction() {
16
- let action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
17
- return action && action.type === ActionType.TRANSFER;
15
+ static isTransferAction(action) {
16
+ return action === ActionType.TRANSFER;
18
17
  }
19
18
 
20
19
  toJSON() {
@@ -1,4 +1,5 @@
1
1
  import { validateSchema } from "../../../core/utils";
2
+ import { ExternalInfoAction } from "../../enum";
2
3
  import { ExternalInfoSchema } from "../../schema";
3
4
  export default class ExternalInfo {
4
5
  constructor() {
@@ -9,6 +10,14 @@ export default class ExternalInfo {
9
10
  };
10
11
  }
11
12
 
13
+ static isGCConversationEnded(action) {
14
+ return action === ExternalInfoAction.GC_CONVERSATION_ENDED;
15
+ }
16
+
17
+ static isZIAConversationEnded(action) {
18
+ return action === ExternalInfoAction.ZIA_CONVERSATION_ENDED;
19
+ }
20
+
12
21
  toJSON() {
13
22
  return { ...this.data
14
23
  };
@@ -2,13 +2,6 @@ import { validateSchema } from "../../../core/utils";
2
2
  import { Actor } from "../Actor";
3
3
  import { InfoSchema } from "../../schema/message";
4
4
  import { InfoAction } from "../../enum";
5
- import InfoTarget from "./InfoTarget";
6
-
7
- function adaptTargets() {
8
- let targets = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
9
- return targets.map(target => new InfoTarget(target).toJSON());
10
- }
11
-
12
5
  export default class Info {
13
6
  constructor() {
14
7
  let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -17,18 +10,20 @@ export default class Info {
17
10
  actor: new Actor(validatedData.actor).toJSON(),
18
11
  action: validatedData.action,
19
12
  sessionStatus: validatedData.sessionStatus,
20
- targets: adaptTargets(validatedData.targets)
13
+ targets: validatedData.targets
21
14
  };
22
15
  }
23
16
 
24
- static isAutoAssignMessage() {
25
- let info = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
26
- return info && info.action === InfoAction.CHAT_AUTO_ASSIGN;
17
+ static isChatTransfer(action) {
18
+ return action === InfoAction.CHAT_TRANSFER;
19
+ }
20
+
21
+ static isAutoAssign(action) {
22
+ return action === InfoAction.CHAT_AUTO_ASSIGN;
27
23
  }
28
24
 
29
- static isTransferMessage() {
30
- let info = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
31
- return info && info.action === InfoAction.CHAT_TRANSFER;
25
+ static isEndSession(action) {
26
+ return action === InfoAction.END_SESSION;
32
27
  }
33
28
 
34
29
  toJSON() {
@@ -34,7 +34,8 @@ export default class Message {
34
34
  template: validatedData.template,
35
35
  type: validatedData.type,
36
36
  isRead: validatedData.isRead,
37
- article: validatedData.article
37
+ article: validatedData.article,
38
+ webUrl: validatedData.webUrl
38
39
  };
39
40
  }
40
41
 
@@ -58,16 +59,51 @@ export default class Message {
58
59
  return type === MessageTypes.INFO;
59
60
  }
60
61
 
62
+ static isExternalInfo(type) {
63
+ return type === MessageTypes.EXTERNAL_INFO;
64
+ }
65
+
61
66
  static isAttachment(type) {
62
67
  return type === MessageTypes.ATTACHMENT;
63
68
  }
64
69
 
70
+ static isTemplate(type) {
71
+ return type === MessageTypes.TEMPLATE;
72
+ }
73
+
65
74
  static isActionMessage(type) {
66
75
  return type === MessageTypes.ACTION;
67
76
  }
68
77
 
69
- static isAutoSent(systemMsgType) {
70
- return !!systemMsgType;
78
+ static isSystemMessage(message) {
79
+ return !!message;
80
+ }
81
+
82
+ static isHapinessRating(systemMessageType) {
83
+ return systemMessageType === MessageTypes.CX_HAPPINESS_SURVEY;
84
+ }
85
+
86
+ static isWelcomeMessage(systemMessageType) {
87
+ return systemMessageType === MessageTypes.WELCOMEMSG;
88
+ }
89
+
90
+ static isWorkflowMessage(systemMessageType) {
91
+ return systemMessageType === MessageTypes.WORKFLOW_MESSAGE;
92
+ }
93
+
94
+ static isWorkflowNotification(systemMessageType) {
95
+ return systemMessageType === MessageTypes.WORKFLOW_NOTIFICATION;
96
+ }
97
+
98
+ static isFailed(status) {
99
+ return status === MessageStatus.FAILED;
100
+ }
101
+
102
+ static getMetaValue() {
103
+ let meta = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
104
+ let key = arguments.length > 1 ? arguments[1] : undefined;
105
+ const item = meta.find(item => item.name === key);
106
+ return item ? item.value : '';
71
107
  }
72
108
 
73
109
  toJSON() {
@@ -3,5 +3,4 @@ export { default as Info } from "./Info";
3
3
  export { default as Action } from "./Action";
4
4
  export { default as ExternalInfo } from "./ExternalInfo";
5
5
  export { default as Location } from "./Location";
6
- export { default as MessageWithSession } from "./MessageWithSession";
7
- export { default as InfoTarget } from "./InfoTarget";
6
+ export { default as MessageWithSession } from "./MessageWithSession";
@@ -36,16 +36,32 @@ export default class Session {
36
36
  return sessionStatus === SessionStatus.BLOCKED;
37
37
  }
38
38
 
39
- static isInactiveChannel(replyStatus) {
40
- return replyStatus === SessionReplyStatus.CHANNEL_INACTIVE;
39
+ static isOnProgress(sessionStatus) {
40
+ return sessionStatus === SessionStatus.ON_PROGRESS;
41
+ }
42
+
43
+ static isHold(sessionStatus) {
44
+ return sessionStatus === SessionStatus.ON_HOLD;
41
45
  }
42
46
 
43
47
  static isOpen(sessionStatus) {
44
48
  return sessionStatus === SessionStatus.OPEN;
45
49
  }
46
50
 
47
- static isCreated(sessionStatus) {
48
- return sessionStatus === SessionStatus.CREATED;
51
+ static isInactiveChannel(replyStatus) {
52
+ return replyStatus === SessionReplyStatus.CHANNEL_INACTIVE;
53
+ }
54
+
55
+ static isChannelDeleted(replyStatus) {
56
+ return replyStatus === SessionReplyStatus.CHANNEL_DELETED;
57
+ }
58
+
59
+ static isReplyAccepted(replyStatus) {
60
+ return replyStatus === SessionReplyStatus.ACCEPTED;
61
+ }
62
+
63
+ static isEndUserOffline(replyStatus) {
64
+ return replyStatus === SessionReplyStatus.ENDUSER_OFFLINE;
49
65
  }
50
66
 
51
67
  static isAssignedToOtherService(replyStatus) {
@@ -1,7 +1,7 @@
1
1
  const ActorType = {
2
2
  AGENT: 'AGENT',
3
3
  BOT: 'BOT',
4
- ENDUSER: 'ENDUSER',
4
+ ENDUSER: 'END_USER',
5
5
  SYSTEM: 'SYSTEM'
6
6
  };
7
7
  export default ActorType;
@@ -1,7 +1,5 @@
1
1
  const AttachmentStatus = {
2
2
  VALID: 'VALID',
3
- // NO I18N
4
- INVALID: 'INVALID' // NO I18N
5
-
3
+ INVALID: 'INVALID'
6
4
  };
7
5
  export default AttachmentStatus;
@@ -1,6 +1,6 @@
1
1
  const MessageDirection = {
2
- OUT: 'OUT',
3
- IN: 'IN'
2
+ OUT: 'out',
3
+ IN: 'in'
4
4
  }; // For im api need to changes this as out and in
5
5
 
6
6
  export default MessageDirection;
@@ -6,6 +6,10 @@ const MessageTypes = {
6
6
  LAYOUT: 'LAYOUT',
7
7
  EXTERNAL_INFO: 'EXTERNAL_INFO',
8
8
  TEMPLATE: 'TEMPLATE',
9
- ACTION: 'ACTION'
9
+ ACTION: 'ACTION',
10
+ WELCOMEMSG: 'WELCOMEMSG',
11
+ WORKFLOW_MESSAGE: 'WORKFLOW_MESSAGE',
12
+ WORKFLOW_NOTIFICATION: 'WORKFLOW_NOTIFICATION',
13
+ CX_HAPPINESS_SURVEY: 'CX_HAPPINESS_SURVEY'
10
14
  };
11
15
  export default MessageTypes;
@@ -7,5 +7,4 @@ import ExternalInfoAction from "./ExternalInfoAction";
7
7
  import InfoSessionStatus from "./InfoSessionStatus";
8
8
  import InfoAction from "./InfoAction";
9
9
  import ActionSubType from "./ActionSubType";
10
- import InfoTargetType from "./InfoTargetType";
11
- export { MessageTypes, MessageStatus, MessageDirection, MessageContentType, ActionType, ActionSubType, ExternalInfoAction, InfoSessionStatus, InfoAction, InfoTargetType };
10
+ export { MessageTypes, MessageStatus, MessageDirection, MessageContentType, ActionType, ActionSubType, ExternalInfoAction, InfoSessionStatus, InfoAction };
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable no-unused-vars */
2
2
  import { ModuleNames } from "../../../../core/constants";
3
3
  import BaseAPI from "../../../../infrastructure/api/BaseAPI";
4
- import { getMessagesRequest, deleteMessageRequest, getFullContentRequest, resendMessageRequest, sendAttachmentRequest, sendMessageRequest, initiateSessionRequest, searchMessagesRequest } from "../../../dto";
4
+ import { getMessagesRequest, getMessageRequest, deleteMessageRequest, getFullContentRequest, resendMessageRequest, sendAttachmentRequest, sendMessageRequest, initiateSessionRequest, searchMessagesRequest } from "../../../dto";
5
5
  export default class IMessageRepository extends BaseAPI {
6
6
  constructor() {
7
7
  super({
@@ -14,6 +14,11 @@ export default class IMessageRepository extends BaseAPI {
14
14
  throw new Error('Method not implemented.');
15
15
  }
16
16
 
17
+ getMessage() {
18
+ let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getMessageRequest();
19
+ throw new Error('Method not implemented.');
20
+ }
21
+
17
22
  getFullContent() {
18
23
  let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getFullContentRequest();
19
24
  throw new Error('Method not implemented.');
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable no-unused-vars */
2
2
  import { ModuleNames } from "../../../../core/constants";
3
3
  import BaseAPI from "../../../../infrastructure/api/BaseAPI";
4
- import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest, pickupSessionRequest } from "../../../dto";
4
+ import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest } from "../../../dto";
5
5
  export default class ISessionRepository extends BaseAPI {
6
6
  constructor() {
7
7
  super({
@@ -9,11 +9,6 @@ export default class ISessionRepository extends BaseAPI {
9
9
  });
10
10
  }
11
11
 
12
- pickupSession() {
13
- let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : pickupSessionRequest();
14
- throw new Error('Method not implemented.');
15
- }
16
-
17
12
  updateAssignee() {
18
13
  let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : updateSessionAssigneeRequest();
19
14
  throw new Error('Method not implemented.');
@@ -107,6 +107,10 @@ const MessageSchema = {
107
107
  article: {
108
108
  type: 'object',
109
109
  required: false
110
+ },
111
+ webUrl: {
112
+ type: 'string',
113
+ required: false
110
114
  }
111
115
  };
112
116
  export default MessageSchema;
@@ -4,5 +4,4 @@ import ExternalInfoSchema from "./ExternalInfoSchema";
4
4
  import InfoSchema from "./InfoSchema";
5
5
  import LocationSchema from "./LocationSchema";
6
6
  import MessageWithSessionSchema from "./MessageWithSessionSchema";
7
- import InfoTargetSchema from "./InfoTargetSchema";
8
- export { MessageSchema, ActionSchema, ExternalInfoSchema, InfoSchema, LocationSchema, MessageWithSessionSchema, InfoTargetSchema };
7
+ export { MessageSchema, ActionSchema, ExternalInfoSchema, InfoSchema, LocationSchema, MessageWithSessionSchema };
@@ -2,6 +2,7 @@ import { ResponseTypes } from "../../core/constants";
2
2
  import { ResponseUtils } from "../../core/utils";
3
3
  import configRegistry from "../config/configRegistry";
4
4
  import { getRegistryConfig } from "./registry";
5
+ import UrlBuilder from "./UrlBuilder";
5
6
  export default class BaseAPI {
6
7
  constructor() {
7
8
  let {
@@ -9,78 +10,30 @@ export default class BaseAPI {
9
10
  configProvider = configRegistry,
10
11
  registryProvider = {
11
12
  getRegistryConfig
12
- }
13
+ },
14
+ urlBuilder = new UrlBuilder()
13
15
  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
14
16
  this.configProvider = configProvider;
15
17
  this.registryProvider = registryProvider;
16
18
  this.httpClient = this.configProvider.getHttpClient();
17
19
  this.baseURL = this.configProvider.getBaseURL();
18
20
  this.module = module;
21
+ this.urlBuilder = urlBuilder;
19
22
  }
20
23
 
21
- replacePathParams(url, params) {
22
- let _url = url;
23
- Object.entries(params).forEach(_ref => {
24
- let [key, value] = _ref;
25
- _url = url.replace(`:${key}`, value);
26
- });
27
- return _url;
28
- }
29
-
30
- buildUrl(_ref2) {
31
- let {
32
- url,
33
- params,
34
- query
35
- } = _ref2;
36
-
37
- const _params = params || {};
38
-
39
- const _query = query || {};
40
-
41
- let _url = this.replacePathParams(url, _params);
42
-
43
- if (this.baseURL) {
44
- _url = `${this.baseURL}${_url}`;
45
- }
46
-
47
- const queryString = this.buildQuery(_query);
48
-
49
- if (queryString) {
50
- return `${_url}?${queryString}`;
51
- }
52
-
53
- return _url;
54
- }
55
-
56
- buildQuery(query) {
57
- const filteredQuery = Object.entries(query).filter(_ref3 => {
58
- let [, value] = _ref3;
59
- return value !== undefined && value !== null && value !== '';
60
- }).reduce((acc, _ref4) => {
61
- let [key, value] = _ref4;
62
- acc[key] = value;
63
- return acc;
64
- }, {});
65
- return Object.entries(filteredQuery).map(_ref5 => {
66
- let [key, value] = _ref5;
67
- return `${key}=${value}`;
68
- }).join('&');
69
- }
70
-
71
- async request(_ref6) {
24
+ async request(_ref) {
72
25
  let {
73
26
  request,
74
27
  operation,
75
28
  header
76
- } = _ref6;
29
+ } = _ref;
77
30
  const config = this.registryProvider.getRegistryConfig(this.module, operation);
78
31
 
79
32
  if (!config) {
80
33
  throw new Error(`Operation "${operation}" not found in registry for module "${this.module}"`);
81
34
  }
82
35
 
83
- const url = this.buildUrl({
36
+ const url = this.urlBuilder.buildUrl({
84
37
  url: config.endpoint,
85
38
  params: request.params || {},
86
39
  query: request.query || {}
@@ -116,16 +69,12 @@ export default class BaseAPI {
116
69
  }
117
70
 
118
71
  isMethodOverridden(customAPI, methodName) {
119
- if (!customAPI) {
120
- return false;
121
- }
122
-
123
72
  const customPrototype = Object.getPrototypeOf(customAPI);
124
73
  return typeof customAPI[methodName] === 'function' && // Method is defined directly on custom prototype
125
74
  Object.prototype.hasOwnProperty.call(customPrototype, methodName);
126
75
  }
127
76
 
128
- async executeAPICall(_ref7) {
77
+ async executeAPICall(_ref2) {
129
78
  let {
130
79
  operation,
131
80
  request,
@@ -133,7 +82,7 @@ export default class BaseAPI {
133
82
  customAPI,
134
83
  adapter,
135
84
  responseType = ResponseTypes.SINGLE
136
- } = _ref7;
85
+ } = _ref2;
137
86
  const response = await apiProxy[operation](request);
138
87
  const isOverridden = this.isMethodOverridden(customAPI, operation);
139
88
 
@@ -0,0 +1,53 @@
1
+ export default class UrlBuilder {
2
+ constructor(baseURL) {
3
+ this.baseURL = baseURL;
4
+ }
5
+
6
+ replacePathParams(url, params) {
7
+ let processedUrl = url;
8
+ Object.entries(params).forEach(_ref => {
9
+ let [key, value] = _ref;
10
+ processedUrl = processedUrl.replace(`:${key}`, value);
11
+ });
12
+ return processedUrl;
13
+ }
14
+
15
+ buildUrl(_ref2) {
16
+ let {
17
+ url,
18
+ params,
19
+ query
20
+ } = _ref2;
21
+ const paramsObj = params || {};
22
+ const queryObj = query || {};
23
+ let processedUrl = this.replacePathParams(url, paramsObj);
24
+
25
+ if (this.baseURL) {
26
+ processedUrl = `${this.baseURL}${processedUrl}`;
27
+ }
28
+
29
+ const queryString = this.buildQuery(queryObj);
30
+
31
+ if (queryString) {
32
+ return `${processedUrl}?${queryString}`;
33
+ }
34
+
35
+ return processedUrl;
36
+ }
37
+
38
+ buildQuery(query) {
39
+ const filteredQuery = Object.entries(query).filter(_ref3 => {
40
+ let [, value] = _ref3;
41
+ return value !== undefined && value !== null && value !== '';
42
+ }).reduce((acc, _ref4) => {
43
+ let [key, value] = _ref4;
44
+ acc[key] = value;
45
+ return acc;
46
+ }, {});
47
+ return Object.entries(filteredQuery).map(_ref5 => {
48
+ let [key, value] = _ref5;
49
+ return `${key}=${value}`;
50
+ }).join('&');
51
+ }
52
+
53
+ }
@@ -1,4 +1,4 @@
1
- import { getMessagesRequest, deleteMessageRequest, getFullContentRequest, resendMessageRequest, sendAttachmentRequest, sendMessageRequest, initiateSessionRequest, searchMessagesRequest } from "../../../domain/dto";
1
+ import { getMessagesRequest, deleteMessageRequest, getFullContentRequest, resendMessageRequest, sendAttachmentRequest, sendMessageRequest, initiateSessionRequest, searchMessagesRequest, getMessageRequest } from "../../../domain/dto";
2
2
  import { IMessageRepository } from "../../../domain/interfaces/repositories";
3
3
  export default class MessageAPI extends IMessageRepository {
4
4
  async getMessages() {
@@ -11,6 +11,16 @@ export default class MessageAPI extends IMessageRepository {
11
11
  return httpRequest;
12
12
  }
13
13
 
14
+ async getMessage() {
15
+ let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getMessageRequest();
16
+ const operation = 'getMessage';
17
+ const httpRequest = await this.request({
18
+ operation,
19
+ request
20
+ });
21
+ return httpRequest;
22
+ }
23
+
14
24
  async getFullContent() {
15
25
  let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getFullContentRequest();
16
26
  const operation = 'getFullContent';
@@ -8,8 +8,7 @@ function getBots() {
8
8
  }
9
9
 
10
10
  function getBot() {
11
- return createAPIRegistry(constructBotEndPoint('/:botId'), // NO I18N
12
- HTTP_METHODS.GET, getBotRequest());
11
+ return createAPIRegistry(constructBotEndPoint('/:botId'), HTTP_METHODS.GET, getBotRequest());
13
12
  }
14
13
 
15
14
  export default {
@@ -4,7 +4,7 @@ import createAPIRegistry from "../createAPIRegistry";
4
4
  import constructChannelEndPoint from "./constructChannelEndPoint";
5
5
 
6
6
  function getAgents() {
7
- return createAPIRegistry(constructChannelEndPoint('/:channelId/agents'), HTTP_METHODS.GET, getChannelAgentsRequest());
7
+ return createAPIRegistry(constructChannelEndPoint('/:channelId/subscribers'), HTTP_METHODS.GET, getChannelAgentsRequest());
8
8
  }
9
9
 
10
10
  export default {
@@ -1,5 +1,5 @@
1
1
  import { HTTP_METHODS } from "../../../../core/constants";
2
- import { deleteMessageRequest, getFullContentRequest, getMessagesRequest, initiateSessionRequest, resendMessageRequest, sendAttachmentRequest, sendMessageRequest, searchMessagesRequest } from "../../../../domain/dto";
2
+ import { deleteMessageRequest, getFullContentRequest, getMessagesRequest, initiateSessionRequest, resendMessageRequest, sendAttachmentRequest, sendMessageRequest, searchMessagesRequest, getMessageRequest } from "../../../../domain/dto";
3
3
  import constructChannelEndPoint from "../channels/constructChannelEndPoint";
4
4
  import constructMessageEndPoint from "./constructMessageEndPoint";
5
5
  import createAPIRegistry from "../createAPIRegistry";
@@ -17,6 +17,10 @@ function getMessages() {
17
17
  return createAPIRegistry(constructMessageEndPoint(MESSAGES_URL), HTTP_METHODS.GET, getMessagesRequest());
18
18
  }
19
19
 
20
+ function getMessage() {
21
+ return createAPIRegistry(constructMessageEndPoint(SINGLE_MESSAGE_URL), HTTP_METHODS.GET, getMessageRequest());
22
+ }
23
+
20
24
  function getFullContent() {
21
25
  return createAPIRegistry(constructMessageEndPoint(FULL_CONTENT_URL), HTTP_METHODS.GET, getFullContentRequest());
22
26
  }
@@ -47,6 +51,7 @@ function searchMessages() {
47
51
 
48
52
  export default {
49
53
  getMessages,
54
+ getMessage,
50
55
  getFullContent,
51
56
  sendMessage,
52
57
  sendAttachment,
@@ -1,16 +1,11 @@
1
1
  import { HTTP_METHODS } from "../../../../core/constants";
2
- import { updateSessionAssigneeRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, getSessionRequest, getSessionsRequest, markSessionAsReadRequest, updateSessionStatusRequest, pickupSessionRequest } from "../../../../domain/dto";
2
+ import { updateSessionAssigneeRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, getSessionRequest, getSessionsRequest, markSessionAsReadRequest, updateSessionStatusRequest } from "../../../../domain/dto";
3
3
  import createAPIRegistry from "../createAPIRegistry";
4
4
  import constructSessionEndPoint from "./constructSessionEndPoint";
5
5
  const SINGLE_SESSION_URL = '/:sessionId';
6
6
  const SESSION_ATTACHMENTS_URL = `${SINGLE_SESSION_URL}/attachments`;
7
7
  const SESSION_LAST_MESSAGE = '/lastMessages';
8
8
  const MARK_AS_READ = `${SINGLE_SESSION_URL}/markAsRead`;
9
- const PICKUP_SESSION = `${SINGLE_SESSION_URL}/pickup`;
10
-
11
- function pickupSession() {
12
- return createAPIRegistry(constructSessionEndPoint(PICKUP_SESSION), HTTP_METHODS.POST, pickupSessionRequest());
13
- }
14
9
 
15
10
  function updateAssignee() {
16
11
  return createAPIRegistry(constructSessionEndPoint(SINGLE_SESSION_URL), HTTP_METHODS.PATCH, updateSessionAssigneeRequest());
@@ -47,6 +42,5 @@ export default {
47
42
  getSessionAttachments,
48
43
  getSessionLastMessages,
49
44
  markSessionAsRead,
50
- updateSessionStatus,
51
- pickupSession
45
+ updateSessionStatus
52
46
  };
@@ -1,16 +1,6 @@
1
- import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest, pickupSessionRequest } from "../../../domain/dto";
1
+ import { updateSessionAssigneeRequest, getSessionsRequest, getSessionRequest, getSessionAttachmentsRequest, getSessionLastMessagesRequest, markSessionAsReadRequest, updateSessionStatusRequest } from "../../../domain/dto";
2
2
  import { ISessionRepository } from "../../../domain/interfaces/repositories";
3
3
  export default class SessionAPI extends ISessionRepository {
4
- async pickupSession() {
5
- let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : pickupSessionRequest();
6
- const operation = 'pickupSession';
7
- const httpRequest = await this.request({
8
- request,
9
- operation
10
- });
11
- return httpRequest;
12
- }
13
-
14
4
  async updateAssignee() {
15
5
  let request = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : updateSessionAssigneeRequest();
16
6
  const operation = 'updateAssignee';
@@ -43,6 +43,13 @@ export default class MessageRepository extends IMessageRepository {
43
43
  });
44
44
  }
45
45
 
46
+ async getMessage(request) {
47
+ return this.invokeAPI({
48
+ operation: 'getMessage',
49
+ request
50
+ });
51
+ }
52
+
46
53
  async getFullContent(request) {
47
54
  return this.invokeAPI({
48
55
  operation: 'getFullContent',
@@ -98,6 +105,7 @@ export default class MessageRepository extends IMessageRepository {
98
105
  toJSON() {
99
106
  return {
100
107
  getMessages: this.getMessages.bind(this),
108
+ getMessage: this.getMessage.bind(this),
101
109
  getFullContent: this.getFullContent.bind(this),
102
110
  sendMessage: this.sendMessage.bind(this),
103
111
  sendAttachment: this.sendAttachment.bind(this),
@@ -36,13 +36,6 @@ export default class SessionRepository extends ISessionRepository {
36
36
  });
37
37
  }
38
38
 
39
- async pickupSession(request) {
40
- return this.invokeAPI({
41
- operation: 'pickupSession',
42
- request
43
- });
44
- }
45
-
46
39
  async updateAssignee(request) {
47
40
  return this.invokeAPI({
48
41
  operation: 'updateAssignee',
@@ -99,7 +92,6 @@ export default class SessionRepository extends ISessionRepository {
99
92
 
100
93
  toJSON() {
101
94
  return {
102
- pickupSession: this.pickupSession.bind(this),
103
95
  updateAssignee: this.updateAssignee.bind(this),
104
96
  getSessions: this.getSessions.bind(this),
105
97
  getSession: this.getSession.bind(this),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zohoim/client-sdk",
3
- "version": "1.0.0-poc90",
3
+ "version": "1.0.0-poc91",
4
4
  "description": "To have the client sdk for the IM",
5
5
  "main": "es/index.js",
6
6
  "module": "es/index.js",
@@ -1,9 +0,0 @@
1
- import RequestBuilder from "../RequestBuilder";
2
-
3
- function pickupSessionRequest() {
4
- return new RequestBuilder().withParams({
5
- sessionId: null
6
- }).build();
7
- }
8
-
9
- export default pickupSessionRequest;
@@ -1,22 +0,0 @@
1
- import { validateSchema } from "../../../core/utils";
2
- import { InfoTargetSchema } from "../../schema/message";
3
- export default class InfoTarget {
4
- constructor() {
5
- let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
6
- const validatedData = validateSchema(InfoTargetSchema, data);
7
- this.data = {
8
- id: validatedData.id,
9
- name: validatedData.name || null,
10
- photoURL: validatedData.photoURL || null,
11
- email: validatedData.email || null,
12
- isReplyAllowed: validatedData.isReplyAllowed,
13
- type: validatedData.type
14
- };
15
- }
16
-
17
- toJSON() {
18
- return { ...this.data
19
- };
20
- }
21
-
22
- }
@@ -1,7 +0,0 @@
1
- const InfoTargetType = {
2
- AGENT: 'AGENT',
3
- BOT: 'BOT',
4
- END_USER: 'END_USER',
5
- SESSION: 'SESSION'
6
- };
7
- export default InfoTargetType;
@@ -1,29 +0,0 @@
1
- import { InfoTargetType } from "../../enum";
2
- const InfoTargetSchema = {
3
- id: {
4
- type: 'string',
5
- required: true
6
- },
7
- email: {
8
- type: 'string',
9
- required: false
10
- },
11
- photoURL: {
12
- type: 'string',
13
- required: false
14
- },
15
- name: {
16
- type: 'string',
17
- required: false
18
- },
19
- isReplyAllowed: {
20
- type: 'boolean',
21
- required: false
22
- },
23
- type: {
24
- type: 'string',
25
- required: true,
26
- enum: Object.values(InfoTargetType)
27
- }
28
- };
29
- export default InfoTargetSchema;