浏览代码

added method to only authenticate user in the room

master
isymchych 9 年前
父节点
当前提交
013ee849f7
共有 3 个文件被更改,包括 38 次插入8 次删除
  1. 2
    2
      JitsiConference.js
  2. 19
    4
      lib-jitsi-meet.js
  3. 17
    2
      modules/xmpp/moderator.js

+ 2
- 2
JitsiConference.js 查看文件

330
 
330
 
331
   var conference = this;
331
   var conference = this;
332
   return new Promise(function (resolve, reject) {
332
   return new Promise(function (resolve, reject) {
333
-    conference.xmpp.lockRoom(password, function () {
333
+    conference.room.lockRoom(password || "", function () {
334
       resolve();
334
       resolve();
335
     }, function (err) {
335
     }, function (err) {
336
       reject(err);
336
       reject(err);
345
  * @returns {Promise}
345
  * @returns {Promise}
346
  */
346
  */
347
 JitsiConference.prototype.unlock = function () {
347
 JitsiConference.prototype.unlock = function () {
348
-  return this.lock(undefined);
348
+  return this.lock();
349
 };
349
 };
350
 
350
 
351
 /**
351
 /**

+ 19
- 4
lib-jitsi-meet.js 查看文件

332
 
332
 
333
   var conference = this;
333
   var conference = this;
334
   return new Promise(function (resolve, reject) {
334
   return new Promise(function (resolve, reject) {
335
-    conference.xmpp.lockRoom(password, function () {
335
+    conference.room.lockRoom(password || "", function () {
336
       resolve();
336
       resolve();
337
     }, function (err) {
337
     }, function (err) {
338
       reject(err);
338
       reject(err);
347
  * @returns {Promise}
347
  * @returns {Promise}
348
  */
348
  */
349
 JitsiConference.prototype.unlock = function () {
349
 JitsiConference.prototype.unlock = function () {
350
-  return this.lock(undefined);
350
+  return this.lock();
351
 };
351
 };
352
 
352
 
353
 /**
353
 /**
10530
 }).call(this,"/modules/xmpp/TraceablePeerConnection.js")
10530
 }).call(this,"/modules/xmpp/TraceablePeerConnection.js")
10531
 },{"../../service/xmpp/XMPPEvents":87,"../RTC/RTC":16,"../RTC/RTCBrowserType.js":17,"./LocalSSRCReplacement":29,"jitsi-meet-logger":48,"sdp-interop":66,"sdp-simulcast":69,"sdp-transform":76}],34:[function(require,module,exports){
10531
 },{"../../service/xmpp/XMPPEvents":87,"../RTC/RTC":16,"../RTC/RTCBrowserType.js":17,"./LocalSSRCReplacement":29,"jitsi-meet-logger":48,"sdp-interop":66,"sdp-simulcast":69,"sdp-transform":76}],34:[function(require,module,exports){
10532
 (function (__filename){
10532
 (function (__filename){
10533
-/* global $, $iq, APP, config, messageHandler,
10534
- roomName, sessionTerminated, Strophe, Util */
10533
+/* global $, $iq, Promise, Strophe */
10535
 
10534
 
10536
 var logger = require("jitsi-meet-logger").getLogger(__filename);
10535
 var logger = require("jitsi-meet-logger").getLogger(__filename);
10537
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
10536
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
10886
     );
10885
     );
10887
 };
10886
 };
10888
 
10887
 
10888
+Moderator.prototype.authenticate = function () {
10889
+    var self = this;
10890
+    return new Promise(function (resolve, reject) {
10891
+        self.connection.sendIQ(
10892
+            self.createConferenceIq(),
10893
+            function (result) {
10894
+                self.parseSessionId(result);
10895
+                resolve();
10896
+            }, function (error) {
10897
+                var code = $(error).find('>error').attr('code');
10898
+                reject(error, code);
10899
+            }
10900
+        );
10901
+    });
10902
+};
10903
+
10889
 Moderator.prototype.getLoginUrl =  function (urlCallback, failureCallback) {
10904
 Moderator.prototype.getLoginUrl =  function (urlCallback, failureCallback) {
10890
     var iq = $iq({to: this.getFocusComponent(), type: 'get'});
10905
     var iq = $iq({to: this.getFocusComponent(), type: 'get'});
10891
     iq.c('login-url', {
10906
     iq.c('login-url', {

+ 17
- 2
modules/xmpp/moderator.js 查看文件

1
-/* global $, $iq, APP, config, messageHandler,
2
- roomName, sessionTerminated, Strophe, Util */
1
+/* global $, $iq, Promise, Strophe */
3
 
2
 
4
 var logger = require("jitsi-meet-logger").getLogger(__filename);
3
 var logger = require("jitsi-meet-logger").getLogger(__filename);
5
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
4
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
354
     );
353
     );
355
 };
354
 };
356
 
355
 
356
+Moderator.prototype.authenticate = function () {
357
+    var self = this;
358
+    return new Promise(function (resolve, reject) {
359
+        self.connection.sendIQ(
360
+            self.createConferenceIq(),
361
+            function (result) {
362
+                self.parseSessionId(result);
363
+                resolve();
364
+            }, function (error) {
365
+                var code = $(error).find('>error').attr('code');
366
+                reject(error, code);
367
+            }
368
+        );
369
+    });
370
+};
371
+
357
 Moderator.prototype.getLoginUrl =  function (urlCallback, failureCallback) {
372
 Moderator.prototype.getLoginUrl =  function (urlCallback, failureCallback) {
358
     var iq = $iq({to: this.getFocusComponent(), type: 'get'});
373
     var iq = $iq({to: this.getFocusComponent(), type: 'get'});
359
     iq.c('login-url', {
374
     iq.c('login-url', {

正在加载...
取消
保存