feat(auth) remove external auth mechanisms

JitsiConference.js

@@ -855,34 +855,6 @@ JitsiConference.prototype.getAuthLogin = function() {
     return this.authIdentity;
 };
 
-/**
- * Check if external authentication is enabled for this conference.
- */
-JitsiConference.prototype.isExternalAuthEnabled = function() {
-    return this.room && this.room.xmpp.moderator.isExternalAuthEnabled();
-};
-
-/**
- * Get url for external authentication.
- * @param {boolean} [urlForPopup] if true then return url for login popup,
- *                                else url of login page.
- * @returns {Promise}
- */
-JitsiConference.prototype.getExternalAuthUrl = function(urlForPopup) {
-    return new Promise((resolve, reject) => {
-        if (!this.isExternalAuthEnabled()) {
-            reject();
-
-            return;
-        }
-        if (urlForPopup) {
-            this.room.xmpp.moderator.getPopupLoginUrl(this.room.roomjid, resolve, reject);
-        } else {
-            this.room.xmpp.moderator.getLoginUrl(this.room.roomjid, resolve, reject);
-        }
-    });
-};
-
 /**
  * Returns the local tracks of the given media type, or all local tracks if no
  * specific type is given.

JitsiMeetJS.ts

@@ -27,7 +27,6 @@ import Settings from './modules/settings/Settings';
 import LocalStatsCollector from './modules/statistics/LocalStatsCollector';
 import precallTest from './modules/statistics/PrecallTest';
 import Statistics from './modules/statistics/statistics';
-import AuthUtil from './modules/util/AuthUtil';
 import GlobalOnErrorHandler from './modules/util/GlobalOnErrorHandler';
 import ScriptUtil from './modules/util/ScriptUtil';
 import * as VideoSIPGWConstants from './modules/videosipgw/VideoSIPGWConstants';
@@ -559,7 +558,6 @@ export default {
      * interest to lib-jitsi-meet clients.
      */
     util: {
-        AuthUtil,
         ScriptUtil,
         browser
     }

modules/util/AuthUtil.js

@@ -1,35 +0,0 @@
-const AuthUtil = {
-    /**
-     * Creates the URL pointing to JWT token authentication service. It is
-     * formatted from the 'urlPattern' argument which can contain the following
-     * constants:
-     * '{room}' - name of the conference room passed as <tt>roomName</tt>
-     * argument to this method.
-     * '{roleUpgrade}' - will contain 'true' if the URL will be used for
-     * the role upgrade scenario, where user connects from anonymous domain and
-     * then gets upgraded to the moderator by logging-in from the popup window.
-     *
-     * @param urlPattern a URL pattern pointing to the login service
-     * @param roomName the name of the conference room for which the user will
-     * be authenticated
-     * @param {boolean} roleUpgrade <tt>true</tt> if the URL will be used for role
-     * upgrade scenario, where the user logs-in from the popup window in order
-     * to have the moderator rights granted
-     *
-     * @returns {string|null} the URL pointing to JWT login service or
-     * <tt>null</tt> if 'urlPattern' is not a string and the URL can not be
-     * constructed.
-     */
-    getTokenAuthUrl(urlPattern, roomName, roleUpgrade) {
-        const url = urlPattern;
-
-        if (typeof url !== 'string') {
-            return null;
-        }
-
-        return url.replace('{room}', roomName)
-            .replace('{roleUpgrade}', roleUpgrade === true);
-    }
-};
-
-module.exports = AuthUtil;

modules/xmpp/moderator.js

@@ -1,7 +1,7 @@
 /* eslint-disable newline-per-chained-call */
 import { getLogger } from '@jitsi/logger';
 import $ from 'jquery';
-import { $iq, Strophe } from 'strophe.js';
+import { $iq } from 'strophe.js';
 
 import { CONNECTION_REDIRECTED } from '../../JitsiConnectionEvents';
 import FeatureFlags from '../flags/FeatureFlags';
@@ -55,9 +55,6 @@ export default class Moderator extends Listenable {
         this.getNextErrorTimeout = createExpBackoffTimer(1000);
         this.options = xmpp.options;
 
-        // External authentication stuff
-        this.externalAuthEnabled = false;
-
         // Whether SIP gateway (jigasi) support is enabled. TODO: use presence so it can be changed based on jigasi
         // availability.
         this.sipGatewayEnabled = false;
@@ -133,14 +130,6 @@ export default class Moderator extends Listenable {
         return false;
     }
 
-    /**
-     * Is external authentication enabled.
-     * @returns {boolean}
-     */
-    isExternalAuthEnabled() {
-        return this.externalAuthEnabled;
-    }
-
     /**
      * Is sip gw enabled.
      * @returns {boolean}
@@ -385,10 +374,7 @@ export default class Moderator extends Listenable {
 
         logger.info(`Authentication enabled: ${authenticationEnabled}`);
 
-        this.externalAuthEnabled = conferenceRequest.properties.externalAuth === 'true';
-        logger.info(`External authentication enabled: ${this.externalAuthEnabled}`);
-
-        if (!this.externalAuthEnabled && conferenceRequest.sessionId) {
+        if (conferenceRequest.sessionId) {
             logger.info(`Received sessionId: ${conferenceRequest.sessionId}`);
             Settings.sessionId = conferenceRequest.sessionId;
         }
@@ -507,13 +493,6 @@ export default class Moderator extends Listenable {
         // Not authorized to create new room
         const notAuthorized = $(error).find('>error>not-authorized').length > 0;
 
-        if (notAuthorized
-            && Strophe.getDomainFromJid(error.getAttribute('to')) !== this.options.hosts.anonymousdomain) {
-            // FIXME "is external" should come either from the focus or
-            // config.js
-            this.externalAuthEnabled = true;
-        }
-
         this._handleError(roomJid, invalidSession, notAuthorized, callback);
     }
 
@@ -568,84 +547,6 @@ export default class Moderator extends Listenable {
         });
     }
 
-    /**
-     * Gets the login URL by requesting it to jicofo.
-     * @param roomJid The room jid to use.
-     * @param urlCallback The success callback.
-     * @param failureCallback The error callback.
-     */
-    getLoginUrl(roomJid, urlCallback, failureCallback) {
-        this._getLoginUrl(roomJid, /* popup */ false, urlCallback, failureCallback);
-    }
-
-    /**
-     * Gets the login URL by requesting it to jicofo.
-     * @param {boolean} popup false for {@link Moderator#getLoginUrl} or true for
-     * {@link Moderator#getPopupLoginUrl}
-     * @param roomJid - The room jid to use.
-     * @param urlCb
-     * @param failureCb
-     */
-    _getLoginUrl(roomJid, popup, urlCb, failureCb) {
-        const iq = $iq({
-            to: this.targetJid,
-            type: 'get'
-        });
-        const attrs = {
-            xmlns: 'http://jitsi.org/protocol/focus',
-            room: roomJid,
-            'machine-uid': Settings.machineId
-        };
-        let str = 'auth url'; // for logger
-
-        if (popup) {
-            attrs.popup = true;
-            str = `POPUP ${str}`;
-        }
-        iq.c('login-url', attrs);
-
-        /**
-         * Implements a failure callback which reports an error message and an error
-         * through (1) GlobalOnErrorHandler, (2) logger, and (3) failureCb.
-         *
-         * @param {string} errmsg the error messsage to report
-         * @param {*} error the error to report (in addition to errmsg)
-         */
-        function reportError(errmsg, err) {
-            GlobalOnErrorHandler.callErrorHandler(new Error(errmsg));
-            logger.error(errmsg, err);
-            failureCb(err);
-        }
-
-        this.connection.sendIQ(
-            iq,
-            result => {
-                let url = $(result)
-                    .find('login-url')
-                    .attr('url');
-
-                url = decodeURIComponent(url);
-                if (url) {
-                    logger.info(`Got ${str}: ${url}`);
-                    urlCb(url);
-                } else {
-                    reportError(`Failed to get ${str} from the focus`, result);
-                }
-            },
-            reportError.bind(undefined, `Get ${str} error`)
-        );
-    }
-
-    /**
-     * Gets the login URL by requesting it to jicofo.
-     * @param roomJid The room jid to use.
-     * @param urlCallback The success callback.
-     * @param failureCallback The error callback.
-     */
-    getPopupLoginUrl(roomJid, urlCallback, failureCallback) {
-        this._getLoginUrl(roomJid, /* popup */ true, urlCallback, failureCallback);
-    }
-
     /**
      * Logout by sending conference IQ.
      * @param callback
@@ -669,16 +570,9 @@ export default class Moderator extends Listenable {
         this.connection.sendIQ(
             iq,
             result => {
-                let logoutUrl = $(result)
-                    .find('logout')
-                    .attr('logout-url');
-
-                if (logoutUrl) {
-                    logoutUrl = decodeURIComponent(logoutUrl);
-                }
-                logger.info(`Log out OK, url: ${logoutUrl}`, result);
+                logger.info('Log out OK', result);
                 Settings.sessionId = undefined;
-                callback(logoutUrl);
+                callback();
             },
             error => {
                 const errmsg = 'Logout error';

types/hand-crafted/JitsiMeetJS.d.ts

@@ -16,7 +16,6 @@ import TrackVADEmitter, { VADProcessor } from './modules/detection/TrackVADEmitt
 import RecordingConstants from './modules/recording/recordingConstants';
 import JitsiLocalTrack from './modules/RTC/JitsiLocalTrack';
 import PrecallTest from './modules/statistics/PrecallTest';
-import AuthUtil from './modules/util/AuthUtil';
 import ScriptUtil from './modules/util/ScriptUtil';
 import { VideoSIPGWConstants } from './modules/videosipgw/VideoSIPGWConstants';
 import AudioMixer from './modules/webaudio/AudioMixer';
@@ -140,7 +139,6 @@ export type JitsiMeetJSType = {
   precallTest: PrecallTest;
 
   util: {
-    AuthUtil: { getTokenAuthUrl: typeof AuthUtil.getTokenAuthUrl },
     ScriptUtil: { loadScript: typeof ScriptUtil.loadScript },
     browser: BrowserCapabilities
   }