From 8d4c2f00f95fb17b1ef6a20ff1bbb8703db51c28 Mon Sep 17 00:00:00 2001 From: cwsmith Date: Mon, 26 Sep 2022 13:52:31 -0400 Subject: [PATCH 1/5] Update lockfile --- app.json | 2 +- package-lock.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app.json b/app.json index 5a8fc5d..6052f5d 100644 --- a/app.json +++ b/app.json @@ -19,5 +19,5 @@ "IPostLivechatRoomClosed", "IUIKitLivechatInteractionHandler" ], - "commitHash": "69de13511e790a02257140867ae181511241c394" + "commitHash": "b447f82fa635eb76438a67b340a339dd35f3f8c6" } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 6701bdd..84dfe10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,8 +103,8 @@ } }, "@rocket.chat/apps-engine": { - "version": "github:WideChat/Rocket.Chat.Apps-engine#ec330e8c6f76c75f1b3f17618123f1448ba658a4", - "from": "github:WideChat/Rocket.Chat.Apps-engine#v1.31.0.widechat-2", + "version": "git+ssh://git@github.com/WideChat/Rocket.Chat.Apps-engine.git#ec330e8c6f76c75f1b3f17618123f1448ba658a4", + "from": "@rocket.chat/apps-engine@WideChat/Rocket.Chat.Apps-engine.git#v1.31.0.widechat-2", "dev": true, "requires": { "adm-zip": "^0.4.9", From 528c451c63da5d63408bb8e1b0db8bc3f56cbcca Mon Sep 17 00:00:00 2001 From: cwsmith Date: Mon, 26 Sep 2022 13:53:22 -0400 Subject: [PATCH 2/5] Lint fix --- lib/Room.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Room.ts b/lib/Room.ts index cba0a50..774c6b9 100644 --- a/lib/Room.ts +++ b/lib/Room.ts @@ -69,8 +69,8 @@ export const updateRoomCustomFields = async (rid: string, data: IRoomCustomField export const updateRoomSNSData = async (read: IRead, modify: IModify, rid: string, data: Record, isLog = false): Promise => { const customFields = await getRoomCustomFields(rid, read); if (customFields) { - const snsData = Object.assign({}, (customFields.sns || {}) as Record) ; - const logData = Object.assign({}, snsData.logData || {}) + const snsData = Object.assign({}, (customFields.sns || {}) as Record); + const logData = Object.assign({}, snsData.logData || {}); if (isLog) { snsData.logData = Object.assign(logData, data); } else { From 6ed0f38a72fe87e2a745b67aa4165fcf9c11d919 Mon Sep 17 00:00:00 2001 From: cwsmith Date: Mon, 7 Nov 2022 12:43:30 -0500 Subject: [PATCH 3/5] Add DISPLAY_OKTA to EndpointActionNames --- enum/Endpoints.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/enum/Endpoints.ts b/enum/Endpoints.ts index 843d103..68ebf9e 100644 --- a/enum/Endpoints.ts +++ b/enum/Endpoints.ts @@ -15,4 +15,5 @@ export enum EndpointActionNames { HANDOVER = 'handover', TRIGGER_EVENT = 'trigger-event', SEND_MESSAGE = 'send-message', + DISPLAY_OKTA = 'display-okta', } From 17eabdd583d65daadaf268c152c75c3d64dc6bfd Mon Sep 17 00:00:00 2001 From: cwsmith Date: Mon, 7 Nov 2022 13:54:56 -0500 Subject: [PATCH 4/5] Add DISPLAY_OKTA payload action handler --- enum/ActionIds.ts | 1 + enum/Endpoints.ts | 1 - lib/payloadAction.ts | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/enum/ActionIds.ts b/enum/ActionIds.ts index d16c5fd..556373e 100644 --- a/enum/ActionIds.ts +++ b/enum/ActionIds.ts @@ -5,4 +5,5 @@ export enum ActionIds { SET_TIMEOUT = 'df_set_timeout', CHANGE_LANGUAGE_CODE = 'change_language_code', DROP_QUEUE = 'drop_queue', + DISPLAY_OKTA = 'display_okta', } diff --git a/enum/Endpoints.ts b/enum/Endpoints.ts index 68ebf9e..843d103 100644 --- a/enum/Endpoints.ts +++ b/enum/Endpoints.ts @@ -15,5 +15,4 @@ export enum EndpointActionNames { HANDOVER = 'handover', TRIGGER_EVENT = 'trigger-event', SEND_MESSAGE = 'send-message', - DISPLAY_OKTA = 'display-okta', } diff --git a/lib/payloadAction.ts b/lib/payloadAction.ts index d6ddb69..f04f41b 100644 --- a/lib/payloadAction.ts +++ b/lib/payloadAction.ts @@ -132,6 +132,16 @@ export const handlePayloadActions = async ( await setIsQueueWindowActive(read, persistence, rid, false); await setQueuedMessage(read, persistence, rid, ''); console.debug({ rid }, 'Queue Window dropped'); + } else if (actionName === ActionIds.DISPLAY_OKTA) { + /* add/update display_okta custom field */ + const livechatRoom = (await read.getRoomReader().getById(rid)) as ILivechatRoom; + if (!livechatRoom) { + throw new Error(Logs.INVALID_ROOM_ID); + } + const { creator } = livechatRoom; + const modifier = await modify.getUpdater().room(rid, creator); + const builder = await modifier.addCustomField('display_okta', { display_okta: true }); + await modify.getUpdater().finish(builder); } } } From b2f9b08aa7554ce9ebe975f7fa0d4bc753cd0d62 Mon Sep 17 00:00:00 2001 From: Cam Smith <27293306+csmith14@users.noreply.github.com> Date: Thu, 8 Dec 2022 08:48:56 -0500 Subject: [PATCH 5/5] update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 6052f5d..8c7d139 100644 --- a/app.json +++ b/app.json @@ -19,5 +19,5 @@ "IPostLivechatRoomClosed", "IUIKitLivechatInteractionHandler" ], - "commitHash": "b447f82fa635eb76438a67b340a339dd35f3f8c6" + "commitHash": "6ed0f38a72fe87e2a745b67aa4165fcf9c11d919" } \ No newline at end of file