|
@@ -6,7 +6,7 @@ from tg.predicates import not_anonymous
|
6
|
6
|
from tracim.lib.predicates import current_user_is_reader
|
7
|
7
|
from sqlalchemy.orm.exc import NoResultFound
|
8
|
8
|
|
9
|
|
-from unidecode import unidecode
|
|
9
|
+from tracim.lib.utils import str_as_alpha_num_str
|
10
|
10
|
from tracim.lib.jitsi_meet.jitsi_meet import JitsiMeetRoom
|
11
|
11
|
from tracim.lib.jitsi_meet.jitsi_meet import JitsiTokenConfig
|
12
|
12
|
from tracim.config.app_cfg import CFG
|
|
@@ -41,12 +41,15 @@ class JitsiMeetController(TIMRestController):
|
41
|
41
|
dictified_workspace = Context(CTX.WORKSPACE).toDict(workspace,
|
42
|
42
|
'workspace')
|
43
|
43
|
|
44
|
|
- label = unidecode(workspace.label)
|
45
|
|
- parsed_label = ''.join(e for e in label if e.isalnum())
|
46
|
44
|
# TODO - G.M - 18-01-2017 -
|
47
|
45
|
# allow to set specific room name from workspace object ?
|
48
|
|
- room = "{id}{label}".format(id=workspace.workspace_id,
|
49
|
|
- label=parsed_label)
|
|
46
|
+ room = "{uuid}{workspace_id}{workspace_label}".format(
|
|
47
|
+ uuid=cfg.TRACIM_INSTANCE_UUID,
|
|
48
|
+ workspace_id=workspace.workspace_id,
|
|
49
|
+ workspace_label=workspace.label)
|
|
50
|
+
|
|
51
|
+ # Jitsi-Meet doesn't like specials_characters
|
|
52
|
+ room = str_as_alpha_num_str(room)
|
50
|
53
|
|
51
|
54
|
token = None
|
52
|
55
|
if cfg.JITSI_MEET_USE_TOKEN:
|