From 24fa474abbbf67e890a52d4290255687158b7bbe Mon Sep 17 00:00:00 2001
From: italo <italojmf@gmail.com>
Date: Wed, 31 Jan 2018 18:12:27 +0000
Subject: [PATCH] Few variable name fixes and logic for external-id missing
---
bbb-webhooks/callback_emitter.js | 9 ++++-----
bbb-webhooks/config.js | 2 +-
bbb-webhooks/messageMapping.js | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/bbb-webhooks/callback_emitter.js b/bbb-webhooks/callback_emitter.js
index 43a6c015d9..11416774cb 100644
--- a/bbb-webhooks/callback_emitter.js
+++ b/bbb-webhooks/callback_emitter.js
@@ -19,8 +19,7 @@ module.exports = class CallbackEmitter extends EventEmitter {
this.callbackURL = callbackURL;
this.message = message;
this.nextInterval = 0;
- this.timestap = 0;
- this.permanent = false;
+ this.timestamp = 0;
this.permanent = permanent;
}
@@ -47,9 +46,9 @@ module.exports = class CallbackEmitter extends EventEmitter {
// no intervals anymore, time to give up
} else {
- this.nextInterval = !this.permanent ? 0 : config.hooks.permanentIntervalReset; // Reset interval to permanent hooks
+ this.nextInterval = config.hooks.permanentIntervalReset; // Reset interval to permanent hooks
if(this.permanent){
- this._scheduleNext(interval);
+ this._scheduleNext(this.nextInterval);
}
else {
return this.emit("stopped");
@@ -63,7 +62,7 @@ module.exports = class CallbackEmitter extends EventEmitter {
_emitMessage(callback) {
let data,requestOptions;
-
+
if (config.bbb.auth2_0) {
// Send data as a JSON
data = "[" + this.message + "]";
diff --git a/bbb-webhooks/config.js b/bbb-webhooks/config.js
index 8c547b5dbf..80845f1fc9 100644
--- a/bbb-webhooks/config.js
+++ b/bbb-webhooks/config.js
@@ -42,7 +42,7 @@ config.hooks.retryIntervals = [
];
// Reset permanent interval when exceeding maximum attemps
-config.hooks.permanentURLsIntervalReset = 8;
+config.hooks.permanentIntervalReset = 8;
// Mappings of internal to external meeting IDs
config.mappings = {};
diff --git a/bbb-webhooks/messageMapping.js b/bbb-webhooks/messageMapping.js
index 92357cf541..f79d9410b9 100644
--- a/bbb-webhooks/messageMapping.js
+++ b/bbb-webhooks/messageMapping.js
@@ -93,7 +93,7 @@ module.exports = class MessageMapping {
},
"user":{
"internal-user-id": msgHeader.userId,
- "external-user-id": extId,
+ "external-user-id": extId ? extId : "",
"sharing-mic": msgBody.muted,
"name": msgBody.name,
"role": msgBody.role,
--
GitLab