Merge pull request #262 from jitsi/not-allowed-error

Not allowed error

JitsiConferenceErrors.js

@@ -22,6 +22,11 @@ export const CONFERENCE_MAX_USERS = "conference.max_users";
  * Indicates that a connection error occurred when trying to join a conference.
  */
 export const CONNECTION_ERROR = "conference.connectionError";
+/**
+ * Indicates that a connection error is due to not allowed,
+ * occurred when trying to join a conference.
+ */
+export const NOT_ALLOWED_ERROR = "conference.connectionError.notAllowed";
 /**
  * Indicates that focus error happened.
  */

JitsiConferenceEventManager.js

@@ -118,6 +118,9 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function () {
     this.chatRoomForwarder.forward(XMPPEvents.ROOM_CONNECT_ERROR,
         JitsiConferenceEvents.CONFERENCE_FAILED,
         JitsiConferenceErrors.CONNECTION_ERROR);
+    this.chatRoomForwarder.forward(XMPPEvents.ROOM_CONNECT_NOT_ALLOWED_ERROR,
+        JitsiConferenceEvents.CONFERENCE_FAILED,
+        JitsiConferenceErrors.NOT_ALLOWED_ERROR);
 
     this.chatRoomForwarder.forward(XMPPEvents.ROOM_MAX_USERS_ERROR,
         JitsiConferenceEvents.CONFERENCE_FAILED,

modules/xmpp/ChatRoom.js

@@ -579,19 +579,19 @@ ChatRoom.prototype.onPresenceError = function (pres, from) {
             // result in reconnection from authorized domain.
             // We're either missing Jicofo/Prosody config for anonymous
             // domains or something is wrong.
-            this.eventEmitter.emit(XMPPEvents.ROOM_JOIN_ERROR, pres);
+            this.eventEmitter.emit(XMPPEvents.ROOM_JOIN_ERROR);
 
         } else {
             logger.warn('onPresError ', pres);
-            this.eventEmitter.emit(XMPPEvents.ROOM_CONNECT_ERROR, pres);
+            this.eventEmitter.emit(XMPPEvents.ROOM_CONNECT_NOT_ALLOWED_ERROR);
         }
     } else if($(pres).find('>error>service-unavailable').length) {
         logger.warn('Maximum users limit for the room has been reached',
             pres);
-        this.eventEmitter.emit(XMPPEvents.ROOM_MAX_USERS_ERROR, pres);
+        this.eventEmitter.emit(XMPPEvents.ROOM_MAX_USERS_ERROR);
     } else {
         logger.warn('onPresError ', pres);
-        this.eventEmitter.emit(XMPPEvents.ROOM_CONNECT_ERROR, pres);
+        this.eventEmitter.emit(XMPPEvents.ROOM_CONNECT_ERROR);
     }
 };
 

service/xmpp/XMPPEvents.js

@@ -135,6 +135,7 @@ var XMPPEvents = {
     REMOTE_TRACK_REMOVED: "xmpp.remote_track_removed",
     RESERVATION_ERROR: "xmpp.room_reservation_error",
     ROOM_CONNECT_ERROR: 'xmpp.room_connect_error',
+    ROOM_CONNECT_NOT_ALLOWED_ERROR: 'xmpp.room_connect_error.not_allowed',
     ROOM_JOIN_ERROR: 'xmpp.room_join_error',
     /**
      * Indicates that max users limit has been reached.