浏览代码

jitsi_meet: use domain param

Guénaël Muller 6 年前
父节点
当前提交
8c897ed9f9

+ 3 - 1
tracim/tracim/controllers/root.py 查看文件

@@ -188,7 +188,9 @@ class RootController(StandardController):
188 188
         fake_api = Context(CTX.CURRENT_USER).toDict({'current_user': current_user_content})
189 189
         room = 'test'
190 190
         token = JitsiMeetRoom.generate_token(room)
191
+        domain = JitsiMeetRoom.domain
191 192
 
192 193
         return DictLikeClass(fake_api=fake_api,
193 194
                              token=token,
194
-                             room=room)
195
+                             room=room,
196
+                             domain=domain)

+ 7 - 7
tracim/tracim/lib/jitsi_meet/jitsi_meet.py 查看文件

@@ -3,7 +3,7 @@ import typing
3 3
 
4 4
 import jwt
5 5
 
6
-JITSI_URL = "https://prosody"
6
+JITSI_DOMAIN = "prosody"
7 7
 JWT_APP_ID = "test"
8 8
 JWT_SECRET = "secret"
9 9
 JWT_ALG = 'HS256'
@@ -28,10 +28,10 @@ class JitsiTokenConfig:
28 28
 class JitsiMeetRoomHandler:
29 29
 
30 30
     def __init__(self,
31
-                 base_url: str,
31
+                 domain: str,
32 32
                  token_config: typing.Optional[JitsiTokenConfig],
33 33
                  ) -> None:
34
-        self.base_url = base_url
34
+        self.domain = domain
35 35
         self.token_config = token_config
36 36
 
37 37
     def generate_token(self, room: str)->str:
@@ -64,13 +64,13 @@ class JitsiMeetRoomHandler:
64 64
         """
65 65
         if self.token_config:
66 66
             token = self.generate_token(room)
67
-            url = "{}/{}?jwt={}".format(JITSI_URL,
67
+            url = "{}/{}?jwt={}".format(self.domain,
68 68
                                         room,
69 69
                                         token,)
70 70
         else:
71
-            url = "{}/{}".format(JITSI_URL,
71
+            url = "{}/{}".format(self.domain,
72 72
                                  room,)
73
-        return url
73
+        return "https://{}".format(url)
74 74
 
75 75
 if JITSI_USE_TOKEN:
76 76
     defaultTokenConfig = JitsiTokenConfig(
@@ -83,7 +83,7 @@ else:
83 83
     defaultTokenConfig = None
84 84
 
85 85
 JitsiMeetRoom = JitsiMeetRoomHandler(
86
-    base_url=JITSI_URL,
86
+    domain=JITSI_DOMAIN,
87 87
     token_config= defaultTokenConfig
88 88
 )
89 89
 

+ 1 - 1
tracim/tracim/templates/videoconf.mak 查看文件

@@ -40,7 +40,7 @@
40 40
         // It support alls jitsi-meet features.
41 41
         // About support for "private (1-to-1) text message into room", check this :
42 42
         // https://github.com/jitsi/lib-jitsi-meet/pull/616
43
-        var domain = "prosody";
43
+        var domain = '${domain}';
44 44
         var options = {
45 45
 	    // jitsi-meet support now(10-2017) only one way to auto-auth, token,
46 46
 	    // which is anonymous BOSH auth with specific url (with token value in params of the url).