From a6625281d5ab97ab87a1857475334d2b75ea7c3a Mon Sep 17 00:00:00 2001 From: Indico Team Date: Wed, 17 Mar 2021 11:40:49 +0100 Subject: [PATCH] Remove vc_vidyo plugin --- _meta/setup.cfg | 1 - vc_vidyo/MANIFEST.in | 6 - vc_vidyo/indico_vc_vidyo/__init__.py | 17 - vc_vidyo/indico_vc_vidyo/api/__init__.py | 11 - vc_vidyo/indico_vc_vidyo/api/cache.py | 27 -- vc_vidyo/indico_vc_vidyo/api/client.py | 119 ------- vc_vidyo/indico_vc_vidyo/blueprint.py | 23 -- vc_vidyo/indico_vc_vidyo/cli.py | 38 -- vc_vidyo/indico_vc_vidyo/client/index.js | 34 -- vc_vidyo/indico_vc_vidyo/controllers.py | 29 -- vc_vidyo/indico_vc_vidyo/forms.py | 73 ---- vc_vidyo/indico_vc_vidyo/http_api.py | 56 --- .../indico_vc_vidyo/migrations/.no-headers | 0 ...0170630_1611_6019621fea50_create_tables.py | 34 -- vc_vidyo/indico_vc_vidyo/models/__init__.py | 0 .../models/vidyo_extensions.py | 74 ---- vc_vidyo/indico_vc_vidyo/plugin.py | 330 ------------------ .../indico_vc_vidyo/static/images/logo.png | Bin 9992 -> 0 bytes .../static/images/vidyo_logo_notext.png | Bin 5174 -> 0 bytes vc_vidyo/indico_vc_vidyo/task.py | 73 ---- .../indico_vc_vidyo/templates/buttons.html | 21 -- .../templates/emails/created.html | 16 - .../templates/emails/deleted.html | 1 - .../templates/emails/remote_deleted.html | 16 - .../templates/event_buttons.html | 7 - .../indico_vc_vidyo/templates/info_box.html | 37 -- .../templates/manage_event_info_box.html | 55 --- .../templates/management_buttons.html | 7 - .../templates/vc_room_timetable_buttons.html | 8 - .../fr_FR/LC_MESSAGES/messages-js.po | 23 -- .../fr_FR/LC_MESSAGES/messages.po | 282 --------------- .../indico_vc_vidyo/translations/messages.pot | 280 --------------- vc_vidyo/indico_vc_vidyo/util.py | 92 ----- vc_vidyo/setup.cfg | 31 -- vc_vidyo/setup.py | 11 - vc_vidyo/tests/task_test.py | 68 ---- vc_vidyo/webpack-bundles.json | 5 - 37 files changed, 1905 deletions(-) delete mode 100644 vc_vidyo/MANIFEST.in delete mode 100644 vc_vidyo/indico_vc_vidyo/__init__.py delete mode 100644 vc_vidyo/indico_vc_vidyo/api/__init__.py delete mode 100644 vc_vidyo/indico_vc_vidyo/api/cache.py delete mode 100644 vc_vidyo/indico_vc_vidyo/api/client.py delete mode 100644 vc_vidyo/indico_vc_vidyo/blueprint.py delete mode 100644 vc_vidyo/indico_vc_vidyo/cli.py delete mode 100644 vc_vidyo/indico_vc_vidyo/client/index.js delete mode 100644 vc_vidyo/indico_vc_vidyo/controllers.py delete mode 100644 vc_vidyo/indico_vc_vidyo/forms.py delete mode 100644 vc_vidyo/indico_vc_vidyo/http_api.py delete mode 100644 vc_vidyo/indico_vc_vidyo/migrations/.no-headers delete mode 100644 vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py delete mode 100644 vc_vidyo/indico_vc_vidyo/models/__init__.py delete mode 100644 vc_vidyo/indico_vc_vidyo/models/vidyo_extensions.py delete mode 100644 vc_vidyo/indico_vc_vidyo/plugin.py delete mode 100644 vc_vidyo/indico_vc_vidyo/static/images/logo.png delete mode 100644 vc_vidyo/indico_vc_vidyo/static/images/vidyo_logo_notext.png delete mode 100644 vc_vidyo/indico_vc_vidyo/task.py delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/buttons.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/emails/created.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/emails/deleted.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/emails/remote_deleted.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/event_buttons.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/info_box.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/manage_event_info_box.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/management_buttons.html delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/vc_room_timetable_buttons.html delete mode 100644 vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages-js.po delete mode 100644 vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages.po delete mode 100644 vc_vidyo/indico_vc_vidyo/translations/messages.pot delete mode 100644 vc_vidyo/indico_vc_vidyo/util.py delete mode 100644 vc_vidyo/setup.cfg delete mode 100644 vc_vidyo/setup.py delete mode 100644 vc_vidyo/tests/task_test.py delete mode 100644 vc_vidyo/webpack-bundles.json diff --git a/_meta/setup.cfg b/_meta/setup.cfg index 7980927..99e7207 100644 --- a/_meta/setup.cfg +++ b/_meta/setup.cfg @@ -30,6 +30,5 @@ install_requires = indico-plugin-previewer-jupyter>=3.0.dev0,<3.1.dev0 indico-plugin-storage-s3>=3.0.dev0,<3.1.dev0 indico-plugin-ursh>=3.0.dev0,<3.1.dev0 - indico-plugin-vc-vidyo>=3.0.dev0,<3.1.dev0 indico-plugin-vc-zoom>=3.0.dev0,<3.1.dev0 # END GENERATED REQUIREMENTS diff --git a/vc_vidyo/MANIFEST.in b/vc_vidyo/MANIFEST.in deleted file mode 100644 index 39d195b..0000000 --- a/vc_vidyo/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -graft indico_vc_vidyo/static -graft indico_vc_vidyo/migrations -graft indico_vc_vidyo/templates -graft indico_vc_vidyo/translations - -global-exclude *.pyc __pycache__ .keep diff --git a/vc_vidyo/indico_vc_vidyo/__init__.py b/vc_vidyo/indico_vc_vidyo/__init__.py deleted file mode 100644 index 5dd5cb6..0000000 --- a/vc_vidyo/indico_vc_vidyo/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from indico.core import signals -from indico.util.i18n import make_bound_gettext - - -_ = make_bound_gettext('vc_vidyo') - - -@signals.import_tasks.connect -def _import_tasks(sender, **kwargs): - import indico_vc_vidyo.task # noqa: F401 diff --git a/vc_vidyo/indico_vc_vidyo/api/__init__.py b/vc_vidyo/indico_vc_vidyo/api/__init__.py deleted file mode 100644 index 0d54b1d..0000000 --- a/vc_vidyo/indico_vc_vidyo/api/__init__.py +++ /dev/null @@ -1,11 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from .client import AdminClient, APIException, RoomNotFoundAPIException, UserClient - - -__all__ = ['UserClient', 'AdminClient', 'APIException', 'RoomNotFoundAPIException'] diff --git a/vc_vidyo/indico_vc_vidyo/api/cache.py b/vc_vidyo/indico_vc_vidyo/api/cache.py deleted file mode 100644 index 83f83dd..0000000 --- a/vc_vidyo/indico_vc_vidyo/api/cache.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from zeep.cache import Base - -from indico.core.cache import make_scoped_cache - - -DEFAULT_CACHE_TTL = 24 * 3600 - - -class ZeepCache(Base): - _instance = None - - def __init__(self, duration=DEFAULT_CACHE_TTL): - self._cache = make_scoped_cache('zeep') - self._duration = duration - - def get(self, url): - self._cache.get(url) - - def add(self, url, content): - self._cache.set(url, content, timeout=self._duration) diff --git a/vc_vidyo/indico_vc_vidyo/api/client.py b/vc_vidyo/indico_vc_vidyo/api/client.py deleted file mode 100644 index 9e729fe..0000000 --- a/vc_vidyo/indico_vc_vidyo/api/client.py +++ /dev/null @@ -1,119 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from requests import Session -from requests.auth import HTTPBasicAuth -from zeep import Client -from zeep.exceptions import Fault -from zeep.transports import Transport - -from indico_vc_vidyo.api.cache import ZeepCache - - -DEFAULT_CLIENT_TIMEOUT = 30 -AUTOMUTE_API_PROFILE = "NoAudioAndVideo" - - -class APIException(Exception): - pass - - -class RoomNotFoundAPIException(APIException): - pass - - -def raises_api_error(wrapped): - def _wrapper(*args, **kwargs): - try: - return wrapped(*args, **kwargs) - except Fault as err: - err_msg = err.message - if err_msg.startswith('Room not found for roomID') or 'Invalid roomID' in err_msg: - raise RoomNotFoundAPIException() - else: - raise APIException(err_msg) - return _wrapper - - -class ClientBase: - def __init__(self, wsdl, settings): - session = Session() - transport = Transport(session=session, cache=ZeepCache()) - session.auth = HTTPBasicAuth(settings.get('username'), settings.get('password')) - self.client = Client(wsdl, transport=transport) - self.factory = self.client.type_factory('ns0') - - @property - def soap(self): - return self.client.service - - -class UserClient(ClientBase): - def __init__(self, settings): - super().__init__(settings.get('user_api_wsdl'), settings) - - -class AdminClient(ClientBase): - def __init__(self, settings): - super().__init__(settings.get('admin_api_wsdl'), settings) - - def create_room_object(self, **kwargs): - return self.factory.Room(**kwargs) - - @raises_api_error - def find_room(self, extension): - from indico_vc_vidyo.plugin import VidyoPlugin - filter_ = { - 'query': extension, - 'limit': 40, - 'dir': 'DESC' - } - counter = 0 - - while True: - filter_['start'] = counter * filter_['limit'] - response = self.soap.getRooms(filter_) - if not response.total: - return None - for room in response.room: - if int(room.extension) == int(extension): - VidyoPlugin.logger.debug('Room: %s has been found.', room) - return room - else: - VidyoPlugin.logger.debug('Dismissing room extension %s', room.extension) - counter += 1 - - @raises_api_error - def get_room(self, vidyo_id): - return self.soap.getRoom(roomID=vidyo_id) - - @raises_api_error - def add_room(self, room_obj): - self.soap.addRoom(room=room_obj) - - @raises_api_error - def update_room(self, room_id, room_obj): - self.soap.updateRoom(roomID=room_id, room=room_obj) - - @raises_api_error - def delete_room(self, room_id): - self.soap.deleteRoom(roomID=room_id) - - @raises_api_error - def get_automute(self, room_id): - answer = self.soap.getRoomProfile(roomID=room_id) - if answer: - return answer.roomProfileName == AUTOMUTE_API_PROFILE - else: - return False - - @raises_api_error - def set_automute(self, room_id, status): - if status: - self.soap.setRoomProfile(roomID=room_id, roomProfileName=AUTOMUTE_API_PROFILE) - else: - self.soap.removeRoomProfile(roomID=room_id) diff --git a/vc_vidyo/indico_vc_vidyo/blueprint.py b/vc_vidyo/indico_vc_vidyo/blueprint.py deleted file mode 100644 index 73dc46b..0000000 --- a/vc_vidyo/indico_vc_vidyo/blueprint.py +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from indico.core.plugins import IndicoPluginBlueprint - -from indico_vc_vidyo.controllers import RHVidyoRoomOwner - - -blueprint = IndicoPluginBlueprint('vc_vidyo', 'indico_vc_vidyo') - -# Room management -# using any(vidyo) instead of defaults since the event vc room locator -# includes the service and normalization skips values provided in 'defaults' -blueprint.add_url_rule( - '/event//manage/videoconference///room-owner', - 'set_room_owner', - RHVidyoRoomOwner, - methods=('POST',) -) diff --git a/vc_vidyo/indico_vc_vidyo/cli.py b/vc_vidyo/indico_vc_vidyo/cli.py deleted file mode 100644 index aadd383..0000000 --- a/vc_vidyo/indico_vc_vidyo/cli.py +++ /dev/null @@ -1,38 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -import click -from terminaltables import AsciiTable - -from indico.cli.core import cli_group -from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomStatus - - -@cli_group(name='vidyo') -def cli(): - """Manage the Vidyo plugin.""" - - -@cli.command() -@click.option('--status', type=click.Choice(['deleted', 'created'])) -def rooms(status=None): - """Lists all Vidyo rooms""" - - room_query = VCRoom.query.filter_by(type='vidyo') - table_data = [['ID', 'Name', 'Status', 'Vidyo ID', 'Extension']] - - if status: - room_query = room_query.filter(VCRoom.status == VCRoomStatus.get(status)) - - for room in room_query: - table_data.append([str(room.id), room.name, room.status.name, - str(room.data['vidyo_id']), str(room.vidyo_extension.extension)]) - - table = AsciiTable(table_data) - for col in (0, 3, 4): - table.justify_columns[col] = 'right' - print(table.table) diff --git a/vc_vidyo/indico_vc_vidyo/client/index.js b/vc_vidyo/indico_vc_vidyo/client/index.js deleted file mode 100644 index 0707b50..0000000 --- a/vc_vidyo/indico_vc_vidyo/client/index.js +++ /dev/null @@ -1,34 +0,0 @@ -// This file is part of the Indico plugins. -// Copyright (C) 2002 - 2021 CERN -// -// The Indico plugins are free software; you can redistribute -// them and/or modify them under the terms of the MIT License; -// see the LICENSE file for more details. - -$(function() { - $('.vc-toolbar').dropdown({ - positioning: { - level1: {my: 'right top', at: 'right bottom', offset: '0px 0px'}, - }, - }); - - $('.vc-toolbar .action-make-owner').click(function() { - const $this = $(this); - - $.ajax({ - url: $this.data('href'), - method: 'POST', - complete: IndicoUI.Dialogs.Util.progress(), - }) - .done(function(result) { - if (handleAjaxError(result)) { - return; - } else { - location.reload(); - } - }) - .fail(function(error) { - handleAjaxError(error); - }); - }); -}); diff --git a/vc_vidyo/indico_vc_vidyo/controllers.py b/vc_vidyo/indico_vc_vidyo/controllers.py deleted file mode 100644 index e02f9e9..0000000 --- a/vc_vidyo/indico_vc_vidyo/controllers.py +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from flask import flash, jsonify, session - -from indico.core.db import db -from indico.modules.vc.controllers import RHVCSystemEventBase -from indico.modules.vc.exceptions import VCRoomError -from indico.util.i18n import _ - - -class RHVidyoRoomOwner(RHVCSystemEventBase): - def _process(self): - result = {} - self.vc_room.vidyo_extension.owned_by_user = session.user - try: - self.plugin.update_room(self.vc_room, self.event) - except VCRoomError as err: - result['error'] = {'message': err.message} - result['success'] = False - db.session.rollback() - else: - flash(_("You are now the owner of the room '{room}'").format(room=self.vc_room.name), 'success') - result['success'] = True - return jsonify(result) diff --git a/vc_vidyo/indico_vc_vidyo/forms.py b/vc_vidyo/indico_vc_vidyo/forms.py deleted file mode 100644 index 9f6c7cb..0000000 --- a/vc_vidyo/indico_vc_vidyo/forms.py +++ /dev/null @@ -1,73 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from wtforms.fields.core import BooleanField -from wtforms.fields.simple import TextAreaField -from wtforms.validators import DataRequired, Length, Optional, Regexp, ValidationError - -from indico.modules.vc.forms import VCRoomAttachFormBase, VCRoomFormBase -from indico.web.forms.base import generated_data -from indico.web.forms.fields import IndicoPasswordField, PrincipalField -from indico.web.forms.widgets import SwitchWidget - -from indico_vc_vidyo import _ -from indico_vc_vidyo.util import iter_user_identities, retrieve_principal - - -PIN_VALIDATORS = [Optional(), Length(min=3, max=10), Regexp(r'^\d+$', message=_("The PIN must be a number"))] - - -class VidyoAdvancedFormMixin: - # Advanced options (per event) - show_pin = BooleanField(_('Show PIN'), - widget=SwitchWidget(), - description=_("Show the VC Room PIN on the event page (insecure!)")) - show_autojoin = BooleanField(_('Show Auto-join URL'), - widget=SwitchWidget(), - description=_("Show the auto-join URL on the event page")) - show_phone_numbers = BooleanField(_('Show Phone Access numbers'), - widget=SwitchWidget(), - description=_("Show a link to the list of phone access numbers")) - - -class VCRoomAttachForm(VCRoomAttachFormBase, VidyoAdvancedFormMixin): - pass - - -class VCRoomForm(VCRoomFormBase, VidyoAdvancedFormMixin): - """Contains all information concerning a Vidyo booking""" - - advanced_fields = {'show_pin', 'show_autojoin', 'show_phone_numbers'} | VCRoomFormBase.advanced_fields - skip_fields = advanced_fields | VCRoomFormBase.conditional_fields - - description = TextAreaField(_('Description'), [DataRequired()], description=_('The description of the room')) - owner_user = PrincipalField(_('Owner'), [DataRequired()], description=_('The owner of the room')) - moderation_pin = IndicoPasswordField(_('Moderation PIN'), PIN_VALIDATORS, toggle=True, - description=_('Used to moderate the VC Room. Only digits allowed.')) - room_pin = IndicoPasswordField(_('Room PIN'), PIN_VALIDATORS, toggle=True, - description=_('Used to protect the access to the VC Room (leave blank for open ' - 'access). Only digits allowed.')) - auto_mute = BooleanField(_('Auto mute'), - widget=SwitchWidget(), - description=_('The VidyoDesktop clients will join the VC room muted by default ' - '(audio and video)')) - - def __init__(self, *args, **kwargs): - defaults = kwargs['obj'] - if defaults.owner_user is None and defaults.owner is not None: - defaults.owner_user = retrieve_principal(defaults.owner) - super().__init__(*args, **kwargs) - - @generated_data - def owner(self): - return self.owner_user.data.as_principal - - def validate_owner_user(self, field): - if not field.data: - raise ValidationError(_("Unable to find this user in Indico.")) - if not next(iter_user_identities(field.data), None): - raise ValidationError(_("This user does not have a suitable account to use Vidyo.")) diff --git a/vc_vidyo/indico_vc_vidyo/http_api.py b/vc_vidyo/indico_vc_vidyo/http_api.py deleted file mode 100644 index 661cff4..0000000 --- a/vc_vidyo/indico_vc_vidyo/http_api.py +++ /dev/null @@ -1,56 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from flask import request - -from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomStatus -from indico.web.http_api.hooks.base import HTTPAPIHook - - -class DeleteVCRoomAPI(HTTPAPIHook): - PREFIX = 'api' - TYPES = ('deletevcroom',) - RE = r'vidyo' - GUEST_ALLOWED = False - VALID_FORMATS = ('json',) - COMMIT = True - HTTP_POST = True - - def _has_access(self, user): - from indico_vc_vidyo.plugin import VidyoPlugin - return user in VidyoPlugin.settings.acls.get('managers') - - def _getParams(self): - super()._getParams() - self._room_ids = list(map(int, request.form.getlist('rid'))) - - def api_deletevcroom(self, user): - from indico_vc_vidyo.api import APIException - from indico_vc_vidyo.plugin import VidyoPlugin - - success = [] - failed = [] - not_in_db = [] - - for rid in self._room_ids: - room = VCRoom.query.filter(VCRoom.type == 'vidyo', - VCRoom.status == VCRoomStatus.created, - VCRoom.data.contains({'vidyo_id': str(rid)})).first() - if not room: - not_in_db.append(rid) - continue - try: - room.plugin.delete_room(room, None) - except APIException: - failed.append(rid) - VidyoPlugin.logger.exception('Could not delete VC room %s', room) - else: - room.status = VCRoomStatus.deleted - success.append(rid) - VidyoPlugin.logger.info('%s deleted', room) - - return {'success': success, 'failed': failed, 'missing': not_in_db} diff --git a/vc_vidyo/indico_vc_vidyo/migrations/.no-headers b/vc_vidyo/indico_vc_vidyo/migrations/.no-headers deleted file mode 100644 index e69de29..0000000 diff --git a/vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py b/vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py deleted file mode 100644 index 504c0ef..0000000 --- a/vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py +++ /dev/null @@ -1,34 +0,0 @@ -"""Create tables - -Revision ID: 6019621fea50 -Revises: -Create Date: 2017-06-30 16:11:31.486845 -""" - -import sqlalchemy as sa -from alembic import op -from sqlalchemy.sql.ddl import CreateSchema, DropSchema - - -# revision identifiers, used by Alembic. -revision = '6019621fea50' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - op.execute(CreateSchema('plugin_vc_vidyo')) - op.create_table('vidyo_extensions', - sa.Column('vc_room_id', sa.Integer(), nullable=False), - sa.Column('extension', sa.BigInteger(), nullable=True, index=True), - sa.Column('owned_by_id', sa.Integer(), nullable=False, index=True), - sa.ForeignKeyConstraint(['owned_by_id'], ['users.users.id']), - sa.ForeignKeyConstraint(['vc_room_id'], ['events.vc_rooms.id']), - sa.PrimaryKeyConstraint('vc_room_id'), - schema='plugin_vc_vidyo') - - -def downgrade(): - op.drop_table('vidyo_extensions', schema='plugin_vc_vidyo') - op.execute(DropSchema('plugin_vc_vidyo')) diff --git a/vc_vidyo/indico_vc_vidyo/models/__init__.py b/vc_vidyo/indico_vc_vidyo/models/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/vc_vidyo/indico_vc_vidyo/models/vidyo_extensions.py b/vc_vidyo/indico_vc_vidyo/models/vidyo_extensions.py deleted file mode 100644 index cd06bd9..0000000 --- a/vc_vidyo/indico_vc_vidyo/models/vidyo_extensions.py +++ /dev/null @@ -1,74 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from urllib.parse import urlencode - -from sqlalchemy.event import listens_for -from sqlalchemy.orm.attributes import flag_modified - -from indico.core.db.sqlalchemy import db - - -class VidyoExtension(db.Model): - __tablename__ = 'vidyo_extensions' - __table_args__ = {'schema': 'plugin_vc_vidyo'} - - #: ID of the videoconference room - vc_room_id = db.Column( - db.Integer, - db.ForeignKey('events.vc_rooms.id'), - primary_key=True - ) - extension = db.Column( - db.BigInteger, - index=True - ) - owned_by_id = db.Column( - db.Integer, - db.ForeignKey('users.users.id'), - index=True, - nullable=False - ) - vc_room = db.relationship( - 'VCRoom', - lazy=False, - backref=db.backref( - 'vidyo_extension', - cascade='all, delete-orphan', - uselist=False, - lazy=False - ) - ) - - #: The user who owns the Vidyo room - owned_by_user = db.relationship( - 'User', - lazy=True, - backref=db.backref( - 'vc_rooms_vidyo', - lazy='dynamic' - ) - ) - - @property - def join_url(self): - from indico_vc_vidyo.plugin import VidyoPlugin - url = self.vc_room.data['url'] - custom_url_tpl = VidyoPlugin.settings.get('client_chooser_url') - if custom_url_tpl: - return custom_url_tpl + '?' + urlencode({'url': url}) - return url - - def __repr__(self): - return f'' - - -@listens_for(VidyoExtension.owned_by_user, 'set') -def _owned_by_user_set(target, user, *unused): - if target.vc_room and user.as_principal != tuple(target.vc_room.data['owner']): - target.vc_room.data['owner'] = user.as_principal - flag_modified(target.vc_room, 'data') diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py deleted file mode 100644 index 6c28e4e..0000000 --- a/vc_vidyo/indico_vc_vidyo/plugin.py +++ /dev/null @@ -1,330 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from flask import session -from sqlalchemy.orm.attributes import flag_modified -from wtforms.fields import IntegerField, TextAreaField -from wtforms.fields.html5 import EmailField, URLField -from wtforms.fields.simple import StringField -from wtforms.validators import DataRequired, NumberRange - -from indico.core import signals -from indico.core.auth import multipass -from indico.core.config import config -from indico.core.plugins import IndicoPlugin, url_for_plugin -from indico.modules.events.views import WPSimpleEventDisplay -from indico.modules.vc import VCPluginMixin, VCPluginSettingsFormBase -from indico.modules.vc.exceptions import VCRoomError, VCRoomNotFoundError -from indico.modules.vc.views import WPVCEventPage, WPVCManageEvent -from indico.web.forms.fields import IndicoPasswordField -from indico.web.forms.widgets import CKEditorWidget -from indico.web.http_api.hooks.base import HTTPAPIHook - -from indico_vc_vidyo import _ -from indico_vc_vidyo.api import AdminClient, APIException, RoomNotFoundAPIException -from indico_vc_vidyo.blueprint import blueprint -from indico_vc_vidyo.cli import cli -from indico_vc_vidyo.forms import VCRoomAttachForm, VCRoomForm -from indico_vc_vidyo.http_api import DeleteVCRoomAPI -from indico_vc_vidyo.models.vidyo_extensions import VidyoExtension -from indico_vc_vidyo.util import iter_extensions, iter_user_identities, retrieve_principal, update_room_from_obj - - -class PluginSettingsForm(VCPluginSettingsFormBase): - support_email = EmailField(_('Vidyo email support')) - username = StringField(_('Username'), [DataRequired()], description=_('Indico username for Vidyo')) - password = IndicoPasswordField(_('Password'), [DataRequired()], toggle=True, - description=_('Indico password for Vidyo')) - admin_api_wsdl = URLField(_('Admin API WSDL URL'), [DataRequired()]) - user_api_wsdl = URLField(_('User API WSDL URL'), [DataRequired()]) - indico_room_prefix = IntegerField(_('Indico tenant prefix'), [NumberRange(min=0)], - description=_('The tenant prefix for Indico rooms created on this server')) - room_group_name = StringField(_("Public rooms' group name"), [DataRequired()], - description=_('Group name for public videoconference rooms created by Indico')) - authenticators = StringField(_('Authenticators'), [DataRequired()], - description=_('Identity providers to convert Indico users to Vidyo accounts')) - num_days_old = IntegerField(_('VC room age threshold'), [NumberRange(min=1), DataRequired()], - description=_('Number of days after an Indico event when a videoconference room is ' - 'considered old')) - max_rooms_warning = IntegerField(_('Max. num. VC rooms before warning'), [NumberRange(min=1), DataRequired()], - description=_('Maximum number of rooms until a warning is sent to the managers')) - vidyo_phone_link = URLField(_('VidyoVoice phone number'), - description=_('Link to the list of VidyoVoice phone numbers')) - client_chooser_url = URLField(_('Client Chooser URL'), - description=_("URL for client chooser interface. The room key will be passed as a " - "'url' GET query argument")) - creation_email_footer = TextAreaField(_('Creation email footer'), widget=CKEditorWidget(), - description=_('Footer to append to emails sent upon creation of a VC room')) - - -class VidyoPlugin(VCPluginMixin, IndicoPlugin): - """Vidyo - - Videoconferencing with Vidyo - """ - configurable = True - settings_form = PluginSettingsForm - vc_room_form = VCRoomForm - vc_room_attach_form = VCRoomAttachForm - friendly_name = 'Vidyo' - - def init(self): - super().init() - self.connect(signals.plugin.cli, self._extend_indico_cli) - self.inject_bundle('main.js', WPSimpleEventDisplay) - self.inject_bundle('main.js', WPVCEventPage) - self.inject_bundle('main.js', WPVCManageEvent) - HTTPAPIHook.register(DeleteVCRoomAPI) - - @property - def default_settings(self): - return dict(VCPluginMixin.default_settings, **{ - 'support_email': config.SUPPORT_EMAIL, - 'username': 'indico', - 'password': None, - 'admin_api_wsdl': 'https://yourvidyoportal/services/v1_1/VidyoPortalAdminService?wsdl', - 'user_api_wsdl': 'https://yourvidyoportal/services/v1_1/VidyoPortalUserService?wsdl', - 'indico_room_prefix': 10, - 'room_group_name': 'Indico', - # we skip identity providers in the default list if they don't support get_identity. - # these providers (local accounts, oauth) are unlikely be the correct ones to integrate - # with the vidyo infrastructure. - 'authenticators': ', '.join(p.name for p in multipass.identity_providers.values() if p.supports_get), - 'num_days_old': 365, - 'max_rooms_warning': 5000, - 'vidyo_phone_link': None, - 'creation_email_footer': None, - 'client_chooser_url': None - }) - - @property - def logo_url(self): - return url_for_plugin(self.name + '.static', filename='images/logo.png') - - @property - def icon_url(self): - return url_for_plugin(self.name + '.static', filename='images/vidyo_logo_notext.png') - - def _extend_indico_cli(self, sender, **kwargs): - return cli - - def update_data_association(self, event, vc_room, event_vc_room, data): - super().update_data_association(event, vc_room, event_vc_room, data) - - event_vc_room.data.update({key: data.pop(key) for key in [ - 'show_pin', - 'show_autojoin', - 'show_phone_numbers' - ]}) - - flag_modified(event_vc_room, 'data') - - def update_data_vc_room(self, vc_room, data, is_new=False): - super().update_data_vc_room(vc_room, data, is_new=is_new) - - for key in ['description', 'owner', 'room_pin', 'moderation_pin', 'auto_mute']: - if key in data: - vc_room.data[key] = data.pop(key) - - flag_modified(vc_room, 'data') - - def create_room(self, vc_room, event): - """Create a new Vidyo room for an event, given a VC room. - - In order to create the Vidyo room, the function will try to do so with - all the available identities of the user based on the authenticators - defined in Vidyo plugin's settings, in that order. - - :param vc_room: VCRoom -- The VC room from which to create the Vidyo - room - :param event: Event -- The event to the Vidyo room will be attached - """ - client = AdminClient(self.settings) - owner = retrieve_principal(vc_room.data['owner']) - login_gen = iter_user_identities(owner) - login = next(login_gen, None) - if login is None: - raise VCRoomError(_("No valid Vidyo account found for this user"), field='owner_user') - - extension_gen = iter_extensions(self.settings.get('indico_room_prefix'), event.id) - extension = next(extension_gen) - - while True: - room_mode = { - 'isLocked': False, - 'hasPIN': bool(vc_room.data['room_pin']), - 'hasModeratorPIN': bool(vc_room.data['moderation_pin']) - } - if room_mode['hasPIN']: - room_mode['roomPIN'] = vc_room.data['room_pin'] - if room_mode['hasModeratorPIN']: - room_mode['moderatorPIN'] = vc_room.data['moderation_pin'] - - room_obj = client.create_room_object( - name=vc_room.name, - RoomType='Public', - ownerName=login, - extension=extension, - groupName=self.settings.get('room_group_name'), - description=vc_room.data['description'], - RoomMode=room_mode) - - if room_obj.RoomMode.hasPIN: - room_obj.RoomMode.roomPIN = vc_room.data['room_pin'] - if room_obj.RoomMode.hasModeratorPIN: - room_obj.RoomMode.moderatorPIN = vc_room.data['moderation_pin'] - - try: - client.add_room(room_obj) - except APIException as err: - err_msg = err.message - - if err_msg.startswith('Room exist for name'): - raise VCRoomError(_("Room name already in use"), field='name') - elif err_msg.startswith('Member not found for ownerName'): - login = next(login_gen, None) - if login is None: - raise VCRoomError(_("No valid Vidyo account found for this user"), field='owner_user') - elif err_msg.startswith('Room exist for extension'): - extension = next(extension_gen) - else: - raise - - else: - # get room back, in order to fetch Vidyo-set parameters - created_room = client.find_room(extension) - - if not created_room: - raise VCRoomNotFoundError(_("Could not find newly created room in Vidyo")) - vc_room.data.update({ - 'vidyo_id': str(created_room.roomID), - 'url': created_room.RoomMode.roomURL, - 'owner_identity': created_room.ownerName - }) - flag_modified(vc_room, 'data') - vc_room.vidyo_extension = VidyoExtension(vc_room_id=vc_room.id, extension=int(created_room.extension), - owned_by_user=owner) - - client.set_automute(created_room.roomID, vc_room.data['auto_mute']) - break - - def update_room(self, vc_room, event): - client = AdminClient(self.settings) - - try: - room_obj = self.get_room(vc_room) - except RoomNotFoundAPIException: - raise VCRoomNotFoundError(_("This room has been deleted from Vidyo")) - - owner = retrieve_principal(vc_room.data['owner']) - changed_owner = room_obj.ownerName not in iter_user_identities(owner) - if changed_owner: - login_gen = iter_user_identities(owner) - login = next(login_gen, None) - if login is None: - raise VCRoomError(_("No valid Vidyo account found for this user"), field='owner_user') - room_obj.ownerName = login - - room_obj.name = vc_room.name - room_obj.description = vc_room.data['description'] - - room_obj.RoomMode.hasPIN = bool(vc_room.data['room_pin']) - room_obj.RoomMode.hasModeratorPIN = bool(vc_room.data['moderation_pin']) - - if room_obj.RoomMode.hasPIN: - room_obj.RoomMode.roomPIN = vc_room.data['room_pin'] - if room_obj.RoomMode.hasModeratorPIN: - room_obj.RoomMode.moderatorPIN = vc_room.data['moderation_pin'] - - vidyo_id = vc_room.data['vidyo_id'] - while True: - try: - client.update_room(vidyo_id, room_obj) - except RoomNotFoundAPIException: - raise VCRoomNotFoundError(_("This room has been deleted from Vidyo")) - except APIException as err: - err_msg = err.message - if err_msg.startswith('Room exist for name'): - raise VCRoomError(_("Room name already in use"), field='name') - - elif err_msg.startswith('Member not found for ownerName'): - if changed_owner: - login = next(login_gen, None) - if not changed_owner or login is None: - raise VCRoomError(_("No valid Vidyo account found for this user"), field='owner_user') - room_obj.ownerName = login - - else: - raise - else: - updated_room_obj = self.get_room(vc_room) - - update_room_from_obj(self.settings, vc_room, updated_room_obj) - flag_modified(vc_room, 'data') - - client.set_automute(vidyo_id, vc_room.data['auto_mute']) - break - - def refresh_room(self, vc_room, event): - client = AdminClient(self.settings) - try: - room_obj = self.get_room(vc_room) - except RoomNotFoundAPIException: - raise VCRoomNotFoundError(_("This room has been deleted from Vidyo")) - - update_room_from_obj(self.settings, vc_room, room_obj) - vc_room.data['auto_mute'] = client.get_automute(room_obj.roomID) - flag_modified(vc_room, 'data') - - def delete_room(self, vc_room, event): - client = AdminClient(self.settings) - - vidyo_id = vc_room.data['vidyo_id'] - try: - client.delete_room(vidyo_id) - except RoomNotFoundAPIException: - pass - - def get_room(self, vc_room): - client = AdminClient(self.settings) - return client.get_room(vc_room.data['vidyo_id']) - - def get_blueprints(self): - return blueprint - - def get_vc_room_form_defaults(self, event): - defaults = super().get_vc_room_form_defaults(event) - defaults.update({ - 'auto_mute': True, - 'show_pin': False, - 'show_autojoin': True, - 'show_phone_numbers': True, - 'owner_user': session.user - }) - - return defaults - - def get_vc_room_attach_form_defaults(self, event): - defaults = super().get_vc_room_attach_form_defaults(event) - defaults.update({ - 'show_pin': False, - 'show_autojoin': True, - 'show_phone_numbers': True - }) - return defaults - - def can_manage_vc_room(self, user, room): - return user == room.vidyo_extension.owned_by_user or super().can_manage_vc_room(user, room) - - def _merge_users(self, target, source, **kwargs): - super()._merge_users(target, source, **kwargs) - for ext in VidyoExtension.query.filter_by(owned_by_user=source): - ext.owned_by_user = target - flag_modified(ext.vc_room, 'data') - - def get_notification_cc_list(self, action, vc_room, event): - return {vc_room.vidyo_extension.owned_by_user.email} diff --git a/vc_vidyo/indico_vc_vidyo/static/images/logo.png b/vc_vidyo/indico_vc_vidyo/static/images/logo.png deleted file mode 100644 index 0ae3677a7a85795b408d65c8aeea91b13c83b22f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9992 zcmV+jC->NiP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000~_Nkl#R(8Z9*A5K zugY_{J`oX-s~42vKJW=okV%liiv$D&^pSuNW*Nc|hDgW+na|W+wf9>0kE-sj?$dpy zBzVEI&u=IF>#EwdYwxet@U69XlRi?wRwy3=a15Zk#jsOv&|Rnt;VOnc0pL0Sci=55 zg;56Ap1lkUZd!wuHj6lpQA!dJQN!~UKx8e#Ab{2#<38U2-K7{J(y*0KiW&z>buWvPFSu0h|KhF#u-(XdQ}{1@Ns* zYJLqsI5Hh0WlI3_004gia4~=xo6*iT0L}++AAo~KrevfH7nm~vTmj&Z0QTL2ec2np z9{^knV8@ZE83E>C%h=3ec?7`mnNzkk%4Y#Q4B#996GoEe$AyILf1{uffV|axo&ezAkWy7Uj7;G>8<>*-{2tBd zAN7D43(UM87`0m}MaLXOXnmhT;=fhj_d*(TpFYrusv{Hqb_M1|=#M*;1eo*%Maxck z)vhq3|JMEA9>D)?c8~zLM6iB!3}zac?Y9{)_XlufKk^1J1z^IlwKJ=ZkgTSyM`sSY z90uUvh7V^6o7Ot4e5C{vi~#fP2F%a(uLlz#d>2rtGw0$JK)e(n``_U?8giXMM0okh zZmeGw!`KmEzTJSiNB_VSfZG6yYQOJ&O5rvDWd1um$L?s5!lwc}`NxeTHs;$Dm=pUw zgACwS1Acw&_dS2fWr@lbrH&K=FEMoRZH`46Ey_tt#_LOZ@!X9<)KSPzp0 z;#ENRqlz(ywUOqzKC`7}v6m_9Sbl-4e z$EfO*ayzO36Rjx&QdMUqUJeOBFB)U+Yz7S?f-$D)I--j0#JmDPtg3CQI<5jb(Ka0b z*7VMhm>DM8<_!)Rt?yHGJ~X6fSM>-?D-M`(Ix;+?JX9cRA5y3P!t3wv*G*WByrtcU3EZbj2=Cv9z=hM zqHqoqX&fh)#z}HwV9fk53O}iU8o-efM0HkADPAZdlM?Sx2%|3t)?T7bBv)i@&Cpi{ zzPkErqXK&qV4e3z7UTHx{Nuk9_=kbL0$&71&jUJ+9o+NU@k3YP(ucqeXXm4+?siQ`X0%rqOQ;Fcb9PULXGV?lSzDrd>3K(Vt zY!Dc;IHw*!%+G@u3TjxJoBGlyzRG`Jz?34;x}##&@B5PLTgYrpZK4Vfx<(!$Z&ihZ4osfKOMuw^a&ikVPz%tKg zrZphS?8=lLu-5**5Cs2=i5?8Cy)q1f?@CTh*VloZqrVp(vjHeeKw&m8`%a)`_TXBQ zZeaP@z^ZczJop8VUK30k{Xam|{2l2{)`EsXFg?Vy?F#UTq;irdbBGv*xfED? zb!D!JkT`dYsPqA*G=Yq$ZsSGv1C=E(fr&swD7geZr4pR?2(9^9OBC)Ch2il4R&O5b zKk&6g1Z&JY377&<0L-`y2;V(8LACyOipBdWUjH88)@F23I)EYfqQJ#|JVb72TULP^ zqpP%<2tyxaRlo*}DKjFd*9v8mr*5n<*AbyqR_7wJ7ZmShW>CI1cyWjTFLH#4j55qG z80J4iYhmNOptn>)Pbo$zap*0T01=ovyOIX*qKR_-)`~c8Zc!NnV;Dm@J{f4=Z{VxDA62aQ5n=r;>HSS^yBRJ4q_}7Of%>4#qFu&40Rj+9So7vH zS&RxNHNQptrgq0~5)V7{shBpiCAHBS(@IOMG4~|S9ZEzHMd-XgHex<~AgQJbPMkXi z00LvK2O%yyDA|Nerj#3nm#WNF=z4%U`=4NfLPM`Q&x`CtiHui8!bGnb=0(i(YW748 z=RUL+-unrtvJMTE5r8+F9GlvNz~7kF8Zau*BBFbU$SegW5{XrnP9}cc5IxRBulCcA z=}1#98EGQ;OSX@SFa==JKM!EMtx~M~G4RG^1mBZJe#+xR9^eE^dS>cbum20KdGl}r z2y-VqfWx=B8QZqLijqX|YARyKa-r$#zoGZ9DEUrU9^M{H;(@8#6%Z6mQx4A>b5-K~ zp=BwUcy~--?T;v(xaMuE?CwS85>aA}xvm^tq7*P~-pfNon3l;nm+_fMyj)Die7kHf zQUh2z@rRZYceaS^TD2|H{eOt4(;9Pq6xja_)%Ep*$IM_Nl)V2PKyxz!KL3_kA|mJI zS!-o(%DF4zxWar)@FI^Ap(6`KcmSlT)`?tgjr{^LDX%~waqi2Bb0>-F>^?SdDmlBX zF?Wa7{=^tsRCmTqRJRK%W}p90EifepT6O|jc5ce+;*HA{E6yU6mH`~(q@(~QMvrU9 zf2=rJf4uyQv>}-Yn3NBEWX*nfdgHD*c9-}fFzNlRh6u@_cPNA6|XyO zR*9$!X-G0u)ls=yj;VKaDBrGgUn|DR`T32j@|%E(NP8@Dk{8*}F#jhth(2W3bTd(p zs*bI*Ki6mfcjqN^`5p==Gj*w=1%Or6_VRT^)SJ7`{%!t!sWtSgeR9r!t~XB3&)H|)ku?_( z^W8+$t)deZx|ehQDDVAyMdUku0}KKYK_Lu}P#`MB@h=nak0|#o3hWuy*lP$#sGNO6 zKonNYtaSkPAb?6q@{2f0j*7zIKLQ(kA3#rLw@&IQm2UIizdr-CMuGiSVC)4V;sgrI z27&7Pib-;vi0lL)?2Y4#6|i9#T~sU2OFnV#7M(+N-mDMubKJy_K{ovwW8R66gu@9J}# zcEYA&^G)Bn;?@0n?1OQD!h*q+83lN+jVT%htTk6uI86e)_XmsUjQZ#cRh^!Lyq9g5 zxZ4=Mt7<>i0KZGqf!;W%@Sy7CQj%Oq)iCSbI7X-A6=^8m2o!YtJl%;U0xB z{2m&Z8wwzH4j}X}us*cr=Tz&E9nFLds7o-(JBAE&s_JOx{b9t^8yI_jCTU9yAWo8t z%AiyQ!oXe-+Tc7uo#v=5W`3#=hM%ZNX#k}-{uvR?Ekp$XxCQA38n*-Z4S-VtJlJ=} z%gZJFMqv35fyMI(Ypx@3mO%tc0cML>kxbQ7U;YvHd**t&YyE))(*^J#0uh`5rUx%< zm_t8%?rfa<%sxoOHTB9jJH$r7wCxM1+JJq%b3?qyFh8MH8mQpBKQiwP=hd(C{^->E z<-3_^MV-NuRV{nPW*}e^5fblD5=rCU={}w2yuk3iR5t>d8P^pC!P!v|oZhHS?>)pz zW^TFszr?vC%c|cny%yTw%*+6; zYM07!ej&8>-*QnlQ;OpswiF7m);<8>0swO}b$&j8Tl)f&TY+`IRXn>l@cJ2m-;k;8 zY-&sqJyO8GFFQqdf9e*xc;yL5lmIh~>@HIT5a5L+m}Q+T7d|}3{?dYz21z7cOu!fC1IR0?WG;@n9@gus}eqn7JErP7uHfwjLNqD`8O5^?$}F;|`qfwh-0)9PH5?I5qZ zb8G7;5YYkvX94(OW@Fazm?i?&UPE~KGlb&vDIm*<6I=vL3G>$;tn;3^S--vXd$cO) zNbN}4j3vA*fG=XnhQ_Nccb@!7Ol{v41v^^D7T&Gz8ndU)oN$m#A3awI23`k_p?jz3 zm>!~SjDh&(5gcpyCT8x;*=jqf%5G(;2`a03IZQ;xGxIWI_?}v>aHzat8ddUM-X|j4 zms?=sCy8iTnSL_F*=D?bWJ%EUO_MBysX$=OHO#ar2aLl-gm?>{FZ9mbdk zjWG)<5qy<)FLFT6?D5v{ZOFo~l=aoHDK`gIfCw9`F@MSdnnh&az*@AnwhqK&64K=o zwhBl}0QPvYYmT0?{1n`{=A-E}na(Xr%x)-2L&~V5bryYUm#Yx_PFQZCEH9G)VELv; z^`4i{px$I1xSz};@rw5G7UQRe=v?26W&sf*T4{~BEl%9gl%}Cl;{9<2=7+VaLXmiP zZ07XbOhnyzibRKLc!664cCFMzH%1!e)?v*@y(ADI3AoGImFT$G+$rKWKghUsXkeF z`sh7q|82hw(f$>uDiF404v>?6W7O7|tMg7!;{2yYF|IP%syjL_`xB7_)?Q5@Fma{Q z5Tp8K)$dhysPrOz^_PhVR1_)-5gBrvTvQ>M1cWNAwUWZn8w~668RI^HX`^>lCnfDab_{e( z4^y>*##PgdpasmlEH}B6ocA9~)i}X<{~1*c4D;hm^h95P>yRHmyQCwpFo?N_D6`i% zwJC@CqXL>qO;Aet8|KHX;rq2JrQhR44lD-+v}%8TEtQt`Vi3iedeSJxF=Cgr<=baM zrzL`^t6Wzp{l2qKqL1p06ZFP0dgB-hLJ&p>q6m!q+7>PXT*4pLAD{;=zE=PFr61F4 zrKuVHvz7KKa)Q057O=~NXxL3`H|`%d#=fV^NeTVcwvIGStv~h0gl=p2y1Z~oygxoQ z1vN-AZ#*#OnsSJzE;KhZ@DM>#zb2}eq>buOxw4u}cvS?}UXlk^;@p>zk+7-9E_*xg z4`k+*)|hLNzc&HY*HjrwueAABDT6`GU^cJ-9tOGh!#FJN+ELG3_Ep@t_9FzCO4Men zmF$%}XRi*J&ESM)cO3fYgx2j{e~BJsfR>#e!ms(8Pz{^^oQeX0u~)_9P6J>wdS!o6 zouR5zy~u1PicJ<3qRnu7%C=OxV2F}he<+Q%G6Kzl^2!tpM(|(HY^08E~^Kc;mc3R#iKo3S;d;W_o3d3{l17!P>e5)0imF(hO@#M71VfNuVBU z%#EeQeLZvVg2cHK3t@Pg7oFw2Kb(kS!+dp`{#W}_F!A!b{!e4#0tU#WCjuaD+q{EE zgx8v>89sK&Pw(6F=^Ji12+q&=9g7Y6NsJrO5%Ol8^3ChdTKCY4XFb~OY-7HM0YO7uPHl6q3JFTwIvzQ zxsp6bV%H>qQ)CoF9Qy%q1QH=s?ZZ?KrLizqxRtrQ}LPV=_z@M(FJJbd&v_e(o z%@FTpUY!7Vger+CwUw`3eKcO^+2JcNor@cW5w{X3kDD_V7wkYxq`XUY(oZiK;rDnb#P@x8>L03^x0`8Nr@KkRHh|^AOct^R!G2B~<}u zy3nm(P-b>!dA$)pFwDigeHOtq#f~cOHYwKR9`F zLyb=W_y~aIgS}wUqK9FPY3h~NRHBW6F*oPUCr#<3`9!p?@inORM2BE(8=}9M>hfWT zXuI?NC?aYI`1B_L-KS&c&S)gLi3nj3AhfnNYE-u2tgYE4uaqR;_afU{WBz2A9OdfzIr_S{N{E2~;3g$?t)fwec3`|4GvyrV*dIvHwqvO!&8kh&uJxu>Avo~d^JxfWij_z#W=pXoa+hzQ4oBSnIEZ2 z<-WC9KH2L4zL-hSKW-6Vdd0u*GZ9l;hqXjvA<|z>I}X6o;WTi^9e1FaUD(tKBDlbq zUzZ0fFy{J-vynTIRQpt@w)U1v3wn#i=i@lJqK3k8{@C8$((^sV;`8450}T{5wZ*y$ zVR#G^t;$J+Fm~?vVv_u_lq6TgNphMO+0HO6E`;I7seU|Ezfp|i=X;CA=T&5vdXBXm ziSZ&};v1N-z6{O4+Mk2SH_E%0#fwHly^o+3iEU@|6sX`vbUV zxVK-oZXFgZSb&y7VQ}^(s*Ap?G1n47hyZKM^^GawzJGwSs7?{psjAveL|x^oq$Da+ zM0F}uTT`i~W!vzv)+pLPFy^*uWJvR#?4~FTE^3LQeTisk8iLNXts01=ZP%0bW$(V? zU@*U7*!-ue!Vs^t#@y71E~loUVtT11iuQ|w;2S2(;CId+5GU^3#JNl3BsoPy$1|ua zu;#ZdQM7+(?YV=YVsta;-N zSi_(pS|^6^*On+cRG|eBy(mrT<36RUP>A+Y)u=y{$grtMN74#7mqbDEF>82l5uFEM ziUK7fdeIub-w-cV)lBNq{3r@{YGfrd@yb5o$y!^ppsKrM;m0eOXv0vVOWEtx8(QW;3MxI zHCV&)MgTto@Ru!R-lm~O8un%ZhWXCn@RS6s1`XfKW1@$Q;fK=P%QRD{!e{1ON+Mb| z;576}0wFk;T;ROllbJgMYknd9j8A|3es)`rH`y;#w|!A)=R7IK@rA(IF2bENyYpMyrb=Q1#JOv9A6B7pOn)=7RDq3LTfJsv|+ruQGKh*mi{f2rvZElz=r^w0ANor#uY4= zou@|tT!D0f`$*YJfULxus75{@asIR3`Gbg3ro%8lYnUGxtRXne1gBw@{~7?4JOX)A SaaJb)0000uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-yk5fw8ydtKZ0000R=Nkl z-kUHu<#iQD{puE=ILWKhfdlXX_XGDeHMI2R)GU?PwGwz8SerapMp6LW3bbx*ZCsTT z%_*;|5%>kLB26PsS97D~Md0qHhL)EzhErZwC9nqg-k7z@0u=(u1JNf6?wD)?)-*M= ze3UYr^12+rYT#!;`IrT^2}Uuv>lFU~3YKpiz^uao^aA$+o0=M0{7Lzo^17;koxpu@ z!QAzV+MS9yyM&XTREPtxnP4deehIw1wYBl&ap9ELH5GUcXpF4@3-n@`{RHICi)ek) z62Wt-!VdB|$yvbjTU#4vjHkKHz?`_-*ddsDt-?K5M%bKQ#OEw00l$q4r@XF3z!i!7 z2HgdvSB(lRVIkBdIjX@^k*{uTZCn~pbKg!J@Iv6239eD*9qfSM#~=n@09h3e?u^86 zHfRMP&XK?S-%^D8l1K*=BJ;PlHX52O>~Ut&P869#vWN>VylfMrI~rsj^MiwtvF*ftS#O5D{dPxoNifn*D+&laWN zC<01B|4x{+Y?!{U0lg56$qH93=mqfU4xxQ5h?Z945weD;D4M4h%(_|1Jhco2+SSev z?vU=mcQG_)4*R+A;gNTnH&rNahSHTn{yf1|BUIc9`SVF9_l0efX@&KysNE>j3hL1{ zhm^RhW#I`oAxKIVp{3{qP_Q7m-94u&RBEQFltrHI;k@eGap(mj{+m{C8YP};EEUcH zoMl4M0+@1Da&~4+PTd@BKXc12q0}>b?2U>+iK|N4b|}kmmIwaEhkB6|iiHGlcBB!leh3`1l6zoBo>sKq z0fT!4%@|gaDIA&~moo9$jyQ=%i|K2};e+@BT_WgNFiR^4WmiMtx#RCLxLdLR>#+Y4 zVQ7z_yN-it0nmfI)VEmu`^eciwEzw+IL6;JG01mJjekV&uo?^=M$24t(GFnh_s0ou zor*(uL-#|1H3Yizc+wUNv=IA;W~=pWH?!^V#R9^arLS^v;4hH!Qe+;hQwN_>;;epu15UI-inEidvgj{T|uS+ zDh~Y$26hRWHVg{TO|T6f?f#~^r~P`~8LSgDKj=q?t?^@8PM$t+rM%vAj#^srcN)w7 zB@WF;zu89Rq}X@VZyrp!lr!R1BBS$^xnI$~7J46#oG`)!gP_^GessQCd*FxsY_Ka~Buy<^9vdB4{m{7?x;6=+ z-m!kAhv+b8s10p5%I~@_myqT8%ml{|XCWZO-oAR-+kYn?n(y;eWtcq8h#4(YEy3f% zX&(6WFN(I?1pog)(}$U$0zJS`xR3`ru2UNiT`iq~nV=1VKA3ucqnlvo@z;;)WpAHN zU5v`D&@r8m4P=m4}FR@3{XorRzN^(Fig6`Q@G{B^_>0o4%vSAYl0SxXfey;$XOA&6rHX*2KJ~}a6Q0`&-@B_@yL1V&bHO;>R%{GFzY5bss-olN)L6V&a}5U zvE+jOkB_|Siv`z;gik{c^R91>T6gdkw)b8npyx(YqqU|98_t@7p22LlcFKy~r%hiO z9t)?Ne;NpvT(_zHyWHDxtqg=pqG4T;a|zn4X`I6OGu#<%<1`Al#TVD<4}nyMRY8EYBo> z^bmPZzeq&(CmcP;lr8&a5_uqt6)`aVLDgu0@jPjOUW!wO&eSGeG9k)s7V)WVP(F0_0pNCTEU0FIuUs+ zrCL0tBbsZT02-oz1L^RsuAh|3@9xaOMoXs)?38d-NGF?D4@xmzUx_8PE6L@v(+EHk*{kgr4mZv@&B z&3NaPB`k^$5&2+lak2p;_izzFi{_f&5P7e@A?hn*PMSR_W;Bx4iklT+(w(PqQxCUszRwXT$&ElMC ku71D^{82<+$mQ|>2Lqy1t^e^z-T(jq07*qoM6N<$f`p^w`v3p{ diff --git a/vc_vidyo/indico_vc_vidyo/task.py b/vc_vidyo/indico_vc_vidyo/task.py deleted file mode 100644 index fca2819..0000000 --- a/vc_vidyo/indico_vc_vidyo/task.py +++ /dev/null @@ -1,73 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from datetime import timedelta - -from celery.schedules import crontab - -from indico.core.celery import celery -from indico.core.db import db -from indico.core.plugins import get_plugin_template_module -from indico.modules.events import Event -from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomEventAssociation, VCRoomStatus -from indico.modules.vc.notifications import _send -from indico.util.date_time import now_utc -from indico.util.iterables import committing_iterator - -from indico_vc_vidyo.api import APIException, RoomNotFoundAPIException - - -def find_old_vidyo_rooms(max_room_event_age): - """Finds all Vidyo rooms that are: - - linked to no events - - linked only to events whose start date precedes today - max_room_event_age days - """ - recently_used = (db.session.query(VCRoom.id) - .filter(VCRoom.type == 'vidyo', - Event.end_dt > (now_utc() - timedelta(days=max_room_event_age))) - .join(VCRoom.events) - .join(VCRoomEventAssociation.event) - .group_by(VCRoom.id)) - - # non-deleted rooms with no recent associations - return VCRoom.query.filter(VCRoom.status != VCRoomStatus.deleted, ~VCRoom.id.in_(recently_used)).all() - - -def notify_owner(plugin, vc_room): - """Notifies about the deletion of a Vidyo room from the Vidyo server.""" - user = vc_room.vidyo_extension.owned_by_user - tpl = get_plugin_template_module('emails/remote_deleted.html', plugin=plugin, vc_room=vc_room, event=None, - vc_room_event=None, user=user) - _send('delete', user, plugin, None, vc_room, tpl) - - -@celery.periodic_task(run_every=crontab(minute='0', hour='3', day_of_week='monday'), plugin='vc_vidyo') -def vidyo_cleanup(dry_run=False): - from indico_vc_vidyo.plugin import VidyoPlugin - max_room_event_age = VidyoPlugin.settings.get('num_days_old') - - VidyoPlugin.logger.info('Deleting Vidyo rooms that are not used or linked to events all older than %d days', - max_room_event_age) - candidate_rooms = find_old_vidyo_rooms(max_room_event_age) - VidyoPlugin.logger.info('%d rooms found', len(candidate_rooms)) - - if dry_run: - for vc_room in candidate_rooms: - VidyoPlugin.logger.info('Would delete Vidyo room %s from server', vc_room) - return - - for vc_room in committing_iterator(candidate_rooms, n=20): - try: - VidyoPlugin.instance.delete_room(vc_room, None) - VidyoPlugin.logger.info('Room %s deleted from Vidyo server', vc_room) - notify_owner(VidyoPlugin.instance, vc_room) - vc_room.status = VCRoomStatus.deleted - except RoomNotFoundAPIException: - VidyoPlugin.logger.warning('Room %s had been already deleted from the Vidyo server', vc_room) - vc_room.status = VCRoomStatus.deleted - except APIException: - VidyoPlugin.logger.exception('Impossible to delete Vidyo room %s', vc_room) diff --git a/vc_vidyo/indico_vc_vidyo/templates/buttons.html b/vc_vidyo/indico_vc_vidyo/templates/buttons.html deleted file mode 100644 index 8081211..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/buttons.html +++ /dev/null @@ -1,21 +0,0 @@ -{% macro render_make_me_owner(event, vc_room, event_vc_room, extra_classes='') %} - {% if session.user != vc_room.vidyo_extension.owned_by_user and event.can_manage(session.user) %} - - - {% endif %} -{% endmacro %} - -{% macro render_join_button(vc_room, extra_classes="") %} - - {% trans %}Join{% endtrans %} - -{% endmacro %} diff --git a/vc_vidyo/indico_vc_vidyo/templates/emails/created.html b/vc_vidyo/indico_vc_vidyo/templates/emails/created.html deleted file mode 100644 index ed71c08..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/emails/created.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'vc/emails/created.html' %} - -{% block plugin_specific_info %} -
  • - Auto-join URL: - {{ vc_room.vidyo_extension.join_url }} -
    • -
  • Owner: {{ vc_room.data.owner_identity }}
    • -{% endblock %} - -{% block custom_footer %} - {% if plugin.settings.get('creation_email_footer') %} -
    - {{ plugin.settings.get('creation_email_footer') | sanitize_html }} - {% endif %} -{% endblock %} diff --git a/vc_vidyo/indico_vc_vidyo/templates/emails/deleted.html b/vc_vidyo/indico_vc_vidyo/templates/emails/deleted.html deleted file mode 100644 index a67c1f1..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/emails/deleted.html +++ /dev/null @@ -1 +0,0 @@ -{% extends 'vc/emails/deleted.html' %} diff --git a/vc_vidyo/indico_vc_vidyo/templates/emails/remote_deleted.html b/vc_vidyo/indico_vc_vidyo/templates/emails/remote_deleted.html deleted file mode 100644 index 5e904fd..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/emails/remote_deleted.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'emails/base.html' %} - -{% block subject -%} - [{{ plugin.friendly_name }}] Room deleted from server: {{ vc_room.name }} -{%- endblock %} - -{% block header -%} -

    - The Vidyo room "{{ vc_room.name }}" has been deleted from the Vidyo server since it has not been used by any recent event. -

    -

    - You won't be able to attach it to any future events. If you need to do so, please create a new room. -

    -{% block custom_footer %}{% endblock %} - -{%- endblock %} diff --git a/vc_vidyo/indico_vc_vidyo/templates/event_buttons.html b/vc_vidyo/indico_vc_vidyo/templates/event_buttons.html deleted file mode 100644 index cf4e2f1..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/event_buttons.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends 'vc/event_buttons.html' %} -{% from 'vc_vidyo:buttons.html' import render_join_button, render_make_me_owner %} - -{% block buttons %} - {{ render_join_button(vc_room, "i-button-small event-service-right-button join-button") }} - {{ render_make_me_owner(event, vc_room, event_vc_room, extra_classes="i-button-small") }} -{% endblock %} diff --git a/vc_vidyo/indico_vc_vidyo/templates/info_box.html b/vc_vidyo/indico_vc_vidyo/templates/info_box.html deleted file mode 100644 index f41fbf5..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/info_box.html +++ /dev/null @@ -1,37 +0,0 @@ -{% from '_clipboard_input.html' import clipboard_input %} -{% set owner = vc_room.vidyo_extension.owned_by_user %} -{% set phone_link = settings.get('vidyo_phone_link') %} -
    -
    {% trans %}Name{% endtrans %}
    -
    {{ vc_room.name }}
    -
    {% trans %}Description{% endtrans %}
    -
    {{ vc_room.data.description }}
    - {% if vc_room.vidyo_extension %} -
    {% trans %}Extension{% endtrans %}
    -
    {{ vc_room.vidyo_extension.extension }}
    - {% endif %} - {% if owner %} -
    {% trans %}Owner{% endtrans %}
    -
    {{ owner.full_name }}
    - {% endif %} - {% if event_vc_room.data.show_pin and vc_room.data.room_pin %} -
    {% trans %}Room PIN{% endtrans %}
    -
    {{ vc_room.data.room_pin }}
    - {% endif %} - {% if event_vc_room.data.show_autojoin %} -
    {% trans %}Auto-join URL{% endtrans %}
    -
    - {{ clipboard_input(vc_room.vidyo_extension.join_url, name="vc-room-url-%s"|format(event_vc_room.id)) }} -
    - {% endif %} - {% if event_vc_room.data.show_phone_numbers and phone_link %} -
    - {% trans %}Useful links{% endtrans %} -
    -
    - - {% trans %}Phone numbers{% endtrans %} - -
    - {% endif %} -
    diff --git a/vc_vidyo/indico_vc_vidyo/templates/manage_event_info_box.html b/vc_vidyo/indico_vc_vidyo/templates/manage_event_info_box.html deleted file mode 100644 index 8cc184e..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/manage_event_info_box.html +++ /dev/null @@ -1,55 +0,0 @@ -{% from '_password.html' import password %} -{% from '_clipboard_input.html' import clipboard_input %} -{% set owner = vc_room.vidyo_extension.owned_by_user %} -{% set phone_link = settings.get('vidyo_phone_link') %} -
    -
    {% trans %}Description{% endtrans %}
    -
    {{ vc_room.data.description }}
    -
    {% trans %}Extension{% endtrans %}
    -
    {{ vc_room.vidyo_extension.extension }}
    -
    {% trans %}Owner{% endtrans %}
    -
    - {% if owner %} - {{ owner.full_name }} - {% else %} - {{ vc_room.data.owner_account }} (deleted) - {% endif %} -
    -
    {% trans %}Linked to{% endtrans %}
    -
    - {% set obj = event_vc_room.link_object %} - {% if obj is none %} - (missing {{ event_vc_room.link_type.name }}) - {% elif event_vc_room.link_type.name == 'event' %} - {% trans %}the whole event{% endtrans %} - {% elif event_vc_room.link_type.name == 'contribution' %} - {% trans %}Contribution{% endtrans %}: {{ obj.title }} - {% elif event_vc_room.link_type.name == 'block' %} - {% trans %}Session{% endtrans %}: {{ obj.full_title }} - {% endif %} -
    - {% if vc_room.data.room_pin %} -
    {% trans %}Room PIN{% endtrans %}
    -
    - {{ password('vc-room-pin-%s'|format(event_vc_room.id), value=vc_room.data.room_pin, toggle=True, - readonly=true) }} -
    - {% endif %} - {% if vc_room.data.moderation_pin %} -
    {% trans %}Moderation PIN{% endtrans %}
    -
    - {{ password('vc-moderation-pin-%s'|format(event_vc_room.id), value=vc_room.data.moderation_pin, - toggle=True, readonly=true) }} -
    - {% endif %} -
    {% trans %}Auto-join URL{% endtrans %}
    -
    - {{ clipboard_input(vc_room.vidyo_extension.join_url, name="vc-room-url") }} -
    -
    {% trans %}Created on{% endtrans %}
    -
    {{ vc_room.created_dt | format_datetime(timezone=event.tzinfo) }}
    - {% if vc_room.modified_dt %} -
    {% trans %}Modified on{% endtrans %}
    -
    {{ vc_room.modified_dt | format_datetime(timezone=event.tzinfo) }}
    - {% endif %} -
    diff --git a/vc_vidyo/indico_vc_vidyo/templates/management_buttons.html b/vc_vidyo/indico_vc_vidyo/templates/management_buttons.html deleted file mode 100644 index cfd9cf0..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/management_buttons.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends 'vc/management_buttons.html' %} -{% from 'vc_vidyo:buttons.html' import render_join_button, render_make_me_owner %} - -{% block buttons %} - {{ render_join_button(vc_room, extra_classes="icon-play") }} - {{ render_make_me_owner(event_vc_room.event, vc_room, event_vc_room) }} -{% endblock %} diff --git a/vc_vidyo/indico_vc_vidyo/templates/vc_room_timetable_buttons.html b/vc_vidyo/indico_vc_vidyo/templates/vc_room_timetable_buttons.html deleted file mode 100644 index 83070a9..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/vc_room_timetable_buttons.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'vc/vc_room_timetable_buttons.html' %} -{% from 'vc_vidyo:buttons.html' import render_join_button, render_make_me_owner %} -{% set vc_room = event_vc_room.vc_room %} - -{% block buttons %} - {{ render_join_button(vc_room, "i-button-small event-service-right-button join-button") }} - {{ render_make_me_owner(event, vc_room, event_vc_room, extra_classes="i-button-small") }} -{% endblock %} diff --git a/vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages-js.po b/vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages-js.po deleted file mode 100644 index fe16c6c..0000000 --- a/vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages-js.po +++ /dev/null @@ -1,23 +0,0 @@ -# Translations template for PROJECT. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# -# Translators: -# Thomas Baron , 2015 -msgid "" -msgstr "" -"Project-Id-Version: Indico\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-03-11 16:21+0100\n" -"PO-Revision-Date: 2015-03-12 12:52+0000\n" -"Last-Translator: Thomas Baron \n" -"Language-Team: French (France) (http://www.transifex.com/projects/p/indico/language/fr_FR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" -"Language: fr_FR\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -msgid "Indico" -msgstr "Indico" diff --git a/vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages.po b/vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages.po deleted file mode 100644 index 8de1736..0000000 --- a/vc_vidyo/indico_vc_vidyo/translations/fr_FR/LC_MESSAGES/messages.po +++ /dev/null @@ -1,282 +0,0 @@ -# Translations template for PROJECT. -# Copyright (C) 2021 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# -# Translators: -# Adrian Mönnich, 2021 -# Thomas Baron , 2015,2017 -msgid "" -msgstr "" -"Project-Id-Version: Indico\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-01-05 13:23+0100\n" -"PO-Revision-Date: 2021-01-05 12:24+0000\n" -"Last-Translator: Adrian Mönnich\n" -"Language-Team: French (France) (http://www.transifex.com/indico/indico/language/fr_FR/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.8.0\n" -"Language: fr_FR\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: indico_vc_vidyo/controllers.py:29 -msgid "You are now the owner of the room '{room}'" -msgstr "Vous êtes maintenant responsable de la salle '{room}'" - -#: indico_vc_vidyo/forms.py:23 -msgid "The PIN must be a number" -msgstr "Le code confidentiel doit être un nombre entier" - -#: indico_vc_vidyo/forms.py:28 -msgid "Show PIN" -msgstr "Afficher le code confidentiel" - -#: indico_vc_vidyo/forms.py:30 -msgid "Show the VC Room PIN on the event page (insecure!)" -msgstr "Afficher le code confidentiel de la salle Vidyo sur la page de l'événement (peu sûr!)" - -#: indico_vc_vidyo/forms.py:31 -msgid "Show Auto-join URL" -msgstr "Afficher l'URL de connexion" - -#: indico_vc_vidyo/forms.py:33 -msgid "Show the auto-join URL on the event page" -msgstr "Afficher l'URL de connexion sur la page de l'événement" - -#: indico_vc_vidyo/forms.py:34 -msgid "Show Phone Access numbers" -msgstr "Afficher les numéros d'accès téléphonique" - -#: indico_vc_vidyo/forms.py:36 -msgid "Show a link to the list of phone access numbers" -msgstr "Afficher un lien vers la liste des numéros d'accès téléphonique" - -#: indico_vc_vidyo/forms.py:49 indico_vc_vidyo/templates/info_box.html:7 -#: indico_vc_vidyo/templates/manage_event_info_box.html:6 -msgid "Description" -msgstr "Description" - -#: indico_vc_vidyo/forms.py:49 -msgid "The description of the room" -msgstr "La description de la salle" - -#: indico_vc_vidyo/forms.py:50 indico_vc_vidyo/templates/info_box.html:14 -#: indico_vc_vidyo/templates/manage_event_info_box.html:10 -msgid "Owner" -msgstr "Responsable" - -#: indico_vc_vidyo/forms.py:50 -msgid "The owner of the room" -msgstr "Le responsable de la salle" - -#: indico_vc_vidyo/forms.py:51 -#: indico_vc_vidyo/templates/manage_event_info_box.html:39 -msgid "Moderation PIN" -msgstr "Code confidentiel de modération" - -#: indico_vc_vidyo/forms.py:52 -msgid "Used to moderate the VC Room. Only digits allowed." -msgstr "Utilisé pour modérer la salle de VC. Seuls les chiffres sont autorisés." - -#: indico_vc_vidyo/forms.py:53 indico_vc_vidyo/templates/info_box.html:18 -#: indico_vc_vidyo/templates/manage_event_info_box.html:32 -msgid "Room PIN" -msgstr "Code confidentiel de la salle" - -#: indico_vc_vidyo/forms.py:54 -msgid "" -"Used to protect the access to the VC Room (leave blank for open access). " -"Only digits allowed." -msgstr "Utilisé pour protéger l'accès à la salle de VC (laisser vide pour un accès ouvert). Seuls les chiffres sont autorisés." - -#: indico_vc_vidyo/forms.py:56 -msgid "Auto mute" -msgstr "Coupure automatique des périphériques d'entrée" - -#: indico_vc_vidyo/forms.py:58 -msgid "" -"The VidyoDesktop clients will join the VC room muted by default (audio and " -"video)" -msgstr "Les clients VidyoDesktop rejoindront la salle Vidyo avec le micro et la caméra coupés par défaut" - -#: indico_vc_vidyo/forms.py:73 -msgid "Unable to find this user in Indico." -msgstr "Impossible de trouver cet utilisateur dans Indico." - -#: indico_vc_vidyo/forms.py:75 -msgid "This user does not have a suitable account to use Vidyo." -msgstr "Cet utilisateur n'a pas de compte qui lui permet d'utiliser Vidyo." - -#: indico_vc_vidyo/plugin.py:40 -msgid "Vidyo email support" -msgstr "Adresse électronique de l'assistance Vidyo" - -#: indico_vc_vidyo/plugin.py:41 -msgid "Username" -msgstr "Identifiant" - -#: indico_vc_vidyo/plugin.py:41 -msgid "Indico username for Vidyo" -msgstr "Identifiant Indico pour Vidyo" - -#: indico_vc_vidyo/plugin.py:42 -msgid "Password" -msgstr "Mot de passe" - -#: indico_vc_vidyo/plugin.py:43 -msgid "Indico password for Vidyo" -msgstr "Mot de passe utilisateur pour Vidyo" - -#: indico_vc_vidyo/plugin.py:44 -msgid "Admin API WSDL URL" -msgstr "URL WSDL pour l'API admin" - -#: indico_vc_vidyo/plugin.py:45 -msgid "User API WSDL URL" -msgstr "URL WSDL pour l'API utilisateur" - -#: indico_vc_vidyo/plugin.py:46 -msgid "Indico tenant prefix" -msgstr "Préfixe de tenant pour Indico" - -#: indico_vc_vidyo/plugin.py:47 -msgid "The tenant prefix for Indico rooms created on this server" -msgstr "Le préfixe de tenant pour les salles Vidyo créées sur ce serveur Indico" - -#: indico_vc_vidyo/plugin.py:48 -msgid "Public rooms' group name" -msgstr "Nom du groupe Vidyo pour les salles Vidyo" - -#: indico_vc_vidyo/plugin.py:49 -msgid "Group name for public videoconference rooms created by Indico" -msgstr "Nom du groupe pour les salles publiques de visioconférence créées par Indico" - -#: indico_vc_vidyo/plugin.py:50 -msgid "Authenticators" -msgstr "Services d'authentification" - -#: indico_vc_vidyo/plugin.py:51 -msgid "Identity providers to convert Indico users to Vidyo accounts" -msgstr "Fournisseurs d'identité pour convertir des utilisateurs Indico en comptes Vidyo" - -#: indico_vc_vidyo/plugin.py:52 -msgid "VC room age threshold" -msgstr "Limite d'âge pour les salles Vidyo" - -#: indico_vc_vidyo/plugin.py:53 -msgid "" -"Number of days after an Indico event when a videoconference room is " -"considered old" -msgstr "Nombre de jours à partir de la fin d'un événement dans Indico après lesquels une salle de visioconférence est considérée comme agée" - -#: indico_vc_vidyo/plugin.py:55 -msgid "Max. num. VC rooms before warning" -msgstr "Nombre maximum de salles Vidyo avant un message d'alerte" - -#: indico_vc_vidyo/plugin.py:56 -msgid "Maximum number of rooms until a warning is sent to the managers" -msgstr "Nombre maximum de salles Vidyo créées sur ce serveur avant qu'un message d'alerte soit envoyé aux administrateurs" - -#: indico_vc_vidyo/plugin.py:57 -msgid "VidyoVoice phone number" -msgstr "Numéros de téléphone VidyoVoice" - -#: indico_vc_vidyo/plugin.py:58 -msgid "Link to the list of VidyoVoice phone numbers" -msgstr "Lien vers la liste des numéros de téléphones VidyoVoice" - -#: indico_vc_vidyo/plugin.py:59 -msgid "Client Chooser URL" -msgstr "URL de sélection du client" - -#: indico_vc_vidyo/plugin.py:60 -msgid "" -"URL for client chooser interface. The room key will be passed as a 'url' GET" -" query argument" -msgstr "L'URL pour l'interface de sélection du client. Le code de la salle sera passé comme argument de requête GET." - -#: indico_vc_vidyo/plugin.py:62 -msgid "Creation email footer" -msgstr "Pied de page du courriel de création" - -#: indico_vc_vidyo/plugin.py:63 -msgid "Footer to append to emails sent upon creation of a VC room" -msgstr "Pied de page ajouté au courriel envoyé à la création d'une nouvelle salle Vidyo" - -#: indico_vc_vidyo/plugin.py:153 indico_vc_vidyo/plugin.py:193 -#: indico_vc_vidyo/plugin.py:231 indico_vc_vidyo/plugin.py:260 -msgid "No valid Vidyo account found for this user" -msgstr "Pas de compte Vidyo valide pour cet utilisateur" - -#: indico_vc_vidyo/plugin.py:189 indico_vc_vidyo/plugin.py:254 -msgid "Room name already in use" -msgstr "Ce nom de salle est déjà utilisé" - -#: indico_vc_vidyo/plugin.py:204 -msgid "Could not find newly created room in Vidyo" -msgstr "Impossible de trouver la nouvelle salle dans Vidyo" - -#: indico_vc_vidyo/plugin.py:223 indico_vc_vidyo/plugin.py:250 -#: indico_vc_vidyo/plugin.py:279 -msgid "This room has been deleted from Vidyo" -msgstr "Cette salle a été supprimée de Vidyo" - -#: indico_vc_vidyo/templates/buttons.html:7 -#, python-format -msgid "You will be the owner of this Vidyo room, replacing %(name)s." -msgstr "Vous deviendrez le responsable de cette salle Vidyo, à la place de %(name)s." - -#: indico_vc_vidyo/templates/buttons.html:9 -msgid "Make me owner" -msgstr "Nommez moi responsable" - -#: indico_vc_vidyo/templates/buttons.html:19 -msgid "Join" -msgstr "Rejoindre" - -#: indico_vc_vidyo/templates/info_box.html:5 -msgid "Name" -msgstr "Nom" - -#: indico_vc_vidyo/templates/info_box.html:10 -#: indico_vc_vidyo/templates/manage_event_info_box.html:8 -msgid "Extension" -msgstr "Extension" - -#: indico_vc_vidyo/templates/info_box.html:22 -#: indico_vc_vidyo/templates/manage_event_info_box.html:45 -msgid "Auto-join URL" -msgstr "URL pour connexion à la salle" - -#: indico_vc_vidyo/templates/info_box.html:29 -msgid "Useful links" -msgstr "Liens utiles" - -#: indico_vc_vidyo/templates/info_box.html:33 -msgid "Phone numbers" -msgstr "Numéros de téléphone" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:18 -msgid "Linked to" -msgstr "attachée à" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:24 -msgid "the whole event" -msgstr "l'événement entier" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:26 -msgid "Contribution" -msgstr "La contribution" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:28 -msgid "Session" -msgstr "La session" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:49 -msgid "Created on" -msgstr "Créée le " - -#: indico_vc_vidyo/templates/manage_event_info_box.html:52 -msgid "Modified on" -msgstr "Modifiée le " diff --git a/vc_vidyo/indico_vc_vidyo/translations/messages.pot b/vc_vidyo/indico_vc_vidyo/translations/messages.pot deleted file mode 100644 index 323ba6b..0000000 --- a/vc_vidyo/indico_vc_vidyo/translations/messages.pot +++ /dev/null @@ -1,280 +0,0 @@ -# Translations template for PROJECT. -# Copyright (C) 2021 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2021. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-01-05 13:23+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.8.0\n" - -#: indico_vc_vidyo/controllers.py:29 -msgid "You are now the owner of the room '{room}'" -msgstr "" - -#: indico_vc_vidyo/forms.py:23 -msgid "The PIN must be a number" -msgstr "" - -#: indico_vc_vidyo/forms.py:28 -msgid "Show PIN" -msgstr "" - -#: indico_vc_vidyo/forms.py:30 -msgid "Show the VC Room PIN on the event page (insecure!)" -msgstr "" - -#: indico_vc_vidyo/forms.py:31 -msgid "Show Auto-join URL" -msgstr "" - -#: indico_vc_vidyo/forms.py:33 -msgid "Show the auto-join URL on the event page" -msgstr "" - -#: indico_vc_vidyo/forms.py:34 -msgid "Show Phone Access numbers" -msgstr "" - -#: indico_vc_vidyo/forms.py:36 -msgid "Show a link to the list of phone access numbers" -msgstr "" - -#: indico_vc_vidyo/forms.py:49 indico_vc_vidyo/templates/info_box.html:7 -#: indico_vc_vidyo/templates/manage_event_info_box.html:6 -msgid "Description" -msgstr "" - -#: indico_vc_vidyo/forms.py:49 -msgid "The description of the room" -msgstr "" - -#: indico_vc_vidyo/forms.py:50 indico_vc_vidyo/templates/info_box.html:14 -#: indico_vc_vidyo/templates/manage_event_info_box.html:10 -msgid "Owner" -msgstr "" - -#: indico_vc_vidyo/forms.py:50 -msgid "The owner of the room" -msgstr "" - -#: indico_vc_vidyo/forms.py:51 -#: indico_vc_vidyo/templates/manage_event_info_box.html:39 -msgid "Moderation PIN" -msgstr "" - -#: indico_vc_vidyo/forms.py:52 -msgid "Used to moderate the VC Room. Only digits allowed." -msgstr "" - -#: indico_vc_vidyo/forms.py:53 indico_vc_vidyo/templates/info_box.html:18 -#: indico_vc_vidyo/templates/manage_event_info_box.html:32 -msgid "Room PIN" -msgstr "" - -#: indico_vc_vidyo/forms.py:54 -msgid "" -"Used to protect the access to the VC Room (leave blank for open access). " -"Only digits allowed." -msgstr "" - -#: indico_vc_vidyo/forms.py:56 -msgid "Auto mute" -msgstr "" - -#: indico_vc_vidyo/forms.py:58 -msgid "" -"The VidyoDesktop clients will join the VC room muted by default (audio " -"and video)" -msgstr "" - -#: indico_vc_vidyo/forms.py:73 -msgid "Unable to find this user in Indico." -msgstr "" - -#: indico_vc_vidyo/forms.py:75 -msgid "This user does not have a suitable account to use Vidyo." -msgstr "" - -#: indico_vc_vidyo/plugin.py:40 -msgid "Vidyo email support" -msgstr "" - -#: indico_vc_vidyo/plugin.py:41 -msgid "Username" -msgstr "" - -#: indico_vc_vidyo/plugin.py:41 -msgid "Indico username for Vidyo" -msgstr "" - -#: indico_vc_vidyo/plugin.py:42 -msgid "Password" -msgstr "" - -#: indico_vc_vidyo/plugin.py:43 -msgid "Indico password for Vidyo" -msgstr "" - -#: indico_vc_vidyo/plugin.py:44 -msgid "Admin API WSDL URL" -msgstr "" - -#: indico_vc_vidyo/plugin.py:45 -msgid "User API WSDL URL" -msgstr "" - -#: indico_vc_vidyo/plugin.py:46 -msgid "Indico tenant prefix" -msgstr "" - -#: indico_vc_vidyo/plugin.py:47 -msgid "The tenant prefix for Indico rooms created on this server" -msgstr "" - -#: indico_vc_vidyo/plugin.py:48 -msgid "Public rooms' group name" -msgstr "" - -#: indico_vc_vidyo/plugin.py:49 -msgid "Group name for public videoconference rooms created by Indico" -msgstr "" - -#: indico_vc_vidyo/plugin.py:50 -msgid "Authenticators" -msgstr "" - -#: indico_vc_vidyo/plugin.py:51 -msgid "Identity providers to convert Indico users to Vidyo accounts" -msgstr "" - -#: indico_vc_vidyo/plugin.py:52 -msgid "VC room age threshold" -msgstr "" - -#: indico_vc_vidyo/plugin.py:53 -msgid "" -"Number of days after an Indico event when a videoconference room is " -"considered old" -msgstr "" - -#: indico_vc_vidyo/plugin.py:55 -msgid "Max. num. VC rooms before warning" -msgstr "" - -#: indico_vc_vidyo/plugin.py:56 -msgid "Maximum number of rooms until a warning is sent to the managers" -msgstr "" - -#: indico_vc_vidyo/plugin.py:57 -msgid "VidyoVoice phone number" -msgstr "" - -#: indico_vc_vidyo/plugin.py:58 -msgid "Link to the list of VidyoVoice phone numbers" -msgstr "" - -#: indico_vc_vidyo/plugin.py:59 -msgid "Client Chooser URL" -msgstr "" - -#: indico_vc_vidyo/plugin.py:60 -msgid "" -"URL for client chooser interface. The room key will be passed as a 'url' " -"GET query argument" -msgstr "" - -#: indico_vc_vidyo/plugin.py:62 -msgid "Creation email footer" -msgstr "" - -#: indico_vc_vidyo/plugin.py:63 -msgid "Footer to append to emails sent upon creation of a VC room" -msgstr "" - -#: indico_vc_vidyo/plugin.py:153 indico_vc_vidyo/plugin.py:193 -#: indico_vc_vidyo/plugin.py:231 indico_vc_vidyo/plugin.py:260 -msgid "No valid Vidyo account found for this user" -msgstr "" - -#: indico_vc_vidyo/plugin.py:189 indico_vc_vidyo/plugin.py:254 -msgid "Room name already in use" -msgstr "" - -#: indico_vc_vidyo/plugin.py:204 -msgid "Could not find newly created room in Vidyo" -msgstr "" - -#: indico_vc_vidyo/plugin.py:223 indico_vc_vidyo/plugin.py:250 -#: indico_vc_vidyo/plugin.py:279 -msgid "This room has been deleted from Vidyo" -msgstr "" - -#: indico_vc_vidyo/templates/buttons.html:7 -#, python-format -msgid "You will be the owner of this Vidyo room, replacing %(name)s." -msgstr "" - -#: indico_vc_vidyo/templates/buttons.html:9 -msgid "Make me owner" -msgstr "" - -#: indico_vc_vidyo/templates/buttons.html:19 -msgid "Join" -msgstr "" - -#: indico_vc_vidyo/templates/info_box.html:5 -msgid "Name" -msgstr "" - -#: indico_vc_vidyo/templates/info_box.html:10 -#: indico_vc_vidyo/templates/manage_event_info_box.html:8 -msgid "Extension" -msgstr "" - -#: indico_vc_vidyo/templates/info_box.html:22 -#: indico_vc_vidyo/templates/manage_event_info_box.html:45 -msgid "Auto-join URL" -msgstr "" - -#: indico_vc_vidyo/templates/info_box.html:29 -msgid "Useful links" -msgstr "" - -#: indico_vc_vidyo/templates/info_box.html:33 -msgid "Phone numbers" -msgstr "" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:18 -msgid "Linked to" -msgstr "" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:24 -msgid "the whole event" -msgstr "" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:26 -msgid "Contribution" -msgstr "" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:28 -msgid "Session" -msgstr "" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:49 -msgid "Created on" -msgstr "" - -#: indico_vc_vidyo/templates/manage_event_info_box.html:52 -msgid "Modified on" -msgstr "" - diff --git a/vc_vidyo/indico_vc_vidyo/util.py b/vc_vidyo/indico_vc_vidyo/util.py deleted file mode 100644 index bd984eb..0000000 --- a/vc_vidyo/indico_vc_vidyo/util.py +++ /dev/null @@ -1,92 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -import re - -from flask_multipass import IdentityRetrievalFailed - -from indico.core.auth import multipass -from indico.modules.auth import Identity -from indico.modules.users import User - - -authenticators_re = re.compile(r'\s*,\s*') - - -def iter_user_identities(user): - """Iterates over all existing user identities that can be used with Vidyo""" - from indico_vc_vidyo.plugin import VidyoPlugin - providers = authenticators_re.split(VidyoPlugin.settings.get('authenticators')) - done = set() - for provider in providers: - for _, identifier in user.iter_identifiers(check_providers=True, providers={provider}): - if identifier in done: - continue - done.add(identifier) - yield identifier - - -def get_user_from_identifier(settings, identifier): - """Get an actual User object from an identifier""" - providers = list(auth.strip() for auth in settings.get('authenticators').split(',')) - identities = Identity.query.filter(Identity.provider.in_(providers), Identity.identifier == identifier).all() - if identities: - return sorted(identities, key=lambda x: providers.index(x.provider))[0].user - for provider in providers: - try: - identity_info = multipass.get_identity(provider, identifier) - except IdentityRetrievalFailed: - continue - if identity_info is None: - continue - if not identity_info.provider.settings.get('trusted_email'): - continue - emails = {email.lower() for email in identity_info.data.getlist('email') if email} - if not emails: - continue - user = User.query.filter(~User.is_deleted, User.all_emails.in_(list(emails))).first() - if user: - return user - - -def iter_extensions(prefix, event_id): - """Return extension (prefix + event_id) with an optional suffix which is - incremented step by step in case of collision - """ - extension = f'{prefix}{event_id}' - yield extension - suffix = 1 - while True: - yield f'{extension}{suffix}' - suffix += 1 - - -def update_room_from_obj(settings, vc_room, room_obj): - """Updates a VCRoom DB object using a SOAP room object returned by the API""" - vc_room.name = room_obj.name - if room_obj.ownerName != vc_room.data['owner_identity']: - owner = get_user_from_identifier(settings, room_obj.ownerName) or User.get_system_user() - vc_room.vidyo_extension.owned_by_user = owner - - vc_room.data.update({ - 'description': room_obj.description, - 'vidyo_id': str(room_obj.roomID), - 'url': room_obj.RoomMode.roomURL, - 'owner_identity': room_obj.ownerName, - 'room_pin': room_obj.RoomMode.roomPIN if room_obj.RoomMode.hasPIN else "", - 'moderation_pin': room_obj.RoomMode.moderatorPIN if room_obj.RoomMode.hasModeratorPIN else "", - }) - vc_room.vidyo_extension.extension = int(room_obj.extension) - - -def retrieve_principal(principal): - from indico.modules.users import User - type_, id_ = principal - if type_ in {'Avatar', 'User'}: - return User.get(int(id_)) - else: - raise ValueError(f'Unexpected type: {type_}') diff --git a/vc_vidyo/setup.cfg b/vc_vidyo/setup.cfg deleted file mode 100644 index 5dbc4d7..0000000 --- a/vc_vidyo/setup.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[metadata] -name = indico-plugin-vc-vidyo -version = 3.0-dev -description = Vidyo video-conferencing plugin for Indico -url = https://github.com/indico/indico-plugins -license = MIT -author = Indico Team -author_email = indico-team@cern.ch -classifiers = - Environment :: Plugins - Environment :: Web Environment - License :: OSI Approved :: MIT License - Programming Language :: Python :: 3.9 - -[options] -packages = find: -zip_safe = false -include_package_data = true -python_requires = ~=3.9 -install_requires = - indico>=3.0.dev0 - zeep>=4.0.0,<5 - -[options.entry_points] -indico.plugins = - vc_vidyo = indico_vc_vidyo.plugin:VidyoPlugin - - - -[pydocstyle] -ignore = D100,D101,D102,D103,D104,D105,D107,D203,D213 diff --git a/vc_vidyo/setup.py b/vc_vidyo/setup.py deleted file mode 100644 index 03c7604..0000000 --- a/vc_vidyo/setup.py +++ /dev/null @@ -1,11 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from setuptools import setup - - -setup() diff --git a/vc_vidyo/tests/task_test.py b/vc_vidyo/tests/task_test.py deleted file mode 100644 index bafcefc..0000000 --- a/vc_vidyo/tests/task_test.py +++ /dev/null @@ -1,68 +0,0 @@ -# This file is part of the Indico plugins. -# Copyright (C) 2002 - 2021 CERN -# -# The Indico plugins are free software; you can redistribute -# them and/or modify them under the terms of the MIT License; -# see the LICENSE file for more details. - -from datetime import datetime - -import pytest -from pytz import utc - -from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomEventAssociation, VCRoomStatus - -from indico_vc_vidyo.models.vidyo_extensions import VidyoExtension - - -@pytest.fixture -def create_dummy_room(db, dummy_user): - """Returns a callable which lets you create dummy Vidyo room occurrences""" - def _create_room(name, extension, data, **kwargs): - vc_room = VCRoom( - name=name, - data=data, - type='vidyo', - status=kwargs.pop('status', VCRoomStatus.created), - created_by_user=dummy_user, - **kwargs - ) - db.session.add(vc_room) - db.session.flush() - extension = VidyoExtension( - vc_room_id=vc_room.id, - extension=extension, - owned_by_user=dummy_user - ) - vc_room.vidyo_extension = extension - return vc_room - - return _create_room - - -def test_room_cleanup(create_event, create_dummy_room, freeze_time, db): - """Test that 'old' Vidyo rooms are correctly detected""" - freeze_time(datetime(2015, 2, 1)) - - events = {} - for id_, (evt_name, end_date) in enumerate((('Event one', datetime(2012, 1, 1, tzinfo=utc)), - ('Event two', datetime(2013, 1, 1, tzinfo=utc)), - ('Event three', datetime(2014, 1, 1, tzinfo=utc)), - ('Event four', datetime(2015, 1, 1, tzinfo=utc))), start=1): - events[id_] = create_event(id_, title=evt_name, end_dt=end_date, start_dt=end_date) - - for id_, (vidyo_id, extension, evt_ids) in enumerate(((1234, 5678, (1, 2, 3, 4)), - (1235, 5679, (1, 2)), - (1235, 5679, (2,)), - (1236, 5670, (4,)), - (1237, 5671, ())), start=1): - room = create_dummy_room(f'test_room_{id_}', extension, { - 'vidyo_id': vidyo_id - }) - for evt_id in evt_ids: - VCRoomEventAssociation(vc_room=room, linked_event=events[evt_id], data={}) - db.session.flush() - - from indico_vc_vidyo.task import find_old_vidyo_rooms - - assert {r.id for r in find_old_vidyo_rooms(180)} == {2, 3, 5} diff --git a/vc_vidyo/webpack-bundles.json b/vc_vidyo/webpack-bundles.json deleted file mode 100644 index 5f28835..0000000 --- a/vc_vidyo/webpack-bundles.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "entry": { - "main": "./index.js" - } -}